mirrors/core-lightning
1
0
Fork 0
mirror of https://github.com/ElementsProject/lightning.git synced 2025-01-18 05:12:45 +01:00
Code Issues Projects Releases Wiki Activity

fundchannel: cancel the fundchannel request if error

Browse Source 
If txprepare hits an error, we need to cancel the pending request
with our peer.
This commit is contained in:
lisa neigut 2019-08-28 15:54:59 -05:00 committed by Rusty Russell
parent 03a30c0981
commit f155c61bdf
1 changed files with 22 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/fundchannel.c
View File

@ -211,6 +211,27 @@ static struct command_result *tx_prepare_done(struct command *cmd,
take(ret));
}
static struct command_result *cancel_start(struct command *cmd,
const char *buf,
const jsmntok_t *error,
struct funding_req *fr)
{
struct json_out *ret;
/* We stash the error so we can return it after we've cleaned up */
fr->error = json_strdup(fr, buf, error);
ret = json_out_new(NULL);
json_out_start(ret, NULL, '{');
json_out_addstr(ret, "id", type_to_string(tmpctx, struct node_id, fr->id));
json_out_end(ret, '}');
return send_outreq(cmd, "fundchannel_cancel",
send_prior, send_prior,
cast_const(struct funding_req *, fr),
take(ret));
}
static struct command_result *fundchannel_start_done(struct command *cmd,
const char *buf,
const jsmntok_t *result,
@ -244,7 +265,7 @@ static struct command_result *fundchannel_start_done(struct command *cmd,
json_out_end(ret, '}');
return send_outreq(cmd, "txprepare",
tx_prepare_done, forward_error,
tx_prepare_done, cancel_start,
cast_const(struct funding_req *, fr),
take(ret));
}