f remove interactive_tx_constructor field from Channel & fix error msg

Author: dunxen

lightning/src/ln/channel.rs

@@ -4093,9 +4093,6 @@ pub(super) struct DualFundingChannelContext {
 // Counterparty designates channel data owned by the another channel participant entity.
 pub(super) struct Channel<SP: Deref> where SP::Target: SignerProvider {
 	pub context: ChannelContext<SP>,
-	pub dual_funding_channel_context: Option<DualFundingChannelContext>,
-	/// The current interactive transaction construction session under negotiation.
-	pub interactive_tx_constructor: Option<InteractiveTxConstructor>,
 	pub interactive_tx_signing_session: Option<InteractiveTxSigningSession>,
 }
 
@@ -8337,8 +8334,6 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 
 		let mut channel = Channel {
 			context: self.context,
-			dual_funding_channel_context: None,
-			interactive_tx_constructor: None,
 			interactive_tx_signing_session: None,
 		};
 
@@ -8564,8 +8559,6 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
 		// `ChannelMonitor`.
 		let mut channel = Channel {
 			context: self.context,
-			dual_funding_channel_context: None,
-			interactive_tx_constructor: None,
 			interactive_tx_signing_session: None,
 		};
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some();
@@ -8711,8 +8704,6 @@ impl<SP: Deref> OutboundV2Channel<SP> where SP::Target: SignerProvider {
 	pub fn into_channel(self, signing_session: InteractiveTxSigningSession) -> Result<Channel<SP>, ChannelError>{
 		let channel = Channel {
 			context: self.context,
-			dual_funding_channel_context: Some(self.dual_funding_context),
-			interactive_tx_constructor: None,
 			interactive_tx_signing_session: Some(signing_session),
 		};
 
@@ -8907,8 +8898,6 @@ impl<SP: Deref> InboundV2Channel<SP> where SP::Target: SignerProvider {
 	pub fn into_channel(self, signing_session: InteractiveTxSigningSession) -> Result<Channel<SP>, ChannelError>{
 		let channel = Channel {
 			context: self.context,
-			dual_funding_channel_context: Some(self.dual_funding_context),
-			interactive_tx_constructor: None,
 			interactive_tx_signing_session: Some(signing_session),
 		};
 
@@ -10032,8 +10021,6 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 				blocked_monitor_updates: blocked_monitor_updates.unwrap(),
 				is_manual_broadcast: is_manual_broadcast.unwrap_or(false),
 			},
-			dual_funding_channel_context: None,
-			interactive_tx_constructor: None,
 			interactive_tx_signing_session: None,
 		})
 	}

lightning/src/ln/channelmanager.rs

@@ -8259,10 +8259,9 @@ where
 				let tx_constructor = match channel_phase {
 					ChannelPhase::UnfundedInboundV2(chan) => chan.interactive_tx_constructor_mut(),
 					ChannelPhase::UnfundedOutboundV2(chan) => chan.interactive_tx_constructor_mut(),
-					ChannelPhase::Funded(chan) => &mut chan.interactive_tx_constructor,
 					_ => try_chan_phase_entry!(self, Err(ChannelError::Close(
 						(
-							"Got an unexpected tx_signatures message".into(),
+							"Got an unexpected tx_abort message".into(),
 							ClosureReason::HolderForceClosed { broadcasted_latest_txn: Some(false) },
 						))), chan_phase_entry)
 				};