Skip to content

Commit

Permalink
openingd_control: fix merge error with json_stream_success.
Browse files Browse the repository at this point in the history
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 <rusty@rustcorp.com.au>
  • Loading branch information
rustyrussell committed Jun 12, 2019
1 parent 4c118bc commit e9ff8e4
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions lightningd/opening_control.c
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}

Expand Down Expand Up @@ -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));
}

Expand Down

0 comments on commit e9ff8e4

Please sign in to comment.