f simplify test

Author: TheBlueMatt

lightning/src/ln/peer_handler.rs

@@ -4915,29 +4915,10 @@ mod tests {
 		let peers = create_network(2, &cfgs);
 
 		let id_0 = peers[0].node_signer.get_node_id(Recipient::Node).unwrap();
-		let addr_0 = SocketAddress::TcpIpV4 { addr: [127, 0, 0, 1], port: 1000 };
-		let addr_1 = SocketAddress::TcpIpV4 { addr: [127, 0, 0, 1], port: 1001 };
 
-		let mut fd_0_1 = FileDescriptor::new(1);
-		let mut fd_1_0 = FileDescriptor::new(2);
-
-		// Connect the peers and exchange the initial connection handshake.
-		let initial_data =
-			peers[1].new_outbound_connection(id_0, fd_1_0.clone(), Some(addr_0)).unwrap();
-		peers[0].new_inbound_connection(fd_0_1.clone(), Some(addr_1)).unwrap();
-		peers[0].read_event(&mut fd_0_1, &initial_data).unwrap();
-
-		peers[0].process_events();
-		let data_0_1 = fd_0_1.outbound_data.lock().unwrap().split_off(0);
-		peers[1].read_event(&mut fd_1_0, &data_0_1).unwrap();
-
-		peers[1].process_events();
-		let data_1_0 = fd_1_0.outbound_data.lock().unwrap().split_off(0);
-		peers[0].read_event(&mut fd_0_1, &data_1_0).unwrap();
-
-		peers[0].process_events();
-		let data_0_1 = fd_0_1.outbound_data.lock().unwrap().split_off(0);
-		peers[1].read_event(&mut fd_1_0, &data_0_1).unwrap();
+		// Connect the peers and exchange the initial connection handshake (but not the final Init
+		// message).
+		let (mut fd_0_1, mut fd_1_0) = establish_connection(&peers[0], &peers[1]);
 
 		// Once peer 1 receives the Init message in the last read_event, it'll generate a
 		// `GossipTimestampFilter` which will request gossip. Instead we drop it here.
@@ -4950,7 +4931,7 @@ mod tests {
 
 		peers[1].process_events();
 		let data_1_0 = fd_1_0.outbound_data.lock().unwrap().split_off(0);
-		peers[0].read_event(&mut fd_0_1, &data_1_0).unwrap();
+		peers[0].read_event(&mut fd_0_1, &data_1_0).unwrap(); // Init message
 
 		peers[0].process_events();
 		assert!(fd_0_1.outbound_data.lock().unwrap().is_empty());