more test

Author: joostjager

lightning/src/routing/scoring.rs

@@ -1135,6 +1135,8 @@ impl ChannelLiquidity {
 	}
 
 	fn merge(&mut self, other: &Self) {
+		// Todo: check updated times for equality.
+
 		// Take average for min/max liquidity offsets.
 		self.min_liquidity_offset_msat = (self.min_liquidity_offset_msat + other.min_liquidity_offset_msat) / 2;
 		self.max_liquidity_offset_msat = (self.max_liquidity_offset_msat + other.max_liquidity_offset_msat) / 2;
@@ -2306,7 +2308,7 @@ mod tests {
 	use crate::ln::msgs::{ChannelAnnouncement, ChannelUpdate, UnsignedChannelAnnouncement, UnsignedChannelUpdate};
 	use crate::routing::gossip::{EffectiveCapacity, NetworkGraph, NodeId};
 	use crate::routing::router::{BlindedTail, Path, RouteHop, CandidateRouteHop, PublicHopCandidate};
-	use crate::routing::scoring::{ChannelUsage, ScoreLookUp, ScoreUpdate};
+	use crate::routing::scoring::{ChannelLiquidities, ChannelUsage, CombinedScorer, ScoreLookUp, ScoreUpdate};
 	use crate::util::ser::{ReadableArgs, Writeable};
 	use crate::util::test_utils::{self, TestLogger};
 
@@ -2316,6 +2318,7 @@ mod tests {
 	use bitcoin::network::Network;
 	use bitcoin::secp256k1::{PublicKey, Secp256k1, SecretKey};
 	use core::time::Duration;
+use std::rc::Rc;
 	use crate::io;
 
 	fn source_privkey() -> SecretKey {
@@ -3814,12 +3817,11 @@ mod tests {
 		let network_graph = network_graph(&logger);
 		let params = ProbabilisticScoringFeeParameters::default();
 		let mut scorer = ProbabilisticScorer::new(ProbabilisticScoringDecayParameters::default(), &network_graph, &logger);
+		scorer.payment_path_failed(&payment_path_for_amount(600), 42, Duration::ZERO);
 
-		scorer.payment_path_failed(&payment_path_for_amount(500), 42, Duration::ZERO);
+		let mut combined_scorer = CombinedScorer::new(scorer);
 
 		let source = source_node_id();
-
-		let base_penalty_msat = params.base_penalty_msat;
 		let usage = ChannelUsage {
 			amount_msat: 750,
 			inflight_htlc_msat: 0,
@@ -3832,11 +3834,22 @@ mod tests {
 			info,
 			short_channel_id: 42,
 		});
-		let penalty = scorer.channel_penalty_msat(&candidate, usage, &params);
+		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).
+			successful(1000, Duration::ZERO, format_args!("test channel"), logger_rc.as_ref());
 
+		let mut external_scores = ChannelLiquidities::new();
+	
+		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);
+	}
 }
 
 #[cfg(ldk_bench)]