From e9ff8e4b4e2cb43effdab59edc0cdf4941ad548d Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Wed, 12 Jun 2019 13:43:21 +0930 Subject: [PATCH] openingd_control: fix merge error with json_stream_success. That was changed to start the response object, which broke the openingd code once we merged. Of course, I should have *renamed it* when I changed the semantic! Signed-off-by: Rusty Russell --- lightningd/opening_control.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/lightningd/opening_control.c b/lightningd/opening_control.c index c91ec21cc..ec05138a4 100644 --- a/lightningd/opening_control.c +++ b/lightningd/opening_control.c @@ -266,11 +266,9 @@ static void funding_success(struct channel *channel) struct command *cmd = fc->cmd; response = json_stream_success(cmd); - json_object_start(response, NULL); json_add_string(response, "channel_id", type_to_string(tmpctx, struct channel_id, &fc->cid)); json_add_bool(response, "commitments_secured", true); - json_object_end(response); was_pending(command_success(cmd, response)); } @@ -309,13 +307,11 @@ static void funding_started_success(struct funding_channel *fc, char *out; response = json_stream_success(cmd); - json_object_start(response, NULL); out = encode_scriptpubkey_to_addr(cmd, get_chainparams(cmd->ld)->bip173_name, scriptPubkey); if (out) json_add_string(response, "funding_address", out); - json_object_end(response); was_pending(command_success(cmd, response)); }