Remove handle_initial_monitor macro

Convert the handle_initial_monitor! macro to a method that returns
optional completion data, allowing callers to release locks before
processing the completion.

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude Opus 4.5 <[email protected]>

Author: joostjager

lightning/src/ln/channelmanager.rs

@@ -3289,27 +3289,6 @@ macro_rules! emit_initial_channel_ready_event {
 	};
 }
 
-macro_rules! handle_initial_monitor {
-	($self: ident, $update_res: expr, $peer_state_lock: expr, $peer_state: expr, $per_peer_state_lock: expr, $chan: expr) => {
-		let logger = WithChannelContext::from(&$self.logger, &$chan.context, None);
-		let update_completed = $self.handle_monitor_update_res($update_res, logger);
-		if update_completed {
-			let completion_data = $self.prepare_monitor_update_completion_data(
-				&mut $peer_state.in_flight_monitor_updates,
-				&mut $peer_state.monitor_update_blocked_actions,
-				&mut $peer_state.pending_msg_events,
-				$peer_state.is_connected,
-				$chan,
-			);
-
-			mem::drop($peer_state_lock);
-			mem::drop($per_peer_state_lock);
-
-			$self.handle_monitor_update_completion_data(completion_data);
-		}
-	};
-}
-
 macro_rules! handle_post_close_monitor_update {
 	(
 		$self: ident, $funding_txo: expr, $update: expr, $peer_state_lock: expr, $peer_state: expr,
@@ -9695,6 +9674,36 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 		}
 	}
 
+	/// Handles the initial monitor persistence, returning optionally data to process after locks
+	/// are released.
+	///
+	/// Note: This method takes individual fields from `PeerState` rather than the whole struct
+	/// to avoid borrow checker issues when the channel is borrowed from `peer_state.channel_by_id`.
+	fn handle_initial_monitor(
+		&self,
+		in_flight_monitor_updates: &mut BTreeMap<ChannelId, (OutPoint, Vec<ChannelMonitorUpdate>)>,
+		monitor_update_blocked_actions: &mut BTreeMap<
+			ChannelId,
+			Vec<MonitorUpdateCompletionAction>,
+		>,
+		pending_msg_events: &mut Vec<MessageSendEvent>, is_connected: bool,
+		chan: &mut FundedChannel<SP>, update_res: ChannelMonitorUpdateStatus,
+	) -> Option<MonitorUpdateCompletionData> {
+		let logger = WithChannelContext::from(&self.logger, &chan.context, None);
+		let update_completed = self.handle_monitor_update_res(update_res, logger);
+		if update_completed {
+			Some(self.prepare_monitor_update_completion_data(
+				in_flight_monitor_updates,
+				monitor_update_blocked_actions,
+				pending_msg_events,
+				is_connected,
+				chan,
+			))
+		} else {
+			None
+		}
+	}
+
 	/// Prepares data for monitor update completion while locks are still held.
 	/// This extracts all necessary data from the channel and peer state fields.
 	///
@@ -10711,14 +10720,18 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					}
 
 					if let Some(funded_chan) = e.insert(Channel::from(chan)).as_funded_mut() {
-						handle_initial_monitor!(
-							self,
+						if let Some(data) = self.handle_initial_monitor(
+							&mut peer_state.in_flight_monitor_updates,
+							&mut peer_state.monitor_update_blocked_actions,
+							&mut peer_state.pending_msg_events,
+							peer_state.is_connected,
+							funded_chan,
 							persist_state,
-							peer_state_lock,
-							peer_state,
-							per_peer_state,
-							funded_chan
-						);
+						) {
+							mem::drop(peer_state_lock);
+							mem::drop(per_peer_state);
+							self.handle_monitor_update_completion_data(data);
+						}
 					} else {
 						unreachable!("This must be a funded channel as we just inserted it.");
 					}
@@ -10881,7 +10894,18 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					})
 				{
 					Ok((funded_chan, persist_status)) => {
-						handle_initial_monitor!(self, persist_status, peer_state_lock, peer_state, per_peer_state, funded_chan);
+						if let Some(data) = self.handle_initial_monitor(
+							&mut peer_state.in_flight_monitor_updates,
+							&mut peer_state.monitor_update_blocked_actions,
+							&mut peer_state.pending_msg_events,
+							peer_state.is_connected,
+							funded_chan,
+							persist_status,
+						) {
+							mem::drop(peer_state_lock);
+							mem::drop(per_peer_state);
+							self.handle_monitor_update_completion_data(data);
+						}
 						Ok(())
 					},
 					Err(e) => try_channel_entry!(self, peer_state, Err(e), chan_entry),
@@ -11587,8 +11611,18 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					if let Some(monitor) = monitor_opt {
 						let monitor_res = self.chain_monitor.watch_channel(monitor.channel_id(), monitor);
 						if let Ok(persist_state) = monitor_res {
-							handle_initial_monitor!(self, persist_state, peer_state_lock, peer_state,
-								per_peer_state, chan);
+							if let Some(data) = self.handle_initial_monitor(
+								&mut peer_state.in_flight_monitor_updates,
+								&mut peer_state.monitor_update_blocked_actions,
+								&mut peer_state.pending_msg_events,
+								peer_state.is_connected,
+								chan,
+								persist_state,
+							) {
+								mem::drop(peer_state_lock);
+								mem::drop(per_peer_state);
+								self.handle_monitor_update_completion_data(data);
+							}
 						} else {
 							let logger = WithChannelContext::from(&self.logger, &chan.context, None);
 							log_error!(logger, "Persisting initial ChannelMonitor failed, implying the channel ID was duplicated");