Move PendingSpliceInfoPre to Channel (from ChannelContext)

Author: optout21

lightning/src/ln/channel.rs

@@ -1599,10 +1599,6 @@ pub(super) struct ChannelContext<SP: Deref> where SP::Target: SignerProvider {
 	secp_ctx: Secp256k1<secp256k1::All>,
 	channel_value_satoshis: u64,
 
-	/// Info about an in-progress, pending splice (if any), on the pre-splice channel
-	#[cfg(splicing)]
-	pending_splice_pre: Option<PendingSpliceInfoPre>,
-	
 	latest_monitor_update_id: u64,
 
 	holder_signer: ChannelSignerType<SP>,
@@ -2315,6 +2311,8 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 					context: self.context,
 					interactive_tx_signing_session: Some(signing_session),
 					holder_commitment_point,
+					#[cfg(splicing)]
+					pending_splice_pre: None,
 				};
 				Ok((funded_chan, commitment_signed, funding_ready_for_sig_event))
 			},
@@ -2665,9 +2663,6 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			is_manual_broadcast: false,
 
 			next_funding_txid: None,
-
-			#[cfg(splicing)]
-			pending_splice_pre: None,
 		};
 
 		Ok(channel_context)
@@ -2895,9 +2890,6 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			local_initiated_shutdown: None,
 			is_manual_broadcast: false,
 			next_funding_txid: None,
-
-			#[cfg(splicing)]
-			pending_splice_pre: None,
 		})
 	}
 
@@ -4733,6 +4725,9 @@ pub(super) struct FundedChannel<SP: Deref> where SP::Target: SignerProvider {
 	pub context: ChannelContext<SP>,
 	pub interactive_tx_signing_session: Option<InteractiveTxSigningSession>,
 	holder_commitment_point: HolderCommitmentPoint,
+	/// Info about an in-progress, pending splice (if any), on the pre-splice channel
+	#[cfg(splicing)]
+	pending_splice_pre: Option<PendingSpliceInfoPre>,
 }
 
 #[cfg(any(test, fuzzing))]
@@ -8319,7 +8314,7 @@ impl<SP: Deref> FundedChannel<SP> where
 	) -> Result<msgs::SpliceInit, ChannelError> {
 		// Check if a splice has been initiated already.
 		// Note: this could be handled more nicely, and support multiple outstanding splice's, the incoming splice_ack matters anyways.
-		if let Some(splice_info) = &self.context.pending_splice_pre {
+		if let Some(splice_info) = &self.pending_splice_pre {
 			return Err(ChannelError::Warn(format!(
 				"Channel has already a splice pending, contribution {}", splice_info.our_funding_contribution
 			)));
@@ -8348,7 +8343,7 @@ impl<SP: Deref> FundedChannel<SP> where
 		// Note: post-splice channel value is not yet known at this point, counterpary contribution is not known
 		// (Cannot test for miminum required post-splice channel value)
 
-		self.context.pending_splice_pre = Some(PendingSpliceInfoPre {
+		self.pending_splice_pre = Some(PendingSpliceInfoPre {
 			our_funding_contribution: our_funding_contribution_satoshis,
 		});
 
@@ -8365,7 +8360,7 @@ impl<SP: Deref> FundedChannel<SP> where
 
 		// Check if a splice has been initiated already.
 		// Note: this could be handled more nicely, and support multiple outstanding splice's, the incoming splice_ack matters anyways.
-		if let Some(splice_info) = &self.context.pending_splice_pre {
+		if let Some(splice_info) = &self.pending_splice_pre {
 			return Err(ChannelError::Warn(format!(
 				"Channel has already a splice pending, contribution {}", splice_info.our_funding_contribution,
 			)));
@@ -8414,7 +8409,7 @@ impl<SP: Deref> FundedChannel<SP> where
 		let their_funding_contribution_satoshis = msg.funding_contribution_satoshis;
 
 		// check if splice is pending
-		let pending_splice = if let Some(pending_splice) = &self.context.pending_splice_pre {
+		let pending_splice = if let Some(pending_splice) = &self.pending_splice_pre {
 			pending_splice
 		} else {
 			return Err(ChannelError::Warn(format!("Channel is not in pending splice")));
@@ -9124,6 +9119,8 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 			context: self.context,
 			interactive_tx_signing_session: None,
 			holder_commitment_point,
+			#[cfg(splicing)]
+			pending_splice_pre: None,
 		};
 
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
@@ -9389,6 +9386,8 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
 			context: self.context,
 			interactive_tx_signing_session: None,
 			holder_commitment_point,
+			#[cfg(splicing)]
+			pending_splice_pre: None,
 		};
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
 			|| channel.context.signer_pending_channel_ready;
@@ -10769,12 +10768,11 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, u32, &'c Ch
 				// during a signing session, but have not received `tx_signatures` we MUST set `next_funding_txid`
 				// to the txid of that interactive transaction, else we MUST NOT set it.
 				next_funding_txid: None,
-
-				#[cfg(splicing)]
-				pending_splice_pre: None,
 			},
 			interactive_tx_signing_session: None,
 			holder_commitment_point,
+			#[cfg(splicing)]
+			pending_splice_pre: None,
 		})
 	}
 }

lightning/src/ln/channelmanager.rs

@@ -4256,7 +4256,7 @@ where
 		// Look for the channel
 		match peer_state.channel_by_id.entry(*channel_id) {
 			hash_map::Entry::Occupied(mut chan_phase_entry) => {
-				if let ChannelPhase::Funded(chan) = chan_phase_entry.get_mut() {
+				if let Some(chan) = chan_phase_entry.get_mut().as_funded_mut() {
 					let msg = match chan.splice_channel(our_funding_contribution_satoshis, funding_feerate_perkw, locktime) {
 						Ok(msg) => msg,
 						Err(err) => return Err(APIError::APIMisuseError {
@@ -9378,7 +9378,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					counterparty_node_id, msg.channel_id,
 				), msg.channel_id)),
 			hash_map::Entry::Occupied(mut chan_entry) => {
-				if let ChannelPhase::Funded(chan) = chan_entry.get_mut() {
+				if let Some(chan) = chan_entry.get_mut().as_funded_mut() {
 					match chan.splice_init(msg) {
 						Ok(splice_ack_msg) => {
 							peer_state.pending_msg_events.push(events::MessageSendEvent::SendSpliceAck {
@@ -9423,7 +9423,7 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 					counterparty_node_id
 				), msg.channel_id)),
 			hash_map::Entry::Occupied(mut chan) => {
-				if let ChannelPhase::Funded(chan) = chan.get_mut() {
+				if let Some(chan) = chan.get_mut().as_funded_mut() {
 					match chan.splice_ack(msg) {
 						Ok(_) => {}
 						Err(err) => {