aljaz/lightning
1
0
Fork 0
mirror of https://github.com/aljazceru/lightning.git synced 2025-12-23 00:54:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

openingd_control: fix merge error with json_stream_success.

Browse Source 
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>
This commit is contained in:
Rusty Russell
2019-06-12 13:43:21 +09:30
parent 4c118bcdba
commit e9ff8e4b4e
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lightningd/opening_control.c
View File

@@ -266,11 +266,9 @@ static void funding_success(struct channel *channel)
struct command *cmd = fc->cmd; struct command *cmd = fc->cmd;
response = json_stream_success(cmd); response = json_stream_success(cmd);
json_object_start(response, NULL);
json_add_string(response, "channel_id", json_add_string(response, "channel_id",
type_to_string(tmpctx, struct channel_id, &fc->cid)); type_to_string(tmpctx, struct channel_id, &fc->cid));
json_add_bool(response, "commitments_secured", true); json_add_bool(response, "commitments_secured", true);
json_object_end(response);
was_pending(command_success(cmd, response)); was_pending(command_success(cmd, response));
} }
@@ -309,13 +307,11 @@ static void funding_started_success(struct funding_channel *fc,
char *out; char *out;
response = json_stream_success(cmd); response = json_stream_success(cmd);
json_object_start(response, NULL);
out = encode_scriptpubkey_to_addr(cmd, out = encode_scriptpubkey_to_addr(cmd,
get_chainparams(cmd->ld)->bip173_name, get_chainparams(cmd->ld)->bip173_name,
scriptPubkey); scriptPubkey);
if (out) if (out)
json_add_string(response, "funding_address", out); json_add_string(response, "funding_address", out);
json_object_end(response);
was_pending(command_success(cmd, response)); was_pending(command_success(cmd, response));
} }