Sort out PendingSplicePre and -Post, new spliced for ChannelContext and OutboundV2Channel

Author: optout21

lightning/src/ln/channel.rs

@@ -4608,7 +4608,6 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 			latest_monitor_update_id: self.latest_monitor_update_id,
 			shutdown_scriptpubkey: self.shutdown_scriptpubkey.clone(),
 			destination_script: self.destination_script.clone(),
-			// holder_commitment_point: self.holder_commitment_point,
 			cur_counterparty_commitment_transaction_number: self.cur_counterparty_commitment_transaction_number,
 			value_to_self_msat: self.value_to_self_msat,
 			pending_inbound_htlcs: self.pending_inbound_htlcs.clone(),
@@ -4778,7 +4777,7 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 		// self.channel_state = ChannelState::NegotiatingFunding(
 		// 	NegotiatingFundingFlags::OUR_INIT_SENT | NegotiatingFundingFlags::THEIR_INIT_SENT
 		// );
-		log_info!(logger, "Splicing process started, old channel value {}, outgoing {}, channel_id {}",
+		log_info!(logger, "Splicing process started, new channel value {}, outgoing {}, channel_id {}",
 			self.channel_value_satoshis, is_outgoing, self.channel_id);
 	}
 
@@ -9818,6 +9817,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 				our_funding_inputs: funding_inputs,
 			},
 			interactive_tx_constructor: None,
+			#[cfg(splicing)]
 			pending_splice_post: None,
 		};
 		Ok(chan)
@@ -9827,7 +9827,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 	#[cfg(splicing)]
 	pub fn new_spliced<L: Deref>(
 		is_outbound: bool,
-		pre_splice_channel: &mut FundedChannel<SP>,
+		pre_splice_channel: &FundedChannel<SP>,
 		signer_provider: &SP,
 		counterparty_funding_pubkey: &PublicKey,
 		our_funding_contribution: i64,
@@ -9860,7 +9860,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 
 		let context = ChannelContext::new_for_splice(
 			&pre_splice_channel.context,
-			true,
+			is_outbound,
 			counterparty_funding_pubkey,
 			our_funding_contribution,
 			their_funding_contribution,
@@ -10160,7 +10160,7 @@ impl<SP: Deref> PendingV2Channel<SP> where SP::Target: SignerProvider {
 			#[cfg(splicing)]
 			pending_splice_pre: None,
 			#[cfg(splicing)]
-			pending_splice_post: None,
+			pending_splice_post: self.pending_splice_post,
 		};
 
 		Ok(channel)

lightning/src/ln/functional_tests_splice.rs

@@ -221,6 +221,10 @@ fn test_v1_splice_in() {
 
 	// ==== Channel is now ready for normal operation
 
+	// Expected balances
+	let mut exp_balance1 = 1000 * channel_value_sat;
+	let mut exp_balance2 = 0;
+	
 	// === Start of Splicing
 	println!("Start of Splicing ..., channel_id {}", channel_id2);
 
@@ -276,8 +280,8 @@ fn test_v1_splice_in() {
 		assert!(channel.is_usable);
 		assert!(channel.is_channel_ready);
 		assert_eq!(channel.channel_value_satoshis, channel_value_sat);
-		assert_eq!(channel.outbound_capacity_msat, 0);
-		assert!(channel.funding_txo.is_some());
+		assert_eq!(channel.outbound_capacity_msat, exp_balance2);
+		assert_eq!(channel.funding_txo.unwrap().txid, funding_tx.compute_txid());
 		assert!(channel.confirmations.unwrap() > 0);
 	}
 
@@ -295,9 +299,9 @@ fn test_v1_splice_in() {
 		assert_eq!(channel.channel_value_satoshis, channel_value_sat);
 		assert_eq!(
 			channel.outbound_capacity_msat,
-			1000 * (channel_value_sat - channel_reserve_amnt_sat)
+			exp_balance1 - 1000 * channel_reserve_amnt_sat
 		);
-		assert!(channel.funding_txo.is_some());
+		assert_eq!(channel.funding_txo.unwrap().txid, funding_tx.compute_txid());
 		assert!(channel.confirmations.unwrap() > 0);
 	}