Skip to content

Commit 1da613c

Browse files
committed
But log_trace back
1 parent d3be939 commit 1da613c

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

lightning/src/routing/pickhardt_router/pickhardt_router.rs

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -29,14 +29,7 @@ pub fn find_route<L: Deref, GL: Deref, S: Score>(
2929
scorer: &S) -> Result<Route, LightningError>
3030
where L::Target: Logger, GL::Target: Logger {
3131

32-
// impl<G: Deref<Target = NetworkGraph<L>>, L: Deref, S:Score> Router<S>
33-
// for PickhardtRouter<G, L> where L::Target: Logger {
34-
// fn find_route(
35-
// &self, payer: &PublicKey, route_params: &RouteParameters,
36-
// payment_hash: &PaymentHash,
37-
// first_hops: Option<&[&ChannelDetails]>, scorer: &S
38-
// ) -> Result<Route, LightningError> {
39-
let payee_pubkey=route_params.payment_params.payee_pubkey;
32+
let payee_pubkey=route_params.payment_params.payee_pubkey;
4033

4134
// Basic checks are the same as with the Dijstra routing algorithm.
4235
let our_node_id=NodeId::from_pubkey(&our_node_pubkey);
@@ -69,9 +62,9 @@ where L::Target: Logger, GL::Target: Logger {
6962
action: ErrorAction::IgnoreError});
7063
}
7164

72-
// log_trace!(logger, "Searching for a Pickhardt type route from payer {} to payee {} {} MPP and {} first hops {}overriding the network graph", our_node_pubkey,
73-
// payment_params.payee_pubkey, if allow_mpp { "with" } else { "without" },
74-
// first_hops.map(|hops| hops.len()).unwrap_or(0), if first_hops.is_some() { "" } else { "not " });
65+
log_trace!(logger, "Searching for a Pickhardt type route from payer {} to payee {} with MPP and {} first hops {}overriding the network graph", our_node_pubkey,
66+
payment_params.payee_pubkey,
67+
first_hops.map(|hops| hops.len()).unwrap_or(0), if first_hops.is_some() { "" } else { "not " });
7568

7669
let mut edges:Vec<OriginalEdge> =Vec::new(); // enumerated channels.
7770
let mut vidx:HashMap<NodeId,usize> =HashMap::new(); // NodeId -> enumerated node id
@@ -97,8 +90,8 @@ where L::Target: Logger, GL::Target: Logger {
9790
if let Some(value) = add_hops_to_payee_node_from_route_hints(
9891
&mut channel_meta_data, &mut short_channel_ids_set,
9992
payment_params, payee_node_id, &mut edges, &mut vidx, &mut nodes) {
100-
return value;
101-
}
93+
return value;
94+
}
10295

10396
let payee_node=NodeId::from_pubkey(&payee_pubkey);
10497
let t=*vidx.get(&payee_node).unwrap();

0 commit comments

Comments
 (0)