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

invoice: Factor out invoice deletion code.

Browse Source 
In preparation for adding a deletion trigger for
invoice waiters on individual invoices.
This commit is contained in:
ZmnSCPxj
2017-12-27 11:51:58 +00:00
committed by Rusty Russell
parent 7f24e36dd9
commit 773f7524dd
1 changed files with 31 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
lightningd/invoice.c
View File

@@ -125,6 +125,21 @@ static bool hsm_sign_b11(const u5 *u5bytes,
return true; return true;
} }
/* Return NULL if no error, or an error string otherwise. */
static char *delete_invoice(const tal_t *cxt,
struct wallet *wallet,
struct invoices *invs,
struct invoice *i)
{
if (!wallet_invoice_remove(wallet, i)) {
return tal_strdup(cxt, "Database error");
}
list_del_from(&invs->invlist, &i->list);
tal_free(i);
return NULL;
}
static void json_invoice(struct command *cmd, static void json_invoice(struct command *cmd,
const char *buffer, const jsmntok_t *params) const char *buffer, const jsmntok_t *params)
{ {
@@ -302,6 +317,7 @@ static void json_delinvoice(struct command *cmd,
struct json_result *response = new_json_result(cmd); struct json_result *response = new_json_result(cmd);
const char *label; const char *label;
struct invoices *invs = cmd->ld->invoices; struct invoices *invs = cmd->ld->invoices;
char *error;
if (!json_get_params(buffer, params, if (!json_get_params(buffer, params,
"label", &labeltok, "label", &labeltok,
@@ -318,21 +334,27 @@ static void json_delinvoice(struct command *cmd,
return; return;
} }
if (!wallet_invoice_remove(cmd->ld->wallet, i)) { /* Get invoice details before attempting to delete, as
log_broken(cmd->ld->log, "Error attempting to remove invoice %"PRIu64, * otherwise the invoice will be freed. */
i->id);
command_fail(cmd, "Database error");
return;
}
list_del_from(&invs->invlist, &i->list);
json_object_start(response, NULL); json_object_start(response, NULL);
json_add_string(response, "label", i->label); json_add_string(response, "label", i->label);
json_add_hex(response, "rhash", &i->rhash, sizeof(i->rhash)); json_add_hex(response, "rhash", &i->rhash, sizeof(i->rhash));
json_add_u64(response, "msatoshi", i->msatoshi); json_add_u64(response, "msatoshi", i->msatoshi);
json_object_end(response); json_object_end(response);
error = delete_invoice(cmd, cmd->ld->wallet, invs, i);
if (error) {
log_broken(cmd->ld->log, "Error attempting to remove invoice %"PRIu64,
i->id);
command_fail(cmd, "%s", error);
/* Both error and response are sub-objects of cmd,
* and command_fail will free cmd (and also error
* and response). */
return;
}
command_success(cmd, response); command_success(cmd, response);
tal_free(i);
} }
static const struct json_command delinvoice_command = { static const struct json_command delinvoice_command = {