From 8e7b29160ba19b971d25b66938693cecacc5993c Mon Sep 17 00:00:00 2001 From: Valentine Wallace Date: Fri, 6 Nov 2020 13:30:15 -0500 Subject: [PATCH] Remove unnecessary todo The ChannelMonitor already monitors the chain for counterparties revealing preimages, and will give the HTLCSources back to the ChannelManager for claiming. Thus it's unnecessary for the ChannelManager to monitor these HTLCs itself. See is_resolving_htlc_output: - if the counterparty broadcasted and then claimed one of the HTLCs we offered them, line 2015 is where the ChannelMonitor gives the ChannelManager the HTLC source - if we broadcasted and they claimed an HTLC we offered them, line 2025 is where the ChannelMonitor gives the ChannelManager the HTLC source --- lightning/src/ln/channel.rs | 6 ------ 1 file changed, 6 deletions(-) diff --git a/lightning/src/ln/channel.rs b/lightning/src/ln/channel.rs index 8782bb3a..c34fc6a3 100644 --- a/lightning/src/ln/channel.rs +++ b/lightning/src/ln/channel.rs @@ -4017,12 +4017,6 @@ impl Channel { } } - for _htlc in self.pending_outbound_htlcs.drain(..) { - //TODO: Do something with the remaining HTLCs - //(we need to have the ChannelManager monitor them so we can claim the inbound HTLCs - //which correspond) - } - self.channel_state = ChannelState::ShutdownComplete as u32; self.update_time_counter += 1; self.latest_monitor_update_id += 1; -- 2.30.2