f - DRY

Author: jkczyz

lightning/src/ln/channel.rs

@@ -7274,13 +7274,15 @@ where
 
 		#[cfg(any(test, fuzzing))]
 		{
-			*self.funding.next_local_commitment_tx_fee_info_cached.lock().unwrap() = None;
-			*self.funding.next_remote_commitment_tx_fee_info_cached.lock().unwrap() = None;
-			if let Some(pending_splice) = self.pending_splice.as_mut() {
-				for funding in pending_splice.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;
-				}
+			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(),
+			) {
+				*funding.next_local_commitment_tx_fee_info_cached.lock().unwrap() = None;
+				*funding.next_remote_commitment_tx_fee_info_cached.lock().unwrap() = None;
 			}
 		}
 
@@ -7481,13 +7483,15 @@ where
 			}
 		}
 
-		self.funding.value_to_self_msat =
-			(self.funding.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
-		if let Some(pending_splice) = self.pending_splice.as_mut() {
-			for funding in pending_splice.pending_funding.iter_mut() {
-				funding.value_to_self_msat =
-					(funding.value_to_self_msat as i64 + value_to_self_msat_diff) as u64;
-			}
+		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(),
+		) {
+			funding.value_to_self_msat =
+				(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 {