@@ -1062,22 +1062,9 @@ impl ClaimablePayments {
10621062/// [`ChannelMonitorUpdate`]s are applied.
10631063#[derive(Debug)]
10641064enum BackgroundEvent {
1065- /// Handle a ChannelMonitorUpdate which closes the channel or for an already-closed channel.
1066- /// This is only separated from [`Self::MonitorUpdateRegeneratedOnStartup`] as for truly
1067- /// ancient [`ChannelMonitor`]s that haven't seen an update since LDK 0.0.118 we may not have
1068- /// the counterparty node ID available.
1069- ///
1070- /// Note that any such events are lost on shutdown, so in general they must be updates which
1071- /// are regenerated on startup.
1072- ClosedMonitorUpdateRegeneratedOnStartup((OutPoint, ChannelId, ChannelMonitorUpdate)),
10731065 /// Handle a ChannelMonitorUpdate which may or may not close the channel and may unblock the
10741066 /// channel to continue normal operation.
10751067 ///
1076- /// In general this should be used rather than
1077- /// [`Self::ClosedMonitorUpdateRegeneratedOnStartup`], however in cases where the
1078- /// `counterparty_node_id` is not available as the channel has closed from a [`ChannelMonitor`]
1079- /// error the other variant is acceptable.
1080- ///
10811068 /// Any such events that exist in [`ChannelManager::pending_background_events`] will *also* be
10821069 /// tracked in [`PeerState::in_flight_monitor_updates`].
10831070 ///
@@ -6406,11 +6393,6 @@ where
64066393
64076394 for event in background_events.drain(..) {
64086395 match event {
6409- BackgroundEvent::ClosedMonitorUpdateRegeneratedOnStartup((_funding_txo, channel_id, update)) => {
6410- // The channel has already been closed, so no use bothering to care about the
6411- // monitor updating completing.
6412- let _ = self.chain_monitor.update_channel(channel_id, &update);
6413- },
64146396 BackgroundEvent::MonitorUpdateRegeneratedOnStartup { counterparty_node_id, funding_txo, channel_id, update } => {
64156397 self.apply_post_close_monitor_update(counterparty_node_id, channel_id, funding_txo, update);
64166398 },
0 commit comments