From a3115279fd6c199f41703426ea76cbaf733dd830 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Fri, 24 Aug 2018 16:44:53 +0930 Subject: [PATCH] channeld: don't assign htlc preimage twice. channel_fulfill_htlc() does that already. Signed-off-by: Rusty Russell --- channeld/channel.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/channeld/channel.c b/channeld/channel.c index fb062f1b0..d3101d919 100644 --- a/channeld/channel.c +++ b/channeld/channel.c @@ -1458,7 +1458,6 @@ static void handle_peer_fulfill_htlc(struct peer *peer, const u8 *msg) e = channel_fulfill_htlc(peer->channel, LOCAL, id, &preimage, &h); switch (e) { case CHANNEL_ERR_REMOVE_OK: - h->r = tal_dup(h, struct preimage, &preimage); /* FIXME: We could send preimages to master immediately. */ start_commit_timer(peer); return; @@ -2382,8 +2381,6 @@ static void handle_preimage(struct peer *peer, const u8 *inmsg) &fulfilled_htlc.payment_preimage, &h)) { case CHANNEL_ERR_REMOVE_OK: - h->r = tal_dup(h, struct preimage, - &fulfilled_htlc.payment_preimage); send_fail_or_fulfill(peer, h); start_commit_timer(peer); return;