X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;ds=sidebyside;f=lightning%2Fsrc%2Fln%2Fpeer_handler.rs;h=933e7ee6ba58ee67e46260d14164ab0d46588a10;hb=34f8dd9a49060676da0cf4157613cfb5fd58cf1e;hp=1e0294073a25d2b01b470bbbbad16d9f9ab3d305;hpb=b1bedcfbec33243536fb7629b1947b89538adf8f;p=rust-lightning

diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 1e029407..933e7ee6 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -279,7 +279,7 @@ impl ChannelMessageHandler for ErroringMessageHandler {
 		features
 	}
 
-	fn get_genesis_hashes(&self) -> Option<Vec<ChainHash>> {
+	fn get_chain_hashes(&self) -> Option<Vec<ChainHash>> {
 		// We don't enforce any chains upon peer connection for `ErroringMessageHandler` and leave it up
 		// to users of `ErroringMessageHandler` to make decisions on network compatiblility.
 		// There's not really any way to pull in specific networks here, and hardcoding can cause breakages.
@@ -611,7 +611,7 @@ impl Peer {
 pub type SimpleArcPeerManager<SD, M, T, F, C, L> = PeerManager<
 	SD,
 	Arc<SimpleArcChannelManager<M, T, F, L>>,
-	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<L>>>, Arc<C>, Arc<L>>>,
+	Arc<P2PGossipSync<Arc<NetworkGraph<Arc<L>>>, C, Arc<L>>>,
 	Arc<SimpleArcOnionMessenger<L>>,
 	Arc<L>,
 	IgnoringMessageHandler,
@@ -627,13 +627,13 @@ pub type SimpleArcPeerManager<SD, M, T, F, C, L> = PeerManager<
 ///
 /// This is not exported to bindings users as general type aliases don't make sense in bindings.
 pub type SimpleRefPeerManager<
-	'a, 'b, 'c, 'd, 'e, 'f, 'g, 'h, 'i, 'j, 'k, 'l, 'm, 'n, SD, M, T, F, C, L
+	'a, 'b, 'c, 'd, 'e, 'f, 'logger, 'h, 'i, 'j, 'graph, SD, M, T, F, C, L
 > = PeerManager<
 	SD,
-	&'n SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'f, 'g, 'm, M, T, F, L>,
-	&'f P2PGossipSync<&'g NetworkGraph<&'f L>, &'h C, &'f L>,
-	&'i SimpleRefOnionMessenger<'g, 'm, 'n, L>,
-	&'f L,
+	&'j SimpleRefChannelManager<'a, 'b, 'c, 'd, 'e, 'graph, 'logger, 'i, M, T, F, L>,
+	&'f P2PGossipSync<&'graph NetworkGraph<&'logger L>, C, &'logger L>,
+	&'h SimpleRefOnionMessenger<'logger, 'i, 'j, L>,
+	&'logger L,
 	IgnoringMessageHandler,
 	&'c KeysManager
 >;
@@ -1367,7 +1367,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 								peer.set_their_node_id(their_node_id);
 								insert_node_id!();
 								let features = self.init_features(&their_node_id);
-								let networks = self.message_handler.chan_handler.get_genesis_hashes();
+								let networks = self.message_handler.chan_handler.get_chain_hashes();
 								let resp = msgs::Init { features, networks, remote_network_address: filter_addresses(peer.their_socket_address.clone()) };
 								self.enqueue_message(peer, &resp);
 								peer.awaiting_pong_timer_tick_intervals = 0;
@@ -1380,7 +1380,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 								peer.set_their_node_id(their_node_id);
 								insert_node_id!();
 								let features = self.init_features(&their_node_id);
-								let networks = self.message_handler.chan_handler.get_genesis_hashes();
+								let networks = self.message_handler.chan_handler.get_chain_hashes();
 								let resp = msgs::Init { features, networks, remote_network_address: filter_addresses(peer.their_socket_address.clone()) };
 								self.enqueue_message(peer, &resp);
 								peer.awaiting_pong_timer_tick_intervals = 0;
@@ -1498,7 +1498,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, OM: Deref, L: Deref, CM
 		if let wire::Message::Init(msg) = message {
 			// Check if we have any compatible chains if the `networks` field is specified.
 			if let Some(networks) = &msg.networks {
-				if let Some(our_chains) = self.message_handler.chan_handler.get_genesis_hashes() {
+				if let Some(our_chains) = self.message_handler.chan_handler.get_chain_hashes() {
 					let mut have_compatible_chains = false;
 					'our_chains: for our_chain in our_chains.iter() {
 						for their_chain in networks {