f DRY directional logging

Author: TheBlueMatt

lightning/src/routing/scoring.rs

@@ -55,7 +55,7 @@
 //! [`find_route`]: crate::routing::router::find_route
 
 use ln::msgs::DecodeError;
-use routing::network_graph::{NetworkGraph, NodeId};
+use routing::network_graph::{ChannelUpdateInfo, NetworkGraph, NodeId};
 use routing::router::RouteHop;
 use util::ser::{Readable, ReadableArgs, Writeable, Writer};
 use util::logger::Logger;
@@ -632,26 +632,21 @@ 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) {
-				if let Some(dir_debug) = &chan_debug.one_to_two {
-					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(&chan_debug.node_one, &chan_debug.node_two, amt, self.params.liquidity_offset_half_life);
-						log_debug!(self.logger, "Liquidity from {:?} to {:?} via {} is in the range ({}, {})",
-							chan_debug.node_one, chan_debug.node_two, scid, dir_liq.min_liquidity_msat(), dir_liq.max_liquidity_msat());
-					} else {
-						log_debug!(self.logger, "No amount known for SCID {} from {:?} to {:?}", scid, chan_debug.node_one, chan_debug.node_two);
-					}
-				}
-				if let Some(dir_debug) = &chan_debug.two_to_one {
-					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(&chan_debug.node_two, &chan_debug.node_one, amt, self.params.liquidity_offset_half_life);
-						log_debug!(self.logger, "Liquidity from {:?} to {:?} via {} is in the range ({}, {})",
-							chan_debug.node_two, chan_debug.node_one, scid, dir_liq.min_liquidity_msat(), dir_liq.max_liquidity_msat());
-					} else {
-						log_debug!(self.logger, "No amount known for SCID {} from {:?} to {:?}", scid, chan_debug.node_two, chan_debug.node_one);
+				let log_direction = |dir: &Option<ChannelUpdateInfo>, sender, recipient| {
+					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);
+							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());
+						} else {
+							log_debug!(self.logger, "No amount known for SCID {} from {:?} to {:?}", scid, sender, recipient);
+						}
 					}
-				}
+				};
+
+				log_direction(&chan_debug.one_to_two, &chan_debug.node_one, &chan_debug.node_two);
+				log_direction(&chan_debug.two_to_one, &chan_debug.node_two, &chan_debug.node_one);
 			} else {
 				log_debug!(self.logger, "No network graph entry for SCID {}", scid);
 			}