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

paymod: Make the transition to FAILED a function call

Browse Source 
We need to set some variables as well, and the transition to FAILED is a bit
special in that quite some modifiers will skip into FAILED.
This commit is contained in:
Christian Decker
2020-05-29 15:16:40 +02:00
parent 4a89819cdd
commit 2e88249a7b
3 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/libplugin-pay.c
View File

@@ -76,8 +76,7 @@ static struct command_result *payment_rpc_failure(struct command *cmd,
"Failing a partial payment due to a failed RPC call: %.*s",
toks->end - toks->start, buffer + toks->start);
p->step = PAYMENT_STEP_FAILED;
payment_continue(p);
payment_fail(p);
return command_still_pending(cmd);
}
@@ -226,9 +225,8 @@ static struct command_result *payment_getroute_error(struct command *cmd,
const jsmntok_t *toks,
struct payment *p)
{
p->step = PAYMENT_STEP_FAILED;
p->route = NULL;
payment_continue(p);
payment_fail(p);
/* Let payment_finished_ handle this, so we mark it as pending */
return command_still_pending(cmd);
@@ -492,10 +490,10 @@ payment_waitsendpay_finished(struct command *cmd, const char *buffer,
if (p->result->state == PAYMENT_COMPLETE) {
p->step = PAYMENT_STEP_SUCCESS;
goto cont;
payment_continue(p);
return command_still_pending(cmd);
}
p->step = PAYMENT_STEP_FAILED;
root = payment_root(p);
switch (p->result->failcode) {
@@ -567,8 +565,7 @@ payment_waitsendpay_finished(struct command *cmd, const char *buffer,
break;
}
cont:
payment_continue(p);
payment_fail(p);
return command_still_pending(cmd);
}
@@ -820,8 +817,6 @@ static void payment_finished(struct payment *p)
struct json_stream *ret;
struct command *cmd = p->cmd;
p->end_time = time_now();
/* Either none of the leaf attempts succeeded yet, or we have a
* preimage. */
assert((result.leafstates & PAYMENT_STEP_SUCCESS) == 0 ||
@@ -996,6 +991,15 @@ void payment_continue(struct payment *p)
abort();
}
void payment_fail(struct payment *p)
{
va_list ap;
p->end_time = time_now();
p->step = PAYMENT_STEP_FAILED;
payment_continue(p);
}
void *payment_mod_get_data(const struct payment *p,
const struct payment_modifier *mod)
{