f - funding_and_pending_funding_iter_mut

Author: jkczyz

lightning/src/ln/channel.rs

@@ -6010,6 +6010,22 @@ where
 		&[]
 	}
 
+	#[cfg(splicing)]
+	fn funding_and_pending_funding_iter_mut(&mut self) -> impl Iterator<Item = &mut FundingScope> {
+		core::iter::once(&mut self.funding).chain(
+			self.pending_splice
+				.as_mut()
+				.map(|pending_splice| pending_splice.pending_funding.as_mut_slice())
+				.unwrap_or(&mut [])
+				.iter_mut(),
+		)
+	}
+
+	#[cfg(not(splicing))]
+	fn funding_and_pending_funding_iter_mut(&mut self) -> impl Iterator<Item = &mut FundingScope> {
+		core::iter::once(&mut self.funding)
+	}
+
 	#[rustfmt::skip]
 	fn check_remote_fee<F: Deref, L: Deref>(
 		channel_type: &ChannelTypeFeatures, fee_estimator: &LowerBoundedFeeEstimator<F>,
@@ -7280,13 +7296,7 @@ where
 
 		#[cfg(any(test, fuzzing))]
 		{
-			for funding in core::iter::once(&mut self.funding).chain(
-				self.pending_splice
-					.as_mut()
-					.map(|pending_splice| pending_splice.pending_funding.as_mut_slice())
-					.unwrap_or(&mut [])
-					.iter_mut(),
-			) {
+			for funding in self.funding_and_pending_funding_iter_mut() {
 				*funding.next_local_commitment_tx_fee_info_cached.lock().unwrap() = None;
 				*funding.next_remote_commitment_tx_fee_info_cached.lock().unwrap() = None;
 			}
@@ -7489,21 +7499,10 @@ where
 			}
 		}
 
-		#[cfg(splicing)]
-		for funding in core::iter::once(&mut self.funding).chain(
-			self.pending_splice
-				.as_mut()
-				.map(|pending_splice| pending_splice.pending_funding.as_mut_slice())
-				.unwrap_or(&mut [])
-				.iter_mut(),
-		) {
+		for funding in self.funding_and_pending_funding_iter_mut() {
 			funding.value_to_self_msat =
 				(funding.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
 		}
-		#[cfg(not(splicing))] {
-			self.funding.value_to_self_msat =
-				(self.funding.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
-		}
 
 		if let Some((feerate, update_state)) = self.context.pending_update_fee {
 			match update_state {
@@ -9916,21 +9915,9 @@ where
 	where
 		L::Target: Logger,
 	{
-		let unconfirmed_funding = (self.funding.get_funding_txid() == Some(*txid))
-			.then(|| &mut self.funding)
-			.or_else(|| {
-				#[cfg(splicing)] {
-					self.pending_splice.as_mut().and_then(|pending_splice| {
-						pending_splice
-							.pending_funding
-							.iter_mut()
-							.find(|funding| funding.get_funding_txid() == Some(*txid))
-					})
-				}
-				#[cfg(not(splicing))] {
-					None
-				}
-			});
+		let unconfirmed_funding = self
+			.funding_and_pending_funding_iter_mut()
+			.find(|funding| funding.get_funding_txid() == Some(*txid));
 
 		if let Some(funding) = unconfirmed_funding {
 			if funding.funding_tx_confirmation_height != 0 {