Skip to content

Commit

Permalink
pay: Fix a non-rebased PR merge error
Browse files Browse the repository at this point in the history
Looks like there was a PR that was merged without being rebased on top of
master first. Don't to that!

Changelog-None
  • Loading branch information
cdecker committed Jul 26, 2023
1 parent 978c169 commit bc59bb7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion lightningd/pay.c
Original file line number Diff line number Diff line change
Expand Up @@ -1515,7 +1515,7 @@ static struct command_result *self_payment(struct lightningd *ld,

/* These should not fail, given the above succeded! */
if (!invoices_find_by_rhash(ld->wallet->invoices, &inv_dbid, rhash)
|| !invoices_resolve(ld->wallet->invoices, inv_dbid, msat)) {
|| !invoices_resolve(ld->wallet->invoices, inv_dbid, msat, NULL)) {
log_broken(ld->log, "Could not resolve invoice %"PRIu64"!?!", inv_dbid);
return sendpay_fail(cmd, payment, PAY_DESTINATION_PERM_FAIL, NULL, NULL, "broken");
}
Expand Down

0 comments on commit bc59bb7

Please sign in to comment.