Rename PendingInfo

Author: optout21

lightning/src/ln/channel.rs

@@ -1722,7 +1722,7 @@ impl FundingScope {
 /// Info about a pending splice, used in the pre-splice channel
 #[cfg(splicing)]
 #[derive(Clone)]
-struct PendingSpliceInfoPre {
+struct PendingSplice {
 	pub our_funding_contribution: i64,
 	pub funding_feerate_perkw: u32,
 	pub locktime: u32,
@@ -1731,7 +1731,7 @@ struct PendingSpliceInfoPre {
 }
 
 #[cfg(splicing)]
-impl PendingSpliceInfoPre {
+impl PendingSplice {
 	#[inline]
 	fn add_checked(base: u64, delta: i64) -> u64 {
 		if delta >= 0 {
@@ -4737,18 +4737,6 @@ impl<SP: Deref> ChannelContext<SP> where SP::Target: SignerProvider {
 		self.get_initial_counterparty_commitment_signature(funding, logger)
 	}
 
-	/// Splice process starting; update state, log, etc.
-	#[cfg(splicing)]
-	pub(crate) fn splice_start<L: Deref>(&mut self, is_outgoing: bool, logger: &L) where L::Target: Logger {
-		// Set state, by this point splice_init/splice_ack handshake is complete
-		// TODO(splicing)
-		// 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 {}",
-			self.channel_value_satoshis, is_outgoing, self.channel_id);
-	}
-
 	/// Get the splice message that can be sent during splice initiation.
 	#[cfg(splicing)]
 	pub fn get_splice_init(&self, our_funding_contribution_satoshis: i64,
@@ -4902,7 +4890,7 @@ pub(super) struct FundedChannel<SP: Deref> where SP::Target: SignerProvider {
 	is_v2_established: bool,
 	/// Info about an in-progress, pending splice (if any), on the pre-splice channel
 	#[cfg(splicing)]
-	pending_splice_pre: Option<PendingSpliceInfoPre>,
+	pending_splice_pre: Option<PendingSplice>,
 }
 
 #[cfg(any(test, fuzzing))]
@@ -8582,7 +8570,7 @@ impl<SP: Deref> FundedChannel<SP> where
 			)));
 		}
 
-		self.pending_splice_pre = Some(PendingSpliceInfoPre {
+		self.pending_splice_pre = Some(PendingSplice {
 			our_funding_contribution: our_funding_contribution_satoshis,
 			funding_feerate_perkw,
 			locktime,
@@ -8633,16 +8621,16 @@ impl<SP: Deref> FundedChannel<SP> where
 			)));
 		}
 
-		let post_channel_value = PendingSpliceInfoPre::compute_post_value(pre_channel_value, their_funding_contribution_satoshis, our_funding_contribution_satoshis);
-		let post_balance = PendingSpliceInfoPre::add_checked(self.funding.value_to_self_msat, our_funding_contribution_satoshis);
+		let post_channel_value = PendingSplice::compute_post_value(pre_channel_value, their_funding_contribution_satoshis, our_funding_contribution_satoshis);
+		let post_balance = PendingSplice::add_checked(self.funding.value_to_self_msat, our_funding_contribution_satoshis);
 		// Early check for reserve requirement, assuming maximum balance of full channel value
 		// This will also be checked later at tx_complete
 		let _res = self.context.check_balance_meets_reserve_requirements(post_balance, post_channel_value)?;
 
 		// TODO(splicing): Store msg.funding_pubkey
 
 		// Apply start of splice change in the state
-		self.context.splice_start(false, logger);
+		self.splice_start(false, logger);
 
 		let splice_ack_msg = self.context.get_splice_ack(our_funding_contribution_satoshis);
 
@@ -8670,14 +8658,14 @@ impl<SP: Deref> FundedChannel<SP> where
 		let our_funding_contribution = pending_splice.our_funding_contribution;
 
 		let pre_channel_value = self.funding.get_value_satoshis();
-		let post_channel_value = PendingSpliceInfoPre::compute_post_value(pre_channel_value, our_funding_contribution, their_funding_contribution_satoshis);
-		let post_balance = PendingSpliceInfoPre::add_checked(self.funding.value_to_self_msat, our_funding_contribution);
+		let post_channel_value = PendingSplice::compute_post_value(pre_channel_value, our_funding_contribution, their_funding_contribution_satoshis);
+		let post_balance = PendingSplice::add_checked(self.funding.value_to_self_msat, our_funding_contribution);
 		// Early check for reserve requirement, assuming maximum balance of full channel value
 		// This will also be checked later at tx_complete
 		let _res = self.context.check_balance_meets_reserve_requirements(post_balance, post_channel_value)?;
 
 		// Apply start of splice change in the state
-		self.context.splice_start(true, logger);
+		self.splice_start(true, logger);
 
 		// TODO(splicing): start interactive funding negotiation
 		// let tx_msg_opt = self.begin_interactive_funding_tx_construction(signer_provider, entropy_source, holder_node_id)
@@ -8686,6 +8674,18 @@ impl<SP: Deref> FundedChannel<SP> where
 		Ok(None)
 	}
 
+	/// Splice process starting; update state, log, etc.
+	#[cfg(splicing)]
+	pub(crate) fn splice_start<L: Deref>(&mut self, is_outgoing: bool, logger: &L) where L::Target: Logger {
+		// Set state, by this point splice_init/splice_ack handshake is complete
+		// TODO(splicing)
+		// 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 {}",
+			self.funding.channel_value_satoshis, is_outgoing, self.context.channel_id);
+	}
+
 	// Send stuff to our remote peers:
 
 	/// Queues up an outbound HTLC to send by placing it in the holding cell. You should call
@@ -13057,9 +13057,9 @@ mod tests {
 
 	#[cfg(all(test, splicing))]
 	fn get_pre_and_post(pre_channel_value: u64, our_funding_contribution: i64, their_funding_contribution: i64) -> (u64, u64) {
-		use crate::ln::channel::PendingSpliceInfoPre;
+		use crate::ln::channel::PendingSplice;
 
-		let post_channel_value = PendingSpliceInfoPre::compute_post_value(pre_channel_value, our_funding_contribution, their_funding_contribution);
+		let post_channel_value = PendingSplice::compute_post_value(pre_channel_value, our_funding_contribution, their_funding_contribution);
 		(pre_channel_value, post_channel_value)
 	}