f move to reduce diff

Author: TheBlueMatt

lightning/src/ln/channelmanager.rs

@@ -3923,6 +3923,34 @@ where
 		self.close_channel_internal(channel_id, counterparty_node_id, target_feerate_sats_per_1000_weight, shutdown_script)
 	}
 
+	/// Applies a [`ChannelMonitorUpdate`] which may or may not be for a channel which is closed.
+	#[must_use]
+	fn apply_post_close_monitor_update(
+		&self, counterparty_node_id: PublicKey, channel_id: ChannelId, funding_txo: OutPoint,
+		monitor_update: ChannelMonitorUpdate,
+	) -> ChannelMonitorUpdateStatus {
+		// Note that there may be some post-close updates which need to be well-ordered with
+		// respect to the `update_id`, so we hold the `peer_state` lock here.
+		let per_peer_state = self.per_peer_state.read().unwrap();
+		let mut peer_state_lock = per_peer_state.get(&counterparty_node_id)
+			.expect("We must always have a peer entry for a peer with which we have channels that have ChannelMonitors")
+			.lock().unwrap();
+		let peer_state = &mut *peer_state_lock;
+		match peer_state.channel_by_id.entry(channel_id) {
+			hash_map::Entry::Occupied(mut chan_phase) => {
+				if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
+					let completed = handle_new_monitor_update!(self, funding_txo,
+						monitor_update, peer_state_lock, peer_state, per_peer_state, chan);
+					return if completed { ChannelMonitorUpdateStatus::Completed } else { ChannelMonitorUpdateStatus::InProgress };
+				} else {
+					debug_assert!(false, "We shouldn't have an update for a non-funded channel");
+				}
+			},
+			hash_map::Entry::Vacant(_) => {},
+		}
+		self.chain_monitor.update_channel(funding_txo, &monitor_update)
+	}
+
 	fn set_closed_chan_next_monitor_update_id(
 		peer_state: &mut PeerState<SP>, channel_id: ChannelId, monitor_update: &mut ChannelMonitorUpdate,
 	) {
@@ -3956,34 +3984,6 @@ where
 		}
 	}
 
-	/// Applies a [`ChannelMonitorUpdate`] which may or may not be for a channel which is closed.
-	#[must_use]
-	fn apply_post_close_monitor_update(
-		&self, counterparty_node_id: PublicKey, channel_id: ChannelId, funding_txo: OutPoint,
-		monitor_update: ChannelMonitorUpdate,
-	) -> ChannelMonitorUpdateStatus {
-		// Note that there may be some post-close updates which need to be well-ordered with
-		// respect to the `update_id`, so we hold the `peer_state` lock here.
-		let per_peer_state = self.per_peer_state.read().unwrap();
-		let mut peer_state_lock = per_peer_state.get(&counterparty_node_id)
-			.expect("We must always have a peer entry for a peer with which we have channels that have ChannelMonitors")
-			.lock().unwrap();
-		let peer_state = &mut *peer_state_lock;
-		match peer_state.channel_by_id.entry(channel_id) {
-			hash_map::Entry::Occupied(mut chan_phase) => {
-				if let ChannelPhase::Funded(chan) = chan_phase.get_mut() {
-					let completed = handle_new_monitor_update!(self, funding_txo,
-						monitor_update, peer_state_lock, peer_state, per_peer_state, chan);
-					return if completed { ChannelMonitorUpdateStatus::Completed } else { ChannelMonitorUpdateStatus::InProgress };
-				} else {
-					debug_assert!(false, "We shouldn't have an update for a non-funded channel");
-				}
-			},
-			hash_map::Entry::Vacant(_) => {},
-		}
-		self.chain_monitor.update_channel(funding_txo, &monitor_update)
-	}
-
 	/// When a channel is removed, two things need to happen:
 	/// (a) [`locked_close_channel`] must be called in the same `per_peer_state` lock as
 	///     the channel-closing action,