f cleanups and use utils more

Author: TheBlueMatt

lightning/src/routing/scoring.rs

@@ -632,15 +632,15 @@ impl<G: Deref<Target = NetworkGraph>, L: Deref, T: Time> ProbabilisticScorerUsin
 		let graph = self.network_graph.read_only();
 		for (scid, liq) in self.channel_liquidities.iter() {
 			if let Some(chan_debug) = graph.channels().get(scid) {
-				let log_direction = |dir: &Option<ChannelUpdateInfo>, sender, recipient| {
+				let log_direction = |dir: &Option<ChannelUpdateInfo>, source, target| {
 					if let Some(dir_debug) = dir {
-						let amount = chan_debug.capacity_sats.map(|v| v*1000).or(dir_debug.htlc_maximum_msat);
-						if let Some(amt) = amount {
-							let dir_liq = liq.as_directed(sender, recipient, amt, self.params.liquidity_offset_half_life);
+						if let Some((directed_info, _)) = chan_debug.as_directed_to(target) {
+							let amt = directed_info.effective_capacity().as_msat();
+							let dir_liq = liq.as_directed(source, target, amt, self.params.liquidity_offset_half_life);
 							log_debug!(self.logger, "Liquidity from {:?} to {:?} via {} is in the range ({}, {})",
-								sender, recipient, scid, dir_liq.min_liquidity_msat(), dir_liq.max_liquidity_msat());
+								source, target, scid, dir_liq.min_liquidity_msat(), dir_liq.max_liquidity_msat());
 						} else {
-							log_debug!(self.logger, "No amount known for SCID {} from {:?} to {:?}", scid, sender, recipient);
+							log_debug!(self.logger, "No amount known for SCID {} from {:?} to {:?}", scid, source, target);
 						}
 					}
 				};