mirrors/rust-lightning
1
0
Fork 0
mirror of https://github.com/lightningdevkit/rust-lightning.git synced 2025-02-25 15:20:24 +01:00
Code Issues Projects Releases Packages Wiki Activity

Simplify and make scoring calls in TestRouter more complete

Browse source 
`TestRouter` tries to make scoring calls that mimic what an actual
router would do, but the changes in f0ecc3ec73
failed to make scoring calls for private hints or if we take a
public hop for the last hop.

This fixes those regressions, though no tests currently depend on
this behavior.
This commit is contained in:
Matt Corallo 2023-12-06 17:47:00 +00:00
parent 6ae051694d
commit 2b7d097dc7
1 changed files with 34 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
lightning/src/util/test_utils.rs
View file

@ -30,9 +30,9 @@ use crate::ln::msgs::LightningError;
use crate::ln::script::ShutdownScript; use crate::ln::script::ShutdownScript;
use crate::offers::invoice::UnsignedBolt12Invoice; use crate::offers::invoice::UnsignedBolt12Invoice;
use crate::offers::invoice_request::UnsignedInvoiceRequest; use crate::offers::invoice_request::UnsignedInvoiceRequest;
use crate::routing::gossip::{EffectiveCapacity, NetworkGraph, NodeId}; use crate::routing::gossip::{EffectiveCapacity, NetworkGraph, NodeId, RoutingFees};
use crate::routing::utxo::{UtxoLookup, UtxoLookupError, UtxoResult}; use crate::routing::utxo::{UtxoLookup, UtxoLookupError, UtxoResult};
use crate::routing::router::{find_route, InFlightHtlcs, Path, Route, RouteParameters, Router, ScorerAccountingForInFlightHtlcs}; use crate::routing::router::{find_route, InFlightHtlcs, Path, Route, RouteParameters, RouteHintHop, Router, ScorerAccountingForInFlightHtlcs};
use crate::routing::scoring::{ChannelUsage, ScoreUpdate, ScoreLookUp}; use crate::routing::scoring::{ChannelUsage, ScoreUpdate, ScoreLookUp};
use crate::sync::RwLock; use crate::sync::RwLock;
use crate::util::config::UserConfig; use crate::util::config::UserConfig;
@ -129,6 +129,7 @@ impl<'a> Router for TestRouter<'a> {
let scorer = ScorerAccountingForInFlightHtlcs::new(scorer, &inflight_htlcs); let scorer = ScorerAccountingForInFlightHtlcs::new(scorer, &inflight_htlcs);
for path in &route.paths { for path in &route.paths {
let mut aggregate_msat = 0u64; let mut aggregate_msat = 0u64;
let mut prev_hop_node = payer;
for (idx, hop) in path.hops.iter().rev().enumerate() { for (idx, hop) in path.hops.iter().rev().enumerate() {
aggregate_msat += hop.fee_msat; aggregate_msat += hop.fee_msat;
let usage = ChannelUsage { let usage = ChannelUsage {
@ -137,39 +138,44 @@ impl<'a> Router for TestRouter<'a> {
effective_capacity: EffectiveCapacity::Unknown, effective_capacity: EffectiveCapacity::Unknown,
}; };
// Since the path is reversed, the last element in our iteration is the first
// hop.
if idx == path.hops.len() - 1 { if idx == path.hops.len() - 1 {
let first_hops = match first_hops { if let Some(first_hops) = first_hops {
Some(hops) => hops, if let Some(idx) = first_hops.iter().position(|h| h.get_outbound_payment_scid() == Some(hop.short_channel_id)) {
None => continue, let node_id = NodeId::from_pubkey(payer);
}; let candidate = CandidateRouteHop::FirstHop {
if first_hops.len() == 0 { details: first_hops[idx],
continue; payer_node_id: &node_id,
};
scorer.channel_penalty_msat(&candidate, usage, &());
continue;
}
} }
let idx = if first_hops.len() > 1 { route.paths.iter().position(|p| p == path).unwrap_or(0) } else { 0 }; }
let node_id = NodeId::from_pubkey(payer); let network_graph = self.network_graph.read_only();
let candidate = CandidateRouteHop::FirstHop { if let Some(channel) = network_graph.channel(hop.short_channel_id) {
details: first_hops[idx], let (directed, _) = channel.as_directed_to(&NodeId::from_pubkey(&hop.pubkey)).unwrap();
payer_node_id: &node_id,
};
scorer.channel_penalty_msat(&candidate, usage, &());
} else {
let network_graph = self.network_graph.read_only();
let channel = match network_graph.channel(hop.short_channel_id) {
Some(channel) => channel,
None => continue,
};
let channel = match channel.as_directed_to(&NodeId::from_pubkey(&hop.pubkey)) {
Some(channel) => channel,
None => panic!("Channel directed to {} was not found", hop.pubkey),
};
let candidate = CandidateRouteHop::PublicHop { let candidate = CandidateRouteHop::PublicHop {
info: channel.0, info: directed,
short_channel_id: hop.short_channel_id, short_channel_id: hop.short_channel_id,
}; };
scorer.channel_penalty_msat(&candidate, usage, &()); scorer.channel_penalty_msat(&candidate, usage, &());
} else {
let target_node_id = NodeId::from_pubkey(&hop.pubkey);
let route_hint = RouteHintHop {
src_node_id: *prev_hop_node,
short_channel_id: hop.short_channel_id,
fees: RoutingFees { base_msat: 0, proportional_millionths: 0 },
cltv_expiry_delta: 0,
htlc_minimum_msat: None,
htlc_maximum_msat: None,
};
let candidate = CandidateRouteHop::PrivateHop {
hint: &route_hint,
target_node_id: target_node_id,
};
scorer.channel_penalty_msat(&candidate, usage, &());
} }
prev_hop_node = &hop.pubkey;
} }
} }
} }