@@ -1064,22 +1064,9 @@ impl ClaimablePayments {
10641064/// [`ChannelMonitorUpdate`]s are applied.
10651065#[derive(Debug)]
10661066enum BackgroundEvent {
1067- /// Handle a ChannelMonitorUpdate which closes the channel or for an already-closed channel.
1068- /// This is only separated from [`Self::MonitorUpdateRegeneratedOnStartup`] as for truly
1069- /// ancient [`ChannelMonitor`]s that haven't seen an update since LDK 0.0.118 we may not have
1070- /// the counterparty node ID available.
1071- ///
1072- /// Note that any such events are lost on shutdown, so in general they must be updates which
1073- /// are regenerated on startup.
1074- ClosedMonitorUpdateRegeneratedOnStartup((OutPoint, ChannelId, ChannelMonitorUpdate)),
10751067 /// Handle a ChannelMonitorUpdate which may or may not close the channel and may unblock the
10761068 /// channel to continue normal operation.
10771069 ///
1078- /// In general this should be used rather than
1079- /// [`Self::ClosedMonitorUpdateRegeneratedOnStartup`], however in cases where the
1080- /// `counterparty_node_id` is not available as the channel has closed from a [`ChannelMonitor`]
1081- /// error the other variant is acceptable.
1082- ///
10831070 /// Any such events that exist in [`ChannelManager::pending_background_events`] will *also* be
10841071 /// tracked in [`PeerState::in_flight_monitor_updates`].
10851072 ///
@@ -6393,11 +6380,6 @@ where
63936380
63946381 for event in background_events.drain(..) {
63956382 match event {
6396- BackgroundEvent::ClosedMonitorUpdateRegeneratedOnStartup((_funding_txo, channel_id, update)) => {
6397- // The channel has already been closed, so no use bothering to care about the
6398- // monitor updating completing.
6399- let _ = self.chain_monitor.update_channel(channel_id, &update);
6400- },
64016383 BackgroundEvent::MonitorUpdateRegeneratedOnStartup { counterparty_node_id, funding_txo, channel_id, update } => {
64026384 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
64036385 },
0 commit comments