Use RoutingFees struct for RouteHint and ChannelInfo

Author: naumenkogs

fuzz/src/router.rs

@@ -11,7 +11,7 @@ use lightning::ln::msgs::RoutingMessageHandler;
 use lightning::ln::router::{Router, RouteHint};
 use lightning::util::logger::Logger;
 use lightning::util::ser::Readable;
-use lightning::ln::network_graph::NetworkGraph;
+use lightning::ln::network_graph::{NetworkGraph, RoutingFees};
 
 use secp256k1::key::PublicKey;
 
@@ -219,8 +219,10 @@ pub fn do_test<Out: test_logger::Output>(data: &[u8], out: Out) {
 						last_hops_vec.push(RouteHint {
 							src_node_id: get_pubkey!(),
 							short_channel_id: slice_to_be64(get_slice!(8)),
-							fee_base_msat: slice_to_be32(get_slice!(4)),
-							fee_proportional_millionths: slice_to_be32(get_slice!(4)),
+							fees: RoutingFees {
+								base_msat: slice_to_be32(get_slice!(4)),
+								proportional_millionths: slice_to_be32(get_slice!(4)),
+							},
 							cltv_expiry_delta: slice_to_be16(get_slice!(2)),
 							htlc_minimum_msat: slice_to_be64(get_slice!(8)),
 						});

lightning/src/ln/network_graph.rs

@@ -173,17 +173,15 @@ pub struct DirectionalChannelInfo {
 	pub cltv_expiry_delta: u16,
 	/// The minimum value, which must be relayed to the next hop via the channel
 	pub htlc_minimum_msat: u64,
-	/// Flat fee charged when the channel is used for routing
-	pub fee_base_msat: u32,
-	/// Fee based on used liquidity of the channel when it is used for routing
-	pub fee_proportional_millionths: u32,
+	/// Fees charged when the channel is used for routing
+	pub fees: RoutingFees,
 	/// Most recent update for the channel received from the network
 	pub last_update_message: Option<msgs::ChannelUpdate>,
 }
 
 impl std::fmt::Display for DirectionalChannelInfo {
 	fn fmt(&self, f: &mut std::fmt::Formatter) -> Result<(), std::fmt::Error> {
-		write!(f, "src_node_id {}, last_update {}, enabled {}, cltv_expiry_delta {}, htlc_minimum_msat {}, fee_base_msat {}, fee_proportional_millionths {}", log_pubkey!(self.src_node_id), self.last_update, self.enabled, self.cltv_expiry_delta, self.htlc_minimum_msat, self.fee_base_msat, self.fee_proportional_millionths)?;
+		write!(f, "src_node_id {}, last_update {}, enabled {}, cltv_expiry_delta {}, htlc_minimum_msat {}, fees {:?}", log_pubkey!(self.src_node_id), self.last_update, self.enabled, self.cltv_expiry_delta, self.htlc_minimum_msat, self.fees)?;
 		Ok(())
 	}
 }
@@ -194,8 +192,7 @@ impl_writeable!(DirectionalChannelInfo, 0, {
 	enabled,
 	cltv_expiry_delta,
 	htlc_minimum_msat,
-	fee_base_msat,
-	fee_proportional_millionths,
+	fees,
 	last_update_message
 });
 
@@ -511,8 +508,10 @@ impl RoutingMessageHandler for NetworkGraph {
 					enabled: false,
 					cltv_expiry_delta: u16::max_value(),
 					htlc_minimum_msat: u64::max_value(),
-					fee_base_msat: u32::max_value(),
-					fee_proportional_millionths: u32::max_value(),
+					fees: RoutingFees {
+						base_msat: u32::max_value(),
+						proportional_millionths: u32::max_value(),
+					},
 					last_update_message: None,
 				},
 				two_to_one: DirectionalChannelInfo {
@@ -521,8 +520,10 @@ impl RoutingMessageHandler for NetworkGraph {
 					enabled: false,
 					cltv_expiry_delta: u16::max_value(),
 					htlc_minimum_msat: u64::max_value(),
-					fee_base_msat: u32::max_value(),
-					fee_proportional_millionths: u32::max_value(),
+					fees: RoutingFees {
+						base_msat: u32::max_value(),
+						proportional_millionths: u32::max_value(),
+					},
 					last_update_message: None,
 				},
 				announcement_message: if should_relay { Some(msg.clone()) } else { None },
@@ -629,8 +630,8 @@ impl RoutingMessageHandler for NetworkGraph {
 						$target.enabled = chan_enabled;
 						$target.cltv_expiry_delta = msg.contents.cltv_expiry_delta;
 						$target.htlc_minimum_msat = msg.contents.htlc_minimum_msat;
-						$target.fee_base_msat = msg.contents.fee_base_msat;
-						$target.fee_proportional_millionths = msg.contents.fee_proportional_millionths;
+						$target.fees.base_msat = msg.contents.fee_base_msat;
+						$target.fees.proportional_millionths = msg.contents.fee_proportional_millionths;
 						$target.last_update_message = if msg.contents.excess_data.is_empty() {
 							Some(msg.clone())
 						} else {
@@ -673,11 +674,11 @@ impl RoutingMessageHandler for NetworkGraph {
 				for chan_id in node.channels.iter() {
 					let chan = network.channels.get(chan_id).unwrap();
 					if chan.one_to_two.src_node_id == dest_node_id {
-						lowest_inbound_channel_fee_base_msat = cmp::min(lowest_inbound_channel_fee_base_msat, chan.two_to_one.fee_base_msat);
-						lowest_inbound_channel_fee_proportional_millionths = cmp::min(lowest_inbound_channel_fee_proportional_millionths, chan.two_to_one.fee_proportional_millionths);
+						lowest_inbound_channel_fee_base_msat = cmp::min(lowest_inbound_channel_fee_base_msat, chan.two_to_one.fees.base_msat);
+						lowest_inbound_channel_fee_proportional_millionths = cmp::min(lowest_inbound_channel_fee_proportional_millionths, chan.two_to_one.fees.proportional_millionths);
 					} else {
-						lowest_inbound_channel_fee_base_msat = cmp::min(lowest_inbound_channel_fee_base_msat, chan.one_to_two.fee_base_msat);
-						lowest_inbound_channel_fee_proportional_millionths = cmp::min(lowest_inbound_channel_fee_proportional_millionths, chan.one_to_two.fee_proportional_millionths);
+						lowest_inbound_channel_fee_base_msat = cmp::min(lowest_inbound_channel_fee_base_msat, chan.one_to_two.fees.base_msat);
+						lowest_inbound_channel_fee_proportional_millionths = cmp::min(lowest_inbound_channel_fee_proportional_millionths, chan.one_to_two.fees.proportional_millionths);
 					}
 				}
 			}
@@ -1599,17 +1600,21 @@ mod tests {
 				enabled: false,
 				cltv_expiry_delta: u16::max_value(),
 				htlc_minimum_msat: 0,
-				fee_base_msat: u32::max_value(),
-				fee_proportional_millionths: u32::max_value(),
+				fees: RoutingFees {
+					base_msat: u32::max_value(),
+					proportional_millionths: u32::max_value(),
+				},
 				last_update_message: None,
 			}, two_to_one: DirectionalChannelInfo {
 				src_node_id: node1.clone(),
 				last_update: 0,
 				enabled: true,
 				cltv_expiry_delta: 0,
 				htlc_minimum_msat: 0,
-				fee_base_msat: 0,
-				fee_proportional_millionths: 0,
+				fees: RoutingFees {
+					base_msat: u32::max_value(),
+					proportional_millionths: u32::max_value(),
+				},
 				last_update_message: None,
 			},
 			announcement_message: None,