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

peer: remove unused arg from our_htlc_failed().

Browse Source 
And fix one case where we didn't set htlc r value (onchain redemption).

Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
This commit is contained in:
Rusty Russell
2016-08-30 20:14:57 +09:30
parent 7e95637cb5
commit 192d5402ff
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
daemon/peer.c
View File

@@ -567,8 +567,7 @@ static void our_htlc_failed(struct peer *peer, struct htlc *htlc)
complete_pay_command(peer, htlc); complete_pay_command(peer, htlc);
} }
static void our_htlc_fulfilled(struct peer *peer, struct htlc *htlc, static void our_htlc_fulfilled(struct peer *peer, struct htlc *htlc)
const struct rval *preimage)
{ {
if (htlc->src) { if (htlc->src) {
set_htlc_rval(htlc->src->peer, htlc->src, htlc->r); set_htlc_rval(htlc->src->peer, htlc->src, htlc->r);
@@ -1107,7 +1106,7 @@ static Pkt *handle_pkt_htlc_fulfill(struct peer *peer, const Pkt *pkt)
/* We can relay this upstream immediately. */ /* We can relay this upstream immediately. */
if (!was_already_fulfilled) if (!was_already_fulfilled)
our_htlc_fulfilled(peer, htlc, htlc->r); our_htlc_fulfilled(peer, htlc);
/* BOLT #2: /* BOLT #2:
* *
@@ -3337,7 +3336,8 @@ static enum watch_result our_htlc_spent(struct peer *peer,
h->id); h->id);
log_add_struct(peer->log, " using rvalue %s", struct rval, &preimage); log_add_struct(peer->log, " using rvalue %s", struct rval, &preimage);
our_htlc_fulfilled(peer, h, &preimage); set_htlc_rval(peer, h, &preimage);
our_htlc_fulfilled(peer, h);
/* BOLT #onchain: /* BOLT #onchain:
* *