Cleaner fix for test loop.

Author: tnull

lightning/src/ln/peer_handler.rs

@@ -1218,7 +1218,7 @@ impl<Descriptor: SocketDescriptor, CM: Deref, RM: Deref, L: Deref, CMH: Deref> P
 			},
 			wire::Message::GossipTimestampFilter(_msg) => {
 				// When supporting gossip messages, start inital gossip sync only after we receive
-				// a GossipTimestampFilter 
+				// a GossipTimestampFilter
 				if peer.their_features.as_ref().unwrap().supports_gossip_queries() &&
 					!peer.sent_gossip_timestamp_filter {
 					peer.sent_gossip_timestamp_filter = true;
@@ -1817,6 +1817,8 @@ mod tests {
 		assert_eq!(peer_b.read_event(&mut fd_b, &fd_a.outbound_data.lock().unwrap().split_off(0)).unwrap(), false);
 		peer_b.process_events();
 		assert_eq!(peer_a.read_event(&mut fd_a, &fd_b.outbound_data.lock().unwrap().split_off(0)).unwrap(), false);
+		peer_a.process_events();
+		assert_eq!(peer_b.read_event(&mut fd_b, &fd_a.outbound_data.lock().unwrap().split_off(0)).unwrap(), false);
 		(fd_a.clone(), fd_b.clone())
 	}
 
@@ -1882,19 +1884,19 @@ mod tests {
 		// Make each peer to read the messages that the other peer just wrote to them. Note that
 		// due to the max-message-before-ping limits this may take a few iterations to complete.
 		for _ in 0..150/super::BUFFER_DRAIN_MSGS_PER_TICK + 1 {
-			peers[0].process_events();
-			let b_read_data = fd_a.outbound_data.lock().unwrap().split_off(0);
-			assert!(!b_read_data.is_empty());
-
-			peers[1].read_event(&mut fd_b, &b_read_data).unwrap();
 			peers[1].process_events();
-
 			let a_read_data = fd_b.outbound_data.lock().unwrap().split_off(0);
 			assert!(!a_read_data.is_empty());
+
 			peers[0].read_event(&mut fd_a, &a_read_data).unwrap();
+			peers[0].process_events();
 
-			peers[1].process_events();
-			assert_eq!(fd_b.outbound_data.lock().unwrap().len(), 0, "Until B receives data, it shouldn't send more messages");
+			let b_read_data = fd_a.outbound_data.lock().unwrap().split_off(0);
+			assert!(!b_read_data.is_empty());
+			peers[1].read_event(&mut fd_b, &b_read_data).unwrap();
+
+			peers[0].process_events();
+			assert_eq!(fd_a.outbound_data.lock().unwrap().len(), 0, "Until A receives data, it shouldn't send more messages");
 		}
 
 		// Check that each peer has received the expected number of channel updates and channel