f create event within channelmanager and not channel

Author: dunxen

lightning/src/ln/channel.rs

@@ -35,7 +35,7 @@ use crate::chain::channelmonitor::{
 use crate::chain::transaction::{OutPoint, TransactionData};
 use crate::chain::BestBlock;
 use crate::events::bump_transaction::BASE_INPUT_WEIGHT;
-use crate::events::{ClosureReason, Event};
+use crate::events::ClosureReason;
 use crate::ln::chan_utils;
 #[cfg(splicing)]
 use crate::ln::chan_utils::FUNDING_TRANSACTION_WITNESS_WEIGHT;
@@ -1763,7 +1763,7 @@ where
 
 	pub fn funding_tx_constructed<L: Deref>(
 		&mut self, signing_session: InteractiveTxSigningSession, logger: &L,
-	) -> Result<(msgs::CommitmentSigned, Option<Event>), ChannelError>
+	) -> Result<(msgs::CommitmentSigned, Option<Transaction>), ChannelError>
 	where
 		L::Target: Logger,
 	{
@@ -2925,7 +2925,7 @@ where
 	#[rustfmt::skip]
 	pub fn funding_tx_constructed<L: Deref>(
 		&mut self, mut signing_session: InteractiveTxSigningSession, logger: &L
-	) -> Result<(msgs::CommitmentSigned, Option<Event>), ChannelError>
+	) -> Result<(msgs::CommitmentSigned, Option<Transaction>), ChannelError>
 	where
 		L::Target: Logger
 	{
@@ -2967,7 +2967,7 @@ where
 			},
 		};
 
-		let funding_ready_for_sig_event_opt = if signing_session.local_inputs_count() == 0 {
+		let funding_tx_opt = if signing_session.local_inputs_count() == 0 {
 			debug_assert_eq!(our_funding_satoshis, 0);
 			if signing_session.provide_holder_witnesses(self.context.channel_id, Vec::new()).is_err() {
 				debug_assert!(
@@ -2981,12 +2981,7 @@ where
 			}
 			None
 		} else {
-			Some(Event::FundingTransactionReadyForSigning {
-				channel_id: self.context.channel_id,
-				counterparty_node_id: self.context.counterparty_node_id,
-				user_channel_id: self.context.user_id,
-				unsigned_transaction: signing_session.unsigned_tx().build_unsigned_tx(),
-			})
+			Some(signing_session.unsigned_tx().build_unsigned_tx())
 		};
 
 		let mut channel_state = ChannelState::FundingNegotiated(FundingNegotiatedFlags::new());
@@ -2997,7 +2992,7 @@ where
 		self.interactive_tx_constructor.take();
 		self.interactive_tx_signing_session = Some(signing_session);
 
-		Ok((commitment_signed, funding_ready_for_sig_event_opt))
+		Ok((commitment_signed, funding_tx_opt))
 	}
 }
 

lightning/src/ln/channelmanager.rs

@@ -9108,13 +9108,19 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					peer_state.pending_msg_events.push(msg_send_event);
 				};
 				if let Some(signing_session) = signing_session_opt {
-					let (commitment_signed, funding_ready_for_sig_event_opt) = chan_entry
+					let (commitment_signed, funding_tx_opt) = chan_entry
 						.get_mut()
 						.funding_tx_constructed(signing_session, &self.logger)
 						.map_err(|err| MsgHandleErrInternal::send_err_msg_no_close(format!("{}", err), msg.channel_id))?;
-					if let Some(funding_ready_for_sig_event) = funding_ready_for_sig_event_opt {
+					if let Some(unsigned_transaction) = funding_tx_opt {
 						let mut pending_events = self.pending_events.lock().unwrap();
-						pending_events.push_back((funding_ready_for_sig_event, None));
+						pending_events.push_back((
+							Event::FundingTransactionReadyForSigning {
+								unsigned_transaction,
+								counterparty_node_id,
+								channel_id: msg.channel_id,
+								user_channel_id: chan_entry.get().context().get_user_id(),
+							}, None));
 					}
 					peer_state.pending_msg_events.push(MessageSendEvent::UpdateHTLCs {
 						node_id: counterparty_node_id,