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

json_to_psbt: fix API to match other allocating json_to functions.

Browse Source 
Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2021-01-06 16:11:19 +10:30
committed by Christian Decker
parent 70410b8ee8
commit 2b6cdfeb5a
4 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
plugins/spender/openchannel.c
View File

@@ -571,8 +571,8 @@ static void json_peer_sigs(struct command *cmd,
json_tok_full_len(params),
json_tok_full(buf, params));
if (!json_to_psbt(cmd, buf, psbt_tok,
cast_const2(struct wally_psbt **, &psbt)))
psbt = json_to_psbt(cmd, buf, psbt_tok);
if (!psbt)
plugin_err(cmd->plugin,
"Unable to parse openchannel_peer_sigs.signed_psbt "
"%.*s",
@@ -705,7 +705,8 @@ openchannel_update_ok(struct command *cmd,
json_tok_full_len(result),
json_tok_full(buf, result));
if (!json_to_psbt(dest->mfc, buf, psbt_tok, &dest->updated_psbt))
dest->updated_psbt = json_to_psbt(dest->mfc, buf, psbt_tok);
if (!dest->updated_psbt)
plugin_err(cmd->plugin,
"`openchannel_update` returned invalid "
"'psbt': %.*s",
@@ -939,7 +940,8 @@ openchannel_init_ok(struct command *cmd,
"'psbt': %.*s",
json_tok_full_len(result),
json_tok_full(buf, result));
if (!json_to_psbt(dest->mfc, buf, psbt_tok, &dest->updated_psbt))
dest->updated_psbt = json_to_psbt(dest->mfc, buf, psbt_tok);
if (!dest->updated_psbt)
plugin_err(cmd->plugin,
"openchannel_init returned invalid "
"'psbt': %.*s",