X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Futil%2Ftest_utils.rs;h=664deb9fa1566f6aa2628150458385673fd16cc8;hb=a4f2c36015545c9607eb07a4bef5061997d2d322;hp=a6c2d77451a411fac9ac1e5f2ba3fffab16ab3d2;hpb=242e6aedb23bc350c64379e4cfb7f77c9a34b7e5;p=rust-lightning

diff --git a/lightning/src/util/test_utils.rs b/lightning/src/util/test_utils.rs
index a6c2d774..664deb9f 100644
--- a/lightning/src/util/test_utils.rs
+++ b/lightning/src/util/test_utils.rs
@@ -17,6 +17,7 @@ use crate::chain::chainmonitor::{MonitorUpdateId, UpdateOrigin};
 use crate::chain::channelmonitor;
 use crate::chain::channelmonitor::MonitorEvent;
 use crate::chain::transaction::OutPoint;
+use crate::routing::router::CandidateRouteHop;
 use crate::sign;
 use crate::events;
 use crate::events::bump_transaction::{WalletSource, Utxo};
@@ -29,9 +30,9 @@ use crate::ln::msgs::LightningError;
 use crate::ln::script::ShutdownScript;
 use crate::offers::invoice::UnsignedBolt12Invoice;
 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::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::sync::RwLock;
 use crate::util::config::UserConfig;
@@ -128,6 +129,7 @@ impl<'a> Router for TestRouter<'a> {
 				let scorer = ScorerAccountingForInFlightHtlcs::new(scorer, &inflight_htlcs);
 				for path in &route.paths {
 					let mut aggregate_msat = 0u64;
+					let mut prev_hop_node = payer;
 					for (idx, hop) in path.hops.iter().rev().enumerate() {
 						aggregate_msat += hop.fee_msat;
 						let usage = ChannelUsage {
@@ -136,14 +138,44 @@ impl<'a> Router for TestRouter<'a> {
 							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 {
-							scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(payer), &NodeId::from_pubkey(&hop.pubkey), usage, &Default::default());
+							if let Some(first_hops) = first_hops {
+								if let Some(idx) = first_hops.iter().position(|h| h.get_outbound_payment_scid() == Some(hop.short_channel_id)) {
+									let node_id = NodeId::from_pubkey(payer);
+									let candidate = CandidateRouteHop::FirstHop {
+										details: first_hops[idx],
+										payer_node_id: &node_id,
+									};
+									scorer.channel_penalty_msat(&candidate, usage, &());
+									continue;
+								}
+							}
+						}
+						let network_graph = self.network_graph.read_only();
+						if let Some(channel) = network_graph.channel(hop.short_channel_id) {
+							let (directed, _) = channel.as_directed_to(&NodeId::from_pubkey(&hop.pubkey)).unwrap();
+							let candidate = CandidateRouteHop::PublicHop {
+								info: directed,
+								short_channel_id: hop.short_channel_id,
+							};
+							scorer.channel_penalty_msat(&candidate, usage, &());
 						} else {
-							let curr_hop_path_idx = path.hops.len() - 1 - idx;
-							scorer.channel_penalty_msat(hop.short_channel_id, &NodeId::from_pubkey(&path.hops[curr_hop_path_idx - 1].pubkey), &NodeId::from_pubkey(&hop.pubkey), usage, &Default::default());
+							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;
 					}
 				}
 			}
@@ -1297,8 +1329,12 @@ impl crate::util::ser::Writeable for TestScorer {
 impl ScoreLookUp for TestScorer {
 	type ScoreParams = ();
 	fn channel_penalty_msat(
-		&self, short_channel_id: u64, _source: &NodeId, _target: &NodeId, usage: ChannelUsage, _score_params: &Self::ScoreParams
+		&self, candidate: &CandidateRouteHop, usage: ChannelUsage, _score_params: &Self::ScoreParams
 	) -> u64 {
+		let short_channel_id = match candidate.globally_unique_short_channel_id() {
+			Some(scid) => scid,
+			None => return 0,
+		};
 		if let Some(scorer_expectations) = self.scorer_expectations.borrow_mut().as_mut() {
 			match scorer_expectations.pop_front() {
 				Some((scid, expectation)) => {