Use ChannelUsage.

Author: tnull

lightning/src/routing/router.rs

@@ -1810,8 +1810,6 @@ fn build_route_from_hops_internal<L: Deref>(
 	network_graph: &ReadOnlyNetworkGraph, final_value_msat: u64, final_cltv_expiry_delta: u32,
 	logger: L, random_seed_bytes: &[u8; 32]) -> Result<Route, LightningError> where L::Target: Logger {
 
-	let filter_channels = |_short_channel_id: u64, _send_amt_msat: u64, _capacity_msat: u64,
-		source: &NodeId, target: &NodeId| {
 
 		let node_ids_iter = hops.iter().map(|hop_pubkey| NodeId::from_pubkey(&hop_pubkey));
 		let mut hop_iter = core::iter::once(NodeId::from_pubkey(&our_node_pubkey))
@@ -1825,6 +1823,8 @@ fn build_route_from_hops_internal<L: Deref>(
 			Some(_) => 0,
 			None => u64::max_value()
 		}
+	let filter_channels = |_short_channel_id: u64, source: &NodeId, target: &NodeId,
+		_usage: ChannelUsage| {
 	};
 
 	let scorer = DynamicPenaltyScorer::with_penalty_func(filter_channels);

lightning/src/routing/scoring.rs

@@ -260,16 +260,18 @@ impl ReadableArgs<u64> for FixedPenaltyScorer {
 }
 
 /// [`Score`] implementation that uses a dynamic penalty.
+///
+/// (C-not exported)
 pub struct DynamicPenaltyScorer<F>
 where
-	F: Fn(u64, u64, u64, &NodeId, &NodeId) -> u64,
+	F: Fn(u64, &NodeId, &NodeId, ChannelUsage) -> u64,
 {
 	penalty_func: F,
 }
 
 impl<F> DynamicPenaltyScorer<F>
 where
-	F: Fn(u64, u64, u64, &NodeId, &NodeId) -> u64,
+	F: Fn(u64, &NodeId, &NodeId, ChannelUsage) -> u64,
 {
 	/// Creates a new scorer that applies a closure `penalty_func`, which takes the same arguments
 	/// as [`Score::channel_penalty_msat`].
@@ -281,12 +283,12 @@ where
 
 impl<F> Score for DynamicPenaltyScorer<F>
 where
-	F: Fn(u64, u64, u64, &NodeId, &NodeId) -> u64,
+	F: Fn(u64, &NodeId, &NodeId, ChannelUsage) -> u64,
 {
-	fn channel_penalty_msat(&self, short_channel_id: u64, send_amt_msat: u64, capacity_msat: u64,
-		source: &NodeId, target: &NodeId) -> u64
+	fn channel_penalty_msat(&self, short_channel_id: u64, source: &NodeId, target: &NodeId,
+		usage: ChannelUsage) -> u64
 	{
-		(self.penalty_func)(short_channel_id, send_amt_msat, capacity_msat, source, target)
+		(self.penalty_func)(short_channel_id, source, target, usage)
 	}
 
 	fn payment_path_failed(&mut self, _path: &[&RouteHop], _short_channel_id: u64) {}
@@ -296,7 +298,7 @@ where
 
 impl<F> Writeable for DynamicPenaltyScorer<F>
 where
-	F: Fn(u64, u64, u64, &NodeId, &NodeId) -> u64,
+	F: Fn(u64, &NodeId, &NodeId, ChannelUsage) -> u64,
 {
 	#[inline]
 	fn write<W: Writer>(&self, w: &mut W) -> Result<(), io::Error> {
@@ -307,7 +309,7 @@ where
 
 impl<F> ReadableArgs<F> for DynamicPenaltyScorer<F>
 where
-	F: Fn(u64, u64, u64, &NodeId, &NodeId) -> u64,
+	F: Fn(u64, &NodeId, &NodeId, ChannelUsage) -> u64,
 {
 	#[inline]
 	fn read<R: Read>(r: &mut R, penalty_func: F) -> Result<Self, DecodeError> {