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

pay: Move setting failed status on payment to after we get payment details.

Browse Source
This commit is contained in:
ZmnSCPxj
2018-01-29 17:34:59 +00:00
committed by Rusty Russell
parent 67e2275383
commit b2d8efcf25
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lightningd/pay.c
View File

@@ -65,11 +65,10 @@ void payment_failed(struct lightningd *ld, const struct htlc_out *hout,
struct secret *path_secrets;
const tal_t *tmpctx = tal_tmpctx(ld);
wallet_payment_set_status(ld->wallet, &hout->payment_hash,
PAYMENT_FAILED, NULL);
/* This gives more details than a generic failure message */
if (localfail) {
wallet_payment_set_status(ld->wallet, &hout->payment_hash,
PAYMENT_FAILED, NULL);
json_pay_failed(hout->cmd, NULL, hout->failcode, localfail);
tal_free(tmpctx);
return;
@@ -96,6 +95,12 @@ void payment_failed(struct lightningd *ld, const struct htlc_out *hout,
failcode, onion_type_name(failcode));
}
/* This may invalidated the payment structure returned, so
* access to payment object should not be done after the
* below call. */
wallet_payment_set_status(ld->wallet, &hout->payment_hash,
PAYMENT_FAILED, NULL);
/* FIXME: save ids we can turn reply->origin_index into sender. */
/* FIXME: check for routing failure / perm fail. */