f Test clearing initial_routing_sync in PeerManager

Author: jkczyz

lightning/src/ln/peer_handler.rs

@@ -1247,6 +1247,13 @@ mod tests {
 		(fd_a.clone(), fd_b.clone())
 	}
 
+	fn establish_connection_and_read_events<'a>(peer_a: &PeerManager<FileDescriptor, &'a test_utils::TestChannelMessageHandler>, peer_b: &PeerManager<FileDescriptor, &'a test_utils::TestChannelMessageHandler>) -> (FileDescriptor, FileDescriptor) {
+		let (mut fd_a, mut fd_b) = establish_connection(peer_a, peer_b);
+		assert_eq!(peer_b.read_event(&mut fd_b, &fd_a.outbound_data.lock().unwrap().split_off(0)).unwrap(), false);
+		assert_eq!(peer_a.read_event(&mut fd_a, &fd_b.outbound_data.lock().unwrap().split_off(0)).unwrap(), false);
+		(fd_a.clone(), fd_b.clone())
+	}
+
 	#[test]
 	fn test_disconnect_peer() {
 		// Simple test which builds a network of PeerManager, connects and brings them to NoiseState::Finished and
@@ -1421,4 +1428,47 @@ mod tests {
 		assert_eq!(routing_handlers_concrete[1].clone().chan_upds_recvd.load(Ordering::Acquire), 100);
 		assert_eq!(routing_handlers_concrete[1].clone().chan_anns_recvd.load(Ordering::Acquire), 50);
 	}
+
+	#[test]
+	fn limit_initial_routing_sync_requests() {
+		// Inbound peer 0 requests initial_routing_sync, but outbound peer 1 does not.
+		{
+			let chan_handlers = create_chan_handlers(2);
+			let routing_handlers: Vec<Arc<msgs::RoutingMessageHandler>> = vec![
+				Arc::new(test_utils::TestRoutingMessageHandler::new().set_request_full_sync()),
+				Arc::new(test_utils::TestRoutingMessageHandler::new()),
+			];
+			let peers = create_network(2, &chan_handlers, Some(&routing_handlers));
+			let (fd_0_to_1, fd_1_to_0) = establish_connection_and_read_events(&peers[0], &peers[1]);
+
+			let peer_0 = peers[0].peers.lock().unwrap();
+			let peer_1 = peers[1].peers.lock().unwrap();
+
+			let peer_0_features = peer_1.peers.get(&fd_1_to_0).unwrap().their_features.as_ref();
+			let peer_1_features = peer_0.peers.get(&fd_0_to_1).unwrap().their_features.as_ref();
+
+			assert!(peer_0_features.unwrap().initial_routing_sync());
+			assert!(!peer_1_features.unwrap().initial_routing_sync());
+		}
+
+		// Outbound peer 1 requests initial_routing_sync, but inbound peer 0 does not.
+		{
+			let chan_handlers = create_chan_handlers(2);
+			let routing_handlers: Vec<Arc<msgs::RoutingMessageHandler>> = vec![
+				Arc::new(test_utils::TestRoutingMessageHandler::new()),
+				Arc::new(test_utils::TestRoutingMessageHandler::new().set_request_full_sync()),
+			];
+			let peers = create_network(2, &chan_handlers, Some(&routing_handlers));
+			let (fd_0_to_1, fd_1_to_0) = establish_connection_and_read_events(&peers[0], &peers[1]);
+
+			let peer_0 = peers[0].peers.lock().unwrap();
+			let peer_1 = peers[1].peers.lock().unwrap();
+
+			let peer_0_features = peer_1.peers.get(&fd_1_to_0).unwrap().their_features.as_ref();
+			let peer_1_features = peer_0.peers.get(&fd_0_to_1).unwrap().their_features.as_ref();
+
+			assert!(!peer_0_features.unwrap().initial_routing_sync());
+			assert!(peer_1_features.unwrap().initial_routing_sync());
+		}
+	}
 }

lightning/src/util/test_utils.rs

@@ -170,11 +170,20 @@ impl events::MessageSendEventsProvider for TestChannelMessageHandler {
 	}
 }
 
-pub struct TestRoutingMessageHandler {}
+pub struct TestRoutingMessageHandler {
+	request_full_sync: bool,
+}
 
 impl TestRoutingMessageHandler {
 	pub fn new() -> Self {
-		TestRoutingMessageHandler {}
+		TestRoutingMessageHandler {
+			request_full_sync: false,
+		}
+	}
+
+	pub fn set_request_full_sync(mut self) -> Self {
+		self.request_full_sync = true;
+		self
 	}
 }
 impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
@@ -195,7 +204,7 @@ impl msgs::RoutingMessageHandler for TestRoutingMessageHandler {
 		Vec::new()
 	}
 	fn should_request_full_sync(&self, _node_id: &PublicKey) -> bool {
-		true
+		self.request_full_sync
 	}
 }