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

paymod: Implement bubbling results up the hierarchy of payments

Browse Source 
A payment is considered finished if it is in a final state (success or
failure) or all its sub-payments are finished. If that's the case we notify
`payment_finished` and bubble up through `payment_child_finished`, eventually
bubbling up to the root, which can then report success of failure back to the
RPC command that initiated the whole process.
This commit is contained in:
Christian Decker
2020-05-11 20:02:16 +02:00
parent 5c32e33aab
commit ce0025c95c
1 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
plugins/libplugin-pay.c
View File

@@ -67,21 +67,32 @@ static void payment_sendonion(struct payment *p)
/* Mutual recursion. */ /* Mutual recursion. */
static void payment_finished(struct payment *p); static void payment_finished(struct payment *p);
/* A payment is finished if a) it is in a final state, of b) it's in a
* child-spawning state and all of its children are in a final state. */
static bool payment_is_finished(const struct payment *p)
{
if (p->step == PAYMENT_STEP_FAILED || p->step == PAYMENT_STEP_SUCCESS)
return true;
else if (p->step == PAYMENT_STEP_SPLIT || p->step == PAYMENT_STEP_RETRY) {
bool running_children = false;
for (size_t i = 0; i < tal_count(p->children); i++)
running_children |= !payment_is_finished(p->children[i]);
return !running_children;
} else {
return false;
}
}
/* Function to bubble up completions to the root, which actually holds on to /* Function to bubble up completions to the root, which actually holds on to
* the command that initiated the flow. */ * the command that initiated the flow. */
static struct command_result *payment_child_finished(struct payment *parent, static void payment_child_finished(struct payment *p,
struct payment *child) struct payment *child)
{ {
/* TODO implement logic to wait for all parts instead of bubbling up if (!payment_is_finished(p))
* directly. */ return;
/* Should we continue bubbling up? */ /* Should we continue bubbling up? */
if (parent->parent == NULL) { payment_finished(p);
assert(parent->cmd != NULL);
return payment_finished(parent);
} else {
return payment_child_finished(parent->parent, parent);
}
} }
/* This function is called whenever a payment ends up in a final state, or all /* This function is called whenever a payment ends up in a final state, or all
@@ -90,9 +101,6 @@ static struct command_result *payment_child_finished(struct payment *parent,
* traversal, i.e., all children are finished before the parent is called. */ * traversal, i.e., all children are finished before the parent is called. */
static void payment_finished(struct payment *p) static void payment_finished(struct payment *p)
{ {
/* TODO If this is a success bubble it back up through the part
* tree. If it is a failure, decide here whether to split, retry or
* split (maybe in a modifier instead?). */
if (p->parent == NULL) if (p->parent == NULL)
return command_fail(p->cmd, JSONRPC2_INVALID_REQUEST, "Not functional yet"); return command_fail(p->cmd, JSONRPC2_INVALID_REQUEST, "Not functional yet");
else else