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

invoice: Clarify comments about the two loops in resolve_invoice.

Browse Source
This commit is contained in:
ZmnSCPxj
2018-01-10 14:45:20 +00:00
committed by Rusty Russell
parent a900551815
commit 7221476553
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
lightningd/invoice.c
View File

@@ -28,7 +28,7 @@ struct invoices {
/* Payments for r values we know about. */ /* Payments for r values we know about. */
struct list_head invlist; struct list_head invlist;
/* Waiting for new invoices to be paid. */ /* Waiting for new invoices to be paid. */
struct list_head invoice_waiters; struct list_head waitany_waiters;
}; };
struct invoice *find_unpaid(struct invoices *invs, const struct sha256 *rhash) struct invoice *find_unpaid(struct invoices *invs, const struct sha256 *rhash)
@@ -69,7 +69,7 @@ struct invoices *invoices_init(const tal_t *ctx)
struct invoices *invs = tal(ctx, struct invoices); struct invoices *invs = tal(ctx, struct invoices);
list_head_init(&invs->invlist); list_head_init(&invs->invlist);
list_head_init(&invs->invoice_waiters); list_head_init(&invs->waitany_waiters);
return invs; return invs;
} }
@@ -104,13 +104,15 @@ void resolve_invoice(struct lightningd *ld, struct invoice *invoice)
* which tell_waiter needs. */ * which tell_waiter needs. */
wallet_invoice_save(ld->wallet, invoice); wallet_invoice_save(ld->wallet, invoice);
/* Tell all the waiters about the new paid invoice */ /* Yes, there are two loops: the first is for wait*any*invoice,
while ((w = list_pop(&invs->invoice_waiters, * the second is for waitinvoice (without any). */
/* Tell all the waitanyinvoice waiters about the new paid invoice */
while ((w = list_pop(&invs->waitany_waiters,
struct invoice_waiter, struct invoice_waiter,
list)) != NULL) list)) != NULL)
tell_waiter(w->cmd, invoice); tell_waiter(w->cmd, invoice);
/* Tell any waitinvoice waiters about the invoice getting paid. */ /* Tell any waitinvoice waiters about the invoice getting paid. */
while ((w = list_pop(&invoice->invoice_waiters, while ((w = list_pop(&invoice->waitone_waiters,
struct invoice_waiter, struct invoice_waiter,
list)) != NULL) list)) != NULL)
tell_waiter(w->cmd, invoice); tell_waiter(w->cmd, invoice);
@@ -151,7 +153,7 @@ static char *delete_invoice(const tal_t *cxt,
list_del_from(&invs->invlist, &i->list); list_del_from(&invs->invlist, &i->list);
/* Tell all the waiters about the fact that it was deleted. */ /* Tell all the waiters about the fact that it was deleted. */
while ((w = list_pop(&i->invoice_waiters, while ((w = list_pop(&i->waitone_waiters,
struct invoice_waiter, struct invoice_waiter,
list)) != NULL) { list)) != NULL) {
tell_waiter_deleted(w->cmd, i); tell_waiter_deleted(w->cmd, i);
@@ -189,7 +191,7 @@ static void json_invoice(struct command *cmd,
invoice->id = 0; invoice->id = 0;
invoice->state = UNPAID; invoice->state = UNPAID;
invoice->pay_index = 0; invoice->pay_index = 0;
list_head_init(&invoice->invoice_waiters); list_head_init(&invoice->waitone_waiters);
randombytes_buf(invoice->r.r, sizeof(invoice->r.r)); randombytes_buf(invoice->r.r, sizeof(invoice->r.r));
sha256(&invoice->rhash, invoice->r.r, sizeof(invoice->r.r)); sha256(&invoice->rhash, invoice->r.r, sizeof(invoice->r.r));
@@ -451,7 +453,7 @@ static void json_waitanyinvoice(struct command *cmd,
/* FIXME: Better to use io_wait directly? */ /* FIXME: Better to use io_wait directly? */
w = tal(cmd, struct invoice_waiter); w = tal(cmd, struct invoice_waiter);
w->cmd = cmd; w->cmd = cmd;
list_add_tail(&invs->invoice_waiters, &w->list); list_add_tail(&invs->waitany_waiters, &w->list);
command_still_pending(cmd); command_still_pending(cmd);
} }
@@ -497,7 +499,7 @@ static void json_waitinvoice(struct command *cmd,
/* There is an unpaid one matching, let's wait... */ /* There is an unpaid one matching, let's wait... */
w = tal(cmd, struct invoice_waiter); w = tal(cmd, struct invoice_waiter);
w->cmd = cmd; w->cmd = cmd;
list_add_tail(&i->invoice_waiters, &w->list); list_add_tail(&i->waitone_waiters, &w->list);
command_still_pending(cmd); command_still_pending(cmd);
} }
} }

2
lightningd/invoice.h
View File

@@ -26,7 +26,7 @@ struct invoice {
u64 expiry_time; u64 expiry_time;
struct sha256 rhash; struct sha256 rhash;
u64 pay_index; u64 pay_index;
struct list_head invoice_waiters; struct list_head waitone_waiters;
}; };
#define INVOICE_MAX_LABEL_LEN 128 #define INVOICE_MAX_LABEL_LEN 128

2
wallet/wallet.c
View File

@@ -1292,7 +1292,7 @@ static bool wallet_stmt2invoice(sqlite3_stmt *stmt, struct invoice *inv)
/* Correctly 0 if pay_index is NULL. */ /* Correctly 0 if pay_index is NULL. */
inv->pay_index = sqlite3_column_int64(stmt, 7); inv->pay_index = sqlite3_column_int64(stmt, 7);
list_head_init(&inv->invoice_waiters); list_head_init(&inv->waitone_waiters);
return true; return true;
} }