f - Only use min in NegativeLogSuccessProbability

Author: jkczyz

lightning/src/routing/scoring.rs

@@ -686,16 +686,18 @@ impl<L: Deref<Target = u64>, T: Time, U: Deref<Target = T>> DirectedChannelLiqui
 		let max_liquidity_msat = self.max_liquidity_msat();
 		let min_liquidity_msat = core::cmp::min(self.min_liquidity_msat(), max_liquidity_msat);
 		if amount_msat > max_liquidity_msat {
-			u64::max_value()
+			max_penalty_msat
 		} else if amount_msat <= min_liquidity_msat {
 			0
 		} else {
 			let numerator = max_liquidity_msat + 1 - amount_msat;
 			let denominator = max_liquidity_msat + 1 - min_liquidity_msat;
 			match params.cost_function {
 				ProbabilisticScoringCostFunction::NegativeLogSuccessProbability => {
-					approx::negative_log10_times_1024(numerator, denominator)
-						.saturating_mul(params.liquidity_penalty_multiplier_msat) / 1024
+					let penalty_msat = approx::negative_log10_times_1024(numerator, denominator)
+						.saturating_mul(params.liquidity_penalty_multiplier_msat) / 1024;
+					// Upper bound the penalty to ensure some channel is selected.
+					penalty_msat.min(max_penalty_msat)
 				},
 				ProbabilisticScoringCostFunction::TwiceFailureProbability => {
 					// Avoid floating-point operations by multiplying the coefficient through:
@@ -705,8 +707,6 @@ impl<L: Deref<Target = u64>, T: Time, U: Deref<Target = T>> DirectedChannelLiqui
 				},
 			}
 		}
-		// Upper bound the penalty to ensure some channel is selected.
-		.min(max_penalty_msat)
 	}
 
 	/// Returns the lower bound of the channel liquidity balance in this direction.