X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fscoring.rs;h=337fd8eec7a895ce5198edb3a9774267048de03d;hb=0c677533fc3055163c1768ef2211fbf7317d65ab;hp=5d637a859903bfa34f849328ac366517b541394b;hpb=becdf6fb27d5aafd7ca3614cfdb10f8a17c946f5;p=rust-lightning diff --git a/lightning/src/routing/scoring.rs b/lightning/src/routing/scoring.rs index 5d637a85..337fd8ee 100644 --- a/lightning/src/routing/scoring.rs +++ b/lightning/src/routing/scoring.rs @@ -1344,13 +1344,11 @@ impl>, L: Deref, T: Time> ScoreLookUp for Prob fn channel_penalty_msat( &self, candidate: &CandidateRouteHop, usage: ChannelUsage, score_params: &ProbabilisticScoringFeeParameters ) -> u64 { - let scid = match candidate.short_channel_id() { - Some(scid) => scid, - None => return 0, - }; - let target = match candidate.target() { - Some(target) => target, - None => return 0, + let (scid, target) = match candidate { + CandidateRouteHop::PublicHop { info, short_channel_id } => { + (short_channel_id, info.target()) + }, + _ => return 0, }; let source = candidate.source(); if let Some(penalty) = score_params.manual_node_penalties.get(&target) { @@ -2244,10 +2242,6 @@ mod tests { PublicKey::from_secret_key(&secp_ctx, &recipient_privkey()) } - fn sender_node_id() -> NodeId { - NodeId::from_pubkey(&sender_pubkey()) - } - fn recipient_node_id() -> NodeId { NodeId::from_pubkey(&recipient_pubkey()) } @@ -2902,7 +2896,7 @@ mod tests { effective_capacity: EffectiveCapacity::Total { capacity_msat: 1_024, htlc_maximum_msat: 1_024 }, }; let channel = network_graph.read_only().channel(42).unwrap().to_owned(); - let (info, target) = channel.as_directed_from(&source).unwrap(); + let (info, _) = channel.as_directed_from(&source).unwrap(); let candidate = CandidateRouteHop::PublicHop { info, short_channel_id: 42, @@ -3002,7 +2996,7 @@ mod tests { effective_capacity: EffectiveCapacity::Total { capacity_msat: 1_024, htlc_maximum_msat: 1_000 }, }; let channel = network_graph.read_only().channel(42).unwrap().to_owned(); - let (info, target) = channel.as_directed_from(&source).unwrap(); + let (info, _) = channel.as_directed_from(&source).unwrap(); let candidate = CandidateRouteHop::PublicHop { info, short_channel_id: 42, @@ -3388,6 +3382,7 @@ mod tests { assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), u64::max_value()); } + #[test] fn remembers_historical_failures() { let logger = TestLogger::new(); let network_graph = network_graph(&logger); @@ -3402,6 +3397,7 @@ mod tests { }; let mut scorer = ProbabilisticScorer::new(decay_params, &network_graph, &logger); let source = source_node_id(); + let target = target_node_id(); let usage = ChannelUsage { amount_msat: 100, @@ -3413,24 +3409,37 @@ mod tests { inflight_htlc_msat: 0, effective_capacity: EffectiveCapacity::Total { capacity_msat: 1_024, htlc_maximum_msat: 1_024 }, }; - let network_graph = network_graph.read_only(); - let channel = network_graph.channel(42).unwrap(); - let (info, target) = channel.as_directed_from(&source).unwrap(); - let candidate = CandidateRouteHop::PublicHop { - info, - short_channel_id: 42, - }; - // With no historical data the normal liquidity penalty calculation is used. - assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 168); + { + let network_graph = network_graph.read_only(); + let channel = network_graph.channel(42).unwrap(); + let (info, _) = channel.as_directed_from(&source).unwrap(); + let candidate = CandidateRouteHop::PublicHop { + info, + short_channel_id: 42, + }; + + // With no historical data the normal liquidity penalty calculation is used. + assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 168); + } assert_eq!(scorer.historical_estimated_channel_liquidity_probabilities(42, &target), None); assert_eq!(scorer.historical_estimated_payment_success_probability(42, &target, 42, ¶ms), None); scorer.payment_path_failed(&payment_path_for_amount(1), 42); - assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 2048); - assert_eq!(scorer.channel_penalty_msat(&candidate, usage_1, ¶ms), 249); + { + let network_graph = network_graph.read_only(); + let channel = network_graph.channel(42).unwrap(); + let (info, _) = channel.as_directed_from(&source).unwrap(); + let candidate = CandidateRouteHop::PublicHop { + info, + short_channel_id: 42, + }; + + assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 2048); + assert_eq!(scorer.channel_penalty_msat(&candidate, usage_1, ¶ms), 249); + } // The "it failed" increment is 32, where the probability should lie several buckets into // the first octile. assert_eq!(scorer.historical_estimated_channel_liquidity_probabilities(42, &target), @@ -3444,7 +3453,17 @@ mod tests { // 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. scorer.payment_path_failed(&payment_path_for_amount(1000), 43); - assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 105); + { + let network_graph = network_graph.read_only(); + let channel = network_graph.channel(42).unwrap(); + let (info, _) = channel.as_directed_from(&source).unwrap(); + let candidate = CandidateRouteHop::PublicHop { + info, + short_channel_id: 42, + }; + + assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 105); + } // The first points should be decayed just slightly and the last bucket has a new point. assert_eq!(scorer.historical_estimated_channel_liquidity_probabilities(42, &target), Some(([31, 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, 32, 0, 0, 0, 0, 0], @@ -3464,7 +3483,17 @@ mod tests { // 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. SinceEpoch::advance(Duration::from_secs(10 * 16)); - assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 168); + { + let network_graph = network_graph.read_only(); + let channel = network_graph.channel(42).unwrap(); + let (info, _) = channel.as_directed_from(&source).unwrap(); + let candidate = CandidateRouteHop::PublicHop { + info, + short_channel_id: 42, + }; + + assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 168); + } // Once fully decayed we still have data, but its all-0s. In the future we may remove the // data entirely instead. assert_eq!(scorer.historical_estimated_channel_liquidity_probabilities(42, &target), @@ -3477,16 +3506,26 @@ mod tests { effective_capacity: EffectiveCapacity::Total { capacity_msat: 1_024, htlc_maximum_msat: 1_024 }, }; scorer.payment_path_failed(&payment_path_for_amount(1), 42); - assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 2050); - usage.inflight_htlc_msat = 0; - assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 866); + { + let network_graph = network_graph.read_only(); + let channel = network_graph.channel(42).unwrap(); + let (info, _) = channel.as_directed_from(&source).unwrap(); + let candidate = CandidateRouteHop::PublicHop { + info, + short_channel_id: 42, + }; - let usage = ChannelUsage { - amount_msat: 1, - inflight_htlc_msat: 0, - effective_capacity: EffectiveCapacity::AdvertisedMaxHTLC { amount_msat: 0 }, - }; - assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 2048); + assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 2050); + usage.inflight_htlc_msat = 0; + assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 866); + + let usage = ChannelUsage { + amount_msat: 1, + inflight_htlc_msat: 0, + effective_capacity: EffectiveCapacity::AdvertisedMaxHTLC { amount_msat: 0 }, + }; + assert_eq!(scorer.channel_penalty_msat(&candidate, usage, ¶ms), 2048); + } // Advance to decay all liquidity offsets to zero. SinceEpoch::advance(Duration::from_secs(60 * 60 * 10));