X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fgossip.rs;h=9a9a932968cb5f791cdbaa49129cb0af15140864;hb=88821cbd0c4558452b995ef30bbb8c84f85cbe4c;hp=90ead987e7c99c4c8079f57a4c9f91ea4485fb64;hpb=101c09f9bf04783b5d1f5b77bc50ed6735800828;p=rust-lightning

diff --git a/lightning/src/routing/gossip.rs b/lightning/src/routing/gossip.rs
index 90ead987e..9a9a93296 100644
--- a/lightning/src/routing/gossip.rs
+++ b/lightning/src/routing/gossip.rs
@@ -965,7 +965,7 @@ impl<'a> DirectedChannelInfo<'a> {
 				htlc_maximum_msat = cmp::min(htlc_maximum_msat, capacity_msat);
 				EffectiveCapacity::Total { capacity_msat, htlc_maximum_msat: htlc_maximum_msat }
 			},
-			None => EffectiveCapacity::MaximumHTLC { amount_msat: htlc_maximum_msat },
+			None => EffectiveCapacity::AdvertisedMaxHTLC { amount_msat: htlc_maximum_msat },
 		};
 
 		Self {
@@ -1019,7 +1019,7 @@ pub enum EffectiveCapacity {
 		liquidity_msat: u64,
 	},
 	/// The maximum HTLC amount in one direction as advertised on the gossip network.
-	MaximumHTLC {
+	AdvertisedMaxHTLC {
 		/// The maximum HTLC amount denominated in millisatoshi.
 		amount_msat: u64,
 	},
@@ -1047,7 +1047,7 @@ impl EffectiveCapacity {
 	pub fn as_msat(&self) -> u64 {
 		match self {
 			EffectiveCapacity::ExactLiquidity { liquidity_msat } => *liquidity_msat,
-			EffectiveCapacity::MaximumHTLC { amount_msat } => *amount_msat,
+			EffectiveCapacity::AdvertisedMaxHTLC { amount_msat } => *amount_msat,
 			EffectiveCapacity::Total { capacity_msat, .. } => *capacity_msat,
 			EffectiveCapacity::Infinite => u64::max_value(),
 			EffectiveCapacity::Unknown => UNKNOWN_CHANNEL_CAPACITY_MSAT,
@@ -1056,7 +1056,7 @@ impl EffectiveCapacity {
 }
 
 /// Fees for routing via a given channel or a node
-#[derive(Eq, PartialEq, Copy, Clone, Debug, Hash)]
+#[derive(Eq, PartialEq, Copy, Clone, Debug, Hash, Ord, PartialOrd)]
 pub struct RoutingFees {
 	/// Flat routing fee in millisatoshis.
 	pub base_msat: u32,
@@ -1575,7 +1575,7 @@ impl<L: Deref> NetworkGraph<L> where L::Target: Logger {
 
 		if msg.chain_hash != self.genesis_hash {
 			return Err(LightningError {
-				err: "Channel announcement chain hash does not match genesis hash".to_owned(), 
+				err: "Channel announcement chain hash does not match genesis hash".to_owned(),
 				action: ErrorAction::IgnoreAndLog(Level::Debug),
 			});
 		}