more test coverage

Author: joostjager

lightning/src/routing/scoring.rs

@@ -2203,7 +2203,54 @@ mod bucketed_history {
 			Some((cumulative_success_prob * (1024.0 * 1024.0 * 1024.0)) as u64)
 		}
 	}
+
+	#[cfg(test)]
+	mod tests {
+    use crate::routing::scoring::ProbabilisticScoringFeeParameters;
+
+    use super::{HistoricalBucketRangeTracker, HistoricalLiquidityTracker};
+		#[test]
+		fn historical_liquidity_bucket_merge() {
+			let mut bucket1 = HistoricalBucketRangeTracker::new();
+			bucket1.track_datapoint(100, 1000);
+			assert_eq!(bucket1.buckets, [0u16,0,0,0,0,0,0,0,0,0,0,32,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]);
+
+			let mut bucket2 = HistoricalBucketRangeTracker::new();
+			bucket2.track_datapoint(0, 1000);
+			assert_eq!(bucket2.buckets, [32u16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]);
+
+			bucket1.merge(&bucket2);
+			assert_eq!(bucket1.buckets, [16u16,0,0,0,0,0,0,0,0,0,0,16,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0]);
+		}
+
+		#[test]
+		fn historical_liquidity_tracker_merge() {
+			let params = ProbabilisticScoringFeeParameters::default();
+
+			let probability1: Option<u64>;
+			let mut tracker1 = HistoricalLiquidityTracker::new();		
+			{
+				let mut directed_tracker1 = tracker1.as_directed_mut(true);
+				directed_tracker1.track_datapoint(100, 200, 1000);
+				probability1 = directed_tracker1.calculate_success_probability_times_billion(&params, 500, 1000);
+			}
+			
+			let mut tracker2 = HistoricalLiquidityTracker::new();		
+			{
+				let mut directed_tracker2 = tracker2.as_directed_mut(true);
+				directed_tracker2.track_datapoint(200, 300, 1000);
+			}
+
+			tracker1.merge(&tracker2);
+
+			let directed_tracker1 = tracker1.as_directed(true);
+			let probability = directed_tracker1.calculate_success_probability_times_billion(&params, 500, 1000);
+
+			assert_ne!(probability1, probability);
+		}
+	}
 }
+
 use bucketed_history::{LegacyHistoricalBucketRangeTracker, HistoricalBucketRangeTracker, DirectedHistoricalLiquidityTracker, HistoricalLiquidityTracker};
 
 impl<G: Deref<Target = NetworkGraph<L>>, L: Deref> Writeable for ProbabilisticScorer<G, L> where L::Target: Logger {
@@ -2300,7 +2347,7 @@ impl Readable for ChannelLiquidity {
 
 #[cfg(test)]
 mod tests {
-	use super::{ChannelLiquidity, HistoricalLiquidityTracker, ProbabilisticScoringFeeParameters, ProbabilisticScoringDecayParameters, ProbabilisticScorer};
+	use super::{ChannelLiquidity, HistoricalLiquidityTracker, ProbabilisticScorer, ProbabilisticScoringDecayParameters, ProbabilisticScoringFeeParameters};
 	use crate::blinded_path::BlindedHop;
 	use crate::util::config::UserConfig;
 
@@ -3835,8 +3882,7 @@ use std::rc::Rc;
 			short_channel_id: 42,
 		});
 		let penalty = combined_scorer.channel_penalty_msat(&candidate, usage, &params);
-		assert_eq!(penalty, 100000021275);
-
+		
 		let mut external_liquidity = ChannelLiquidity::new(Duration::ZERO);
 		let logger_rc = Rc::new(&logger);	// Why necessary and not above for the network graph?
 		external_liquidity.as_directed_mut(&source_node_id(), &target_node_id(), 1_000).
@@ -3847,8 +3893,10 @@ use std::rc::Rc;
 		external_scores.insert(42, external_liquidity);
 		combined_scorer.merge(external_scores);
 
-		let penalty = combined_scorer.channel_penalty_msat(&candidate, usage, &params);
-		assert_eq!(penalty, 100000021275);
+		let penalty_after_merge = combined_scorer.channel_penalty_msat(&candidate, usage, &params);
+		
+		// Since the external source observed a successful payment, the penalty should be lower after the merge.
+		assert!(penalty_after_merge < penalty);
 	}
 }