f float

Author: TheBlueMatt

lightning/src/routing/scoring.rs

@@ -968,16 +968,16 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> ProbabilisticScorerU
 		None
 	}
 
-	/// Query the probability of payment success (times 2^30) sending the given `amount_msat` over
-	/// the channel with `scid` towards the given `target` node, based on the historical estimated
-	/// liquidity bounds.
+	/// Query the probability of payment success sending the given `amount_msat` over the channel
+	/// with `scid` towards the given `target` node, based on the historical estimated liquidity
+	/// bounds.
 	///
 	/// These are the same bounds as returned by
 	/// [`Self::historical_estimated_channel_liquidity_probabilities`] (but not those returned by
 	/// [`Self::estimated_channel_liquidity_range`]).
 	pub fn historical_estimated_payment_success_probability(
 		&self, scid: u64, target: &NodeId, amount_msat: u64)
-	-> Option<u64> {
+	-> Option<f64> {
 		let graph = self.network_graph.read_only();
 
 		if let Some(chan) = graph.channels().get(&scid) {
@@ -991,9 +991,10 @@ impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, T: Time> ProbabilisticScorerU
 						max_liquidity_offset_history: &dir_liq.max_liquidity_offset_history,
 					};
 
-					return buckets.calculate_success_probability_times_billion(T::now(),
+					let prob_bill = buckets.calculate_success_probability_times_billion(T::now(),
 						*dir_liq.last_updated, self.decay_params.historical_no_updates_half_life,
 						amount_msat, directed_info.effective_capacity().as_msat());
+					return prob_bill.map(|p| p as f64 / (1024 * 1024 * 1024) as f64);
 				}
 			}
 		}
@@ -2890,9 +2891,9 @@ mod tests {
 		assert_eq!(scorer.historical_estimated_channel_liquidity_probabilities(42, &target),
 			Some(([32, 0, 0, 0, 0, 0, 0, 0], [32, 0, 0, 0, 0, 0, 0, 0])));
 		assert_eq!(scorer.historical_estimated_payment_success_probability(42, &target, 1),
-			Some(1024 * 1024 * 1024));
+			Some(1.0));
 		assert_eq!(scorer.historical_estimated_payment_success_probability(42, &target, 500),
-			Some(0));
+			Some(0.0));
 
 		// Even after we tell the scorer we definitely have enough available liquidity, it will
 		// still remember that there was some failure in the past, and assign a non-0 penalty.
@@ -2906,12 +2907,12 @@ mod tests {
 		// simply check bounds here.
 		let five_hundred_prob =
 			scorer.historical_estimated_payment_success_probability(42, &target, 500).unwrap();
-		assert!(five_hundred_prob > 512 * 1024 * 1024); // 0.5
-		assert!(five_hundred_prob < 532 * 1024 * 1024); // ~ 0.52
+		assert!(five_hundred_prob > 0.5);
+		assert!(five_hundred_prob < 0.52);
 		let one_prob =
 			scorer.historical_estimated_payment_success_probability(42, &target, 1).unwrap();
-		assert!(one_prob < 1024 * 1024 * 1024);
-		assert!(one_prob > 1023 * 1024 * 1024);
+		assert!(one_prob < 1.0);
+		assert!(one_prob > 0.99);
 
 		// Advance the time forward 16 half-lives (which the docs claim will ensure all data is
 		// gone), and check that we're back to where we started.