From: Jeffrey Czyz <jkczyz@gmail.com>
Date: Tue, 1 Feb 2022 20:51:08 +0000 (-0600)
Subject: f - Remove branching
X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;ds=sidebyside;h=5dc5ef7009719e0e5bba2006aa90fe8db9a9db0a;p=rust-lightning

f - Remove branching
---

diff --git a/lightning/src/routing/scoring.rs b/lightning/src/routing/scoring.rs
index d279bd28..c7f36c89 100644
--- a/lightning/src/routing/scoring.rs
+++ b/lightning/src/routing/scoring.rs
@@ -648,7 +648,6 @@ impl<L: DerefMut<Target = u64>> DirectedChannelLiquidity<L> {
 }
 
 impl<G: Deref<Target = NetworkGraph>> Score for ProbabilisticScorer<G> {
-	#[allow(clippy::float_cmp)]
 	fn channel_penalty_msat(
 		&self, short_channel_id: u64, amount_msat: u64, capacity_msat: u64, source: &NodeId,
 		target: &NodeId
@@ -659,13 +658,10 @@ impl<G: Deref<Target = NetworkGraph>> Score for ProbabilisticScorer<G> {
 			.unwrap_or(&ChannelLiquidity::new())
 			.as_directed(source, target, capacity_msat)
 			.success_probability(amount_msat);
-		if success_probability == 0.0 {
-			u64::max_value()
-		} else if success_probability == 1.0 {
-			0
-		} else {
-			(-(success_probability.log10()) * liquidity_penalty_multiplier_msat as f64) as u64
-		}
+		// NOTE: If success_probability is ever changed to return 0.0, log10 is undefined so return
+		// u64::max_value instead.
+		debug_assert!(success_probability > core::f64::EPSILON);
+		(-(success_probability.log10()) * liquidity_penalty_multiplier_msat as f64) as u64
 	}
 
 	fn payment_path_failed(&mut self, path: &[&RouteHop], short_channel_id: u64) {