f don't use separate for loop for htlc min

Author: valentinewallace

lightning/src/blinded_path/payment.rs

@@ -159,7 +159,8 @@ pub(super) fn compute_payinfo(
 	let mut curr_base_fee: u64 = 0;
 	let mut curr_prop_mil: u64 = 0;
 	let mut cltv_expiry_delta: u16 = 0;
-	for (_, tlvs) in intermediate_nodes.iter().rev() {
+	let mut htlc_minimum_msat = payee_tlvs.payment_constraints.htlc_minimum_msat as u128;
+	for (idx, (_, tlvs)) in intermediate_nodes.iter().enumerate().rev() {
 		// In the future, we'll want to take the intersection of all supported features for the
 		// `BlindedPayInfo`, but there are no features in that context right now.
 		if tlvs.features.requires_unknown_bits_from(&BlindedHopFeatures::empty()) { return Err(()) }
@@ -183,11 +184,8 @@ pub(super) fn compute_payinfo(
 			.ok_or(())?;
 
 		cltv_expiry_delta = cltv_expiry_delta.checked_add(tlvs.payment_relay.cltv_expiry_delta).ok_or(())?;
-	}
 
-	let mut htlc_minimum_msat = 0;
-	for (idx, node) in intermediate_nodes.iter().map(|(_, tlvs)| tlvs).enumerate() {
-		let mut htlc_min_candidate = node.payment_constraints.htlc_minimum_msat as u128;
+		let mut htlc_min_candidate = tlvs.payment_constraints.htlc_minimum_msat as u128;
 		// Get an iterator over `(curr_hop_tlvs..last_intermediate_hop_tlvs]`.
 		let next_nodes = intermediate_nodes.iter()
 			.enumerate()
@@ -208,8 +206,6 @@ pub(super) fn compute_payinfo(
 		}
 		htlc_minimum_msat = core::cmp::max(htlc_min_candidate, htlc_minimum_msat);
 	}
-	htlc_minimum_msat =
-		core::cmp::max(payee_tlvs.payment_constraints.htlc_minimum_msat as u128, htlc_minimum_msat);
 
 	Ok(BlindedPayInfo {
 		fee_base_msat: u32::try_from(curr_base_fee).map_err(|_| ())?,