From 7eec2253e962e524f8fd92b74f411f0b99706ba9 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Sat, 20 Oct 2018 13:02:29 +1030 Subject: [PATCH] lightningd: fix up compile errors from bad merge. The new listforwards was old-style, and the new API was merged. Signed-off-by: Rusty Russell --- lightningd/peer_htlcs.c | 5 +++-- lightningd/test/run-jsonrpc.c | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/lightningd/peer_htlcs.c b/lightningd/peer_htlcs.c index 3b32e7b5f..55d8d9e58 100644 --- a/lightningd/peer_htlcs.c +++ b/lightningd/peer_htlcs.c @@ -1843,7 +1843,7 @@ static const struct json_command dev_ignore_htlcs = { AUTODATA(json_command, &dev_ignore_htlcs); #endif /* DEVELOPER */ -static void listforwardings_add_forwardings(struct json_result *response, struct wallet *wallet) +static void listforwardings_add_forwardings(struct json_stream *response, struct wallet *wallet) { const struct forwarding *forwardings; forwardings = wallet_forwarded_payments_get(wallet, tmpctx); @@ -1869,11 +1869,12 @@ static void listforwardings_add_forwardings(struct json_result *response, struct static void json_listforwards(struct command *cmd, const char *buffer, const jsmntok_t *params) { - struct json_result *response = new_json_result(cmd); + struct json_stream *response; if (!param(cmd, buffer, params, NULL)) return; + response = json_stream_success(cmd); json_object_start(response, NULL); listforwardings_add_forwardings(response, cmd->ld->wallet); json_object_end(response); diff --git a/lightningd/test/run-jsonrpc.c b/lightningd/test/run-jsonrpc.c index 136aa88c4..91fc71855 100644 --- a/lightningd/test/run-jsonrpc.c +++ b/lightningd/test/run-jsonrpc.c @@ -52,6 +52,9 @@ bool param(struct command *cmd UNNEEDED, const char *buffer UNNEEDED, /* Generated stub for version */ const char *version(void) { fprintf(stderr, "version called!\n"); abort(); } +/* Generated stub for wallet_total_forward_fees */ +u64 wallet_total_forward_fees(struct wallet *w UNNEEDED) +{ fprintf(stderr, "wallet_total_forward_fees called!\n"); abort(); } /* AUTOGENERATED MOCKS END */ bool deprecated_apis;