fix Field rename, comments cleanup

Author: optout21

lightning/src/ln/channel.rs

@@ -1519,7 +1519,7 @@ impl<SP: Deref> Channel<SP> where
 					holder_commitment_point,
 					is_v2_established: true,
 					#[cfg(splicing)]
-					pending_splice_pre: None,
+					pending_splice: None,
 				};
 				let res = funded_channel.commitment_signed_initial_v2(msg, best_block, signer_provider, logger)
 					.map(|monitor| (Some(monitor), None))
@@ -4694,14 +4694,14 @@ fn estimate_v2_funding_transaction_fee(
 	fee_for_weight(funding_feerate_sat_per_1000_weight, weight)
 }
 
-/// Verify that the provided inputs by a counterparty to the funding transaction are enough
-/// to cover the intended contribution amount *plus* the proportional fees of the counterparty.
+/// Verify that the provided inputs to the funding transaction are enough
+/// to cover the intended contribution amount *plus* the proportional fees.
 /// Fees are computed using `estimate_v2_funding_transaction_fee`, and contain
 /// the fees of the inputs, fees of the inputs weight, and for the initiator,
 /// the fees of the common fields as well as the output and extra input weights.
 /// Returns estimated (partial) fees as additional information
 #[cfg(splicing)]
-pub(super) fn check_v2_funding_inputs_sufficient(
+fn check_v2_funding_inputs_sufficient(
 	contribution_amount: i64, funding_inputs: &[(TxIn, Transaction, Weight)], is_initiator: bool,
 	is_splice: bool, funding_feerate_sat_per_1000_weight: u32,
 ) -> Result<u64, ChannelError> {
@@ -4777,7 +4777,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<PendingSplice>,
+	pending_splice: Option<PendingSplice>,
 }
 
 #[cfg(any(test, fuzzing))]
@@ -8415,7 +8415,7 @@ impl<SP: Deref> FundedChannel<SP> where
 	) -> Result<msgs::SpliceInit, APIError> {
 		// Check if a splice has been initiated already.
 		// Note: only a single outstanding splice is supported (per spec)
-		if let Some(splice_info) = &self.pending_splice_pre {
+		if let Some(splice_info) = &self.pending_splice {
 			return Err(APIError::APIMisuseError { err: format!(
 				"Channel {} cannot be spliced, as it has already a splice pending (contribution {})",
 				self.context.channel_id(), splice_info.our_funding_contribution
@@ -8452,7 +8452,7 @@ impl<SP: Deref> FundedChannel<SP> where
 				self.context.channel_id(), err,
 			)})?;
 
-		self.pending_splice_pre = Some(PendingSplice {
+		self.pending_splice = Some(PendingSplice {
 			our_funding_contribution: our_funding_contribution_satoshis,
 		});
 
@@ -8486,8 +8486,7 @@ impl<SP: Deref> FundedChannel<SP> where
 		let our_funding_contribution_satoshis = 0i64;
 
 		// 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.pending_splice_pre {
+		if let Some(splice_info) = &self.pending_splice {
 			return Err(ChannelError::Warn(format!(
 				"Channel has already a splice pending, contribution {}", splice_info.our_funding_contribution,
 			)));
@@ -8541,7 +8540,7 @@ impl<SP: Deref> FundedChannel<SP> where
 	#[cfg(splicing)]
 	pub fn splice_ack(&mut self, _msg: &msgs::SpliceAck) -> Result<(), ChannelError> {
 		// check if splice is pending
-		if self.pending_splice_pre.is_none() {
+		if self.pending_splice.is_none() {
 			return Err(ChannelError::Warn(format!("Channel is not in pending splice")));
 		};
 
@@ -9470,7 +9469,7 @@ impl<SP: Deref> OutboundV1Channel<SP> where SP::Target: SignerProvider {
 			is_v2_established: false,
 			holder_commitment_point,
 			#[cfg(splicing)]
-			pending_splice_pre: None,
+			pending_splice: None,
 		};
 
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
@@ -9739,7 +9738,7 @@ impl<SP: Deref> InboundV1Channel<SP> where SP::Target: SignerProvider {
 			is_v2_established: false,
 			holder_commitment_point,
 			#[cfg(splicing)]
-			pending_splice_pre: None,
+			pending_splice: None,
 		};
 		let need_channel_ready = channel.check_get_channel_ready(0, logger).is_some()
 			|| channel.context.signer_pending_channel_ready;
@@ -11101,7 +11100,7 @@ impl<'a, 'b, 'c, ES: Deref, SP: Deref> ReadableArgs<(&'a ES, &'b SP, &'c Channel
 			is_v2_established,
 			holder_commitment_point,
 			#[cfg(splicing)]
-			pending_splice_pre: None,
+			pending_splice: None,
 		})
 	}
 }

lightning/src/ln/channelmanager.rs

@@ -9544,8 +9544,6 @@ This indicates a bug inside LDK. Please report this error at https://github.com/
 	/// Handle incoming splice request, transition channel to splice-pending (unless some check fails).
 	#[cfg(splicing)]
 	fn internal_splice_init(&self, counterparty_node_id: &PublicKey, msg: &msgs::SpliceInit) -> Result<(), MsgHandleErrInternal> {
-		// TODO(splicing): if we accept splicing, quiescence
-
 		let per_peer_state = self.per_peer_state.read().unwrap();
 		let peer_state_mutex = per_peer_state.get(counterparty_node_id)
 			.ok_or_else(|| {