X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=lightning%2Fsrc%2Frouting%2Fgossip.rs;h=92a0e479a3de6a2d12266e8f67cd049243d6ca0c;hb=3fb3218b6c311eaa4d932b3eea9e50e04bda4f9b;hp=160609216e84bc2c36ee0f1d2f6388fff657d9ac;hpb=414d8e1c4a9fcc8941c7af122a5da977e6c8720f;p=rust-lightning

diff --git a/lightning/src/routing/gossip.rs b/lightning/src/routing/gossip.rs
index 16060921..92a0e479 100644
--- a/lightning/src/routing/gossip.rs
+++ b/lightning/src/routing/gossip.rs
@@ -22,7 +22,7 @@ use bitcoin::hash_types::BlockHash;
 use chain;
 use chain::Access;
 use ln::chan_utils::make_funding_redeemscript;
-use ln::features::{ChannelFeatures, NodeFeatures};
+use ln::features::{ChannelFeatures, NodeFeatures, InitFeatures};
 use ln::msgs::{DecodeError, ErrorAction, Init, LightningError, RoutingMessageHandler, NetAddress, MAX_VALUE_MSAT};
 use ln::msgs::{ChannelAnnouncement, ChannelUpdate, NodeAnnouncement, GossipTimestampFilter};
 use ln::msgs::{QueryChannelRange, ReplyChannelRange, QueryShortChannelIds, ReplyShortChannelIdsEnd};
@@ -570,6 +570,12 @@ where C::Target: chain::Access, L::Target: Logger
 			action: ErrorAction::IgnoreError,
 		})
 	}
+
+	fn provided_init_features(&self, _their_node_id: &PublicKey) -> InitFeatures {
+		let mut features = InitFeatures::empty();
+		features.set_gossip_queries_optional();
+		features
+	}
 }
 
 impl<G: Deref<Target=NetworkGraph<L>>, C: Deref, L: Deref> MessageSendEventsProvider for P2PGossipSync<G, C, L>
@@ -915,7 +921,7 @@ impl<'a> fmt::Debug for DirectedChannelInfoWithUpdate<'a> {
 ///
 /// While this may be smaller than the actual channel capacity, amounts greater than
 /// [`Self::as_msat`] should not be routed through the channel.
-#[derive(Clone, Copy)]
+#[derive(Clone, Copy, Debug)]
 pub enum EffectiveCapacity {
 	/// The available liquidity in the channel known from being a channel counterparty, and thus a
 	/// direct hop.
@@ -2279,7 +2285,7 @@ mod tests {
 			network_graph.handle_event(&Event::PaymentPathFailed {
 				payment_id: None,
 				payment_hash: PaymentHash([0; 32]),
-				rejected_by_dest: false,
+				payment_failed_permanently: false,
 				all_paths_failed: true,
 				path: vec![],
 				network_update: Some(NetworkUpdate::ChannelUpdateMessage {
@@ -2306,7 +2312,7 @@ mod tests {
 			network_graph.handle_event(&Event::PaymentPathFailed {
 				payment_id: None,
 				payment_hash: PaymentHash([0; 32]),
-				rejected_by_dest: false,
+				payment_failed_permanently: false,
 				all_paths_failed: true,
 				path: vec![],
 				network_update: Some(NetworkUpdate::ChannelFailure {
@@ -2331,7 +2337,7 @@ mod tests {
 		network_graph.handle_event(&Event::PaymentPathFailed {
 			payment_id: None,
 			payment_hash: PaymentHash([0; 32]),
-			rejected_by_dest: false,
+			payment_failed_permanently: false,
 			all_paths_failed: true,
 			path: vec![],
 			network_update: Some(NetworkUpdate::ChannelFailure {