X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fnetwork_graph.rs;h=fedfad79fe6381a408207b63c3c2d0638793d3fc;hb=b1c80970e90ca223a67ea26245a2de7262242ccc;hp=dd6d7d7ed734aadbd7f89f93308aefd0223a9f79;hpb=0e3bf19b664ad3f9dd252c9ed50ed365ff827524;p=rust-lightning

diff --git a/lightning/src/routing/network_graph.rs b/lightning/src/routing/network_graph.rs
index dd6d7d7e..fedfad79 100644
--- a/lightning/src/routing/network_graph.rs
+++ b/lightning/src/routing/network_graph.rs
@@ -217,6 +217,9 @@ pub struct DirectionalChannelInfo {
 	/// Fees charged when the channel is used for routing
 	pub fees: RoutingFees,
 	/// Most recent update for the channel received from the network
+	/// Mostly redundant with the data we store in fields explicitly.
+	/// Everything else is useful only for sending out for initial routing sync.
+	/// Not stored if contains excess data to prevent DoS.
 	pub last_update_message: Option<msgs::ChannelUpdate>,
 }
 
@@ -308,10 +311,10 @@ impl Writeable for RoutingFees {
 /// Information received in the latest node_announcement from this node.
 pub struct NodeAnnouncementInfo {
 	/// Protocol features the node announced support for
-      pub features: NodeFeatures,
+	pub features: NodeFeatures,
 	/// When the last known update to the node state was issued.
 	/// Value is opaque, as set in the announcement.
-      pub last_update: u32,
+	pub last_update: u32,
 	/// Color assigned to the node
 	pub rgb: [u8; 3],
 	/// Moniker assigned to the node.
@@ -375,8 +378,8 @@ impl Readable for NodeAnnouncementInfo {
 pub struct NodeInfo {
 	/// All valid channels a node has announced
 	pub channels: Vec<u64>,
-	/// Lowest fees enabling routing via any of the known channels to a node.
- 	/// The two fields (flat and proportional fee) are independent,
+	/// Lowest fees enabling routing via any of the enabled, known channels to a node.
+	/// The two fields (flat and proportional fee) are independent,
 	/// meaning they don't have to refer to the same channel.
 	pub lowest_inbound_channel_fees: Option<RoutingFees>,
 	/// More information about a node from node_announcement.
@@ -709,34 +712,28 @@ impl NetworkGraph {
 				proportional_millionths
 			});
 		} else if chan_was_enabled {
-			let mut lowest_inbound_channel_fee_base_msat = u32::max_value();
-			let mut lowest_inbound_channel_fee_proportional_millionths = u32::max_value();
-
-			{
-				let node = self.nodes.get(&dest_node_id).unwrap();
-
-				for chan_id in node.channels.iter() {
-					let chan = self.channels.get(chan_id).unwrap();
-					// Since direction was enabled, the channel indeed had directional info
-					let chan_info;
-					if chan.node_one == dest_node_id {
-						chan_info = chan.two_to_one.as_ref().unwrap();
-					} else {
-						chan_info = chan.one_to_two.as_ref().unwrap();
+			let mut node = self.nodes.get_mut(&dest_node_id).unwrap();
+			let mut lowest_inbound_channel_fees = None;
+
+			for chan_id in node.channels.iter() {
+				let chan = self.channels.get(chan_id).unwrap();
+				let chan_info_opt;
+				if chan.node_one == dest_node_id {
+					chan_info_opt = chan.two_to_one.as_ref();
+				} else {
+					chan_info_opt = chan.one_to_two.as_ref();
+				}
+				if let Some(chan_info) = chan_info_opt {
+					if chan_info.enabled {
+						let fees = lowest_inbound_channel_fees.get_or_insert(RoutingFees {
+							base_msat: u32::max_value(), proportional_millionths: u32::max_value() });
+						fees.base_msat = cmp::min(fees.base_msat, chan_info.fees.base_msat);
+						fees.proportional_millionths = cmp::min(fees.proportional_millionths, chan_info.fees.proportional_millionths);
 					}
-					lowest_inbound_channel_fee_base_msat = cmp::min(lowest_inbound_channel_fee_base_msat, chan_info.fees.base_msat);
-					lowest_inbound_channel_fee_proportional_millionths = cmp::min(lowest_inbound_channel_fee_proportional_millionths, chan_info.fees.proportional_millionths);
 				}
 			}
 
-			//TODO: satisfy the borrow-checker without a double-map-lookup :(
-			let mut_node = self.nodes.get_mut(&dest_node_id).unwrap();
-			if mut_node.channels.len() > 0 {
-				mut_node.lowest_inbound_channel_fees = Some(RoutingFees {
-					base_msat: lowest_inbound_channel_fee_base_msat,
-					proportional_millionths: lowest_inbound_channel_fee_proportional_millionths
-				});
-			}
+			node.lowest_inbound_channel_fees = lowest_inbound_channel_fees;
 		}
 
 		Ok(msg.contents.excess_data.is_empty())
@@ -769,7 +766,7 @@ mod tests {
 	use ln::features::{ChannelFeatures, NodeFeatures};
 	use routing::network_graph::{NetGraphMsgHandler, NetworkGraph};
 	use ln::msgs::{RoutingMessageHandler, UnsignedNodeAnnouncement, NodeAnnouncement,
-	   UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate, HTLCFailChannelUpdate};
+		UnsignedChannelAnnouncement, ChannelAnnouncement, UnsignedChannelUpdate, ChannelUpdate, HTLCFailChannelUpdate};
 	use util::test_utils;
 	use util::logger::Logger;
 	use util::ser::{Readable, Writeable};
@@ -848,7 +845,7 @@ mod tests {
 			// Announce a channel to add a corresponding node.
 			let unsigned_announcement = UnsignedChannelAnnouncement {
 				features: ChannelFeatures::known(),
-		 		chain_hash: genesis_block(Network::Testnet).header.bitcoin_hash(),
+				chain_hash: genesis_block(Network::Testnet).header.bitcoin_hash(),
 				short_channel_id: 0,
 				node_id_1,
 				node_id_2,