f Move event emission to own macro and avoid back-to-back locking

Author: tnull

lightning/src/ln/channelmanager.rs

@@ -1487,18 +1487,30 @@ macro_rules! send_channel_ready {
 	}}
 }
 
+macro_rules! emit_channel_pending_event {
+	($locked_events: expr, $channel: expr) => {
+		if $channel.should_emit_channel_pending_event() {
+			$locked_events.push(events::Event::ChannelPending {
+				channel_id: $channel.channel_id(),
+				former_temporary_channel_id: $channel.temporary_channel_id(),
+				counterparty_node_id: $channel.get_counterparty_node_id(),
+				user_channel_id: $channel.get_user_id(),
+				funding_txo: $channel.get_funding_txo().unwrap().into_bitcoin_outpoint(),
+			});
+			$channel.set_channel_pending_event_emitted();
+		}
+	}
+}
+
 macro_rules! emit_channel_ready_event {
-	($self: expr, $channel: expr) => {
+	($locked_events: expr, $channel: expr) => {
 		if $channel.should_emit_channel_ready_event() {
-			{
-				let mut pending_events = $self.pending_events.lock().unwrap();
-				pending_events.push(events::Event::ChannelReady {
-					channel_id: $channel.channel_id(),
-					user_channel_id: $channel.get_user_id(),
-					counterparty_node_id: $channel.get_counterparty_node_id(),
-					channel_type: $channel.get_channel_type().clone(),
-				});
-			}
+			$locked_events.push(events::Event::ChannelReady {
+				channel_id: $channel.channel_id(),
+				user_channel_id: $channel.get_user_id(),
+				counterparty_node_id: $channel.get_counterparty_node_id(),
+				channel_type: $channel.get_channel_type().clone(),
+			});
 			$channel.set_channel_ready_event_emitted();
 		}
 	}
@@ -4251,20 +4263,12 @@ where
 			self.tx_broadcaster.broadcast_transaction(&tx);
 		}
 
-		if channel.should_emit_channel_pending_event() {
+		{
 			let mut pending_events = self.pending_events.lock().unwrap();
-			pending_events.push(events::Event::ChannelPending {
-				channel_id: channel.channel_id(),
-				former_temporary_channel_id: channel.temporary_channel_id(),
-				counterparty_node_id: counterparty_node_id,
-				user_channel_id: channel.get_user_id(),
-				funding_txo: channel.get_funding_txo().unwrap().into_bitcoin_outpoint(),
-			});
-			channel.set_channel_pending_event_emitted();
+			emit_channel_pending_event!(pending_events, channel);
+			emit_channel_ready_event!(pending_events, channel);
 		}
 
-		emit_channel_ready_event!(self, channel);
-
 		htlc_forwards
 	}
 
@@ -4689,7 +4693,10 @@ where
 					}
 				}
 
-				emit_channel_ready_event!(self, chan.get_mut());
+				{
+					let mut pending_events = self.pending_events.lock().unwrap();
+					emit_channel_ready_event!(pending_events, chan.get_mut());
+				}
 
 				Ok(())
 			},
@@ -6014,7 +6021,10 @@ where
 							}
 						}
 
-						emit_channel_ready_event!(self, channel);
+						{
+							let mut pending_events = self.pending_events.lock().unwrap();
+							emit_channel_ready_event!(pending_events, channel);
+						}
 
 						if let Some(announcement_sigs) = announcement_sigs {
 							log_trace!(self.logger, "Sending announcement_signatures for channel {}", log_bytes!(channel.channel_id()));