f Don't emit in funding_ methods

Author: tnull

lightning/src/ln/channel.rs

@@ -4621,12 +4621,11 @@ impl<Signer: Sign> Channel<Signer> {
 
 	// Checks whether we previously had emitted a `ChannelReady` event and sets the value if not.
 	pub(crate) fn should_emit_channel_ready_event(&mut self) -> bool {
-		if self.channel_ready_event_emitted {
-			// Do nothing, already emitted.
-			false
-		} else {
+		if self.is_usable() && !self.channel_ready_event_emitted {
 			self.channel_ready_event_emitted = true;
 			true
+		} else {
+			false
 		}
 	}
 

lightning/src/ln/channelmanager.rs

@@ -1520,7 +1520,7 @@ macro_rules! handle_chan_restoration_locked {
 				});
 			}
 
-			if $channel_entry.get().is_usable() && $channel_entry.get_mut().should_emit_channel_ready_event() {
+			if $channel_entry.get_mut().should_emit_channel_ready_event() {
 				let mut pending_events = $self.pending_events.lock().unwrap();
 				emit_channel_ready_event!(pending_events, $channel_entry.get());
 			}
@@ -4546,7 +4546,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 	}
 
 	fn internal_funding_created(&self, counterparty_node_id: &PublicKey, msg: &msgs::FundingCreated) -> Result<(), MsgHandleErrInternal> {
-		let ((funding_msg, monitor, (mut channel_ready, emit_channel_ready_event)), mut chan) = {
+		let ((funding_msg, monitor, (mut channel_ready, _emit_channel_ready_event)), mut chan) = {
 			let best_block = *self.best_block.read().unwrap();
 			let mut channel_lock = self.channel_state.lock().unwrap();
 			let channel_state = &mut *channel_lock;
@@ -4610,10 +4610,6 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 				if let Some(msg) = channel_ready {
 					send_channel_ready!(channel_state.short_to_chan_info, channel_state.pending_msg_events, chan, msg);
 				}
-				if emit_channel_ready_event {
-					let mut pending_events = self.pending_events.lock().unwrap();
-					emit_channel_ready_event!(pending_events, chan);
-				}
 				e.insert(chan);
 			}
 		}
@@ -4630,7 +4626,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 					if chan.get().get_counterparty_node_id() != *counterparty_node_id {
 						return Err(MsgHandleErrInternal::send_err_msg_no_close("Got a message for a channel from the wrong node!".to_owned(), msg.channel_id));
 					}
-					let (monitor, funding_tx, (channel_ready, emit_channel_ready_event)) = match chan.get_mut().funding_signed(&msg, best_block, &self.logger) {
+					let (monitor, funding_tx, (channel_ready, _emit_channel_ready_event)) = match chan.get_mut().funding_signed(&msg, best_block, &self.logger) {
 						Ok(update) => update,
 						Err(e) => try_chan_entry!(self, Err(e), channel_state, chan),
 					};
@@ -4653,10 +4649,6 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 						send_channel_ready!(channel_state.short_to_chan_info, channel_state.pending_msg_events, chan.get(), msg);
 					}
 
-					if emit_channel_ready_event {
-						let mut pending_events = self.pending_events.lock().unwrap();
-						emit_channel_ready_event!(pending_events, chan.get());
-					}
 					funding_tx
 				},
 				hash_map::Entry::Vacant(_) => return Err(MsgHandleErrInternal::send_err_msg_no_close("Failed to find corresponding channel".to_owned(), msg.channel_id))
@@ -4698,7 +4690,7 @@ impl<M: Deref, T: Deref, K: Deref, F: Deref, L: Deref> ChannelManager<M, T, K, F
 					}
 
 				}
-				if chan.get().is_usable() && chan.get_mut().should_emit_channel_ready_event() {
+				if chan.get_mut().should_emit_channel_ready_event() {
 					let mut pending_events = self.pending_events.lock().unwrap();
 					emit_channel_ready_event!(pending_events, chan.get());
 				}