f Pull all peers.len() into scoped variables

Author: tnull

lightning/src/ln/peer_handler.rs

@@ -3456,7 +3456,10 @@ mod tests {
 		let cfgs = create_peermgr_cfgs(2);
 		let peers = create_network(2, &cfgs);
 		establish_connection(&peers[0], &peers[1]);
-		assert_eq!(peers[0].peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 
 		let their_id = peers[1].node_signer.get_node_id(Recipient::Node).unwrap();
 		cfgs[0].chan_handler.pending_events.lock().unwrap().push(MessageSendEvent::HandleError {
@@ -3465,7 +3468,10 @@ mod tests {
 		});
 
 		peers[0].process_events();
-		assert_eq!(peers[0].peers.read().unwrap().len(), 0);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 0);
+		}
 	}
 
 	#[test]
@@ -3477,7 +3483,10 @@ mod tests {
 		let b_chan_handler = test_utils::TestChannelMessageHandler::new(ChainHash::using_genesis_block(Network::Testnet));
 		let mut peers = create_network(2, &cfgs);
 		let (fd_a, mut fd_b) = establish_connection(&peers[0], &peers[1]);
-		assert_eq!(peers[0].peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 
 		let their_id = peers[1].node_signer.get_node_id(Recipient::Node).unwrap();
 
@@ -3532,10 +3541,16 @@ mod tests {
 		let cfgs = create_peermgr_cfgs(2);
 		let peers = create_network(2, &cfgs);
 		establish_connection(&peers[0], &peers[1]);
-		assert_eq!(peers[0].peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 
 		peers[0].disconnect_all_peers();
-		assert_eq!(peers[0].peers.read().unwrap().len(), 0);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 0);
+		}
 	}
 
 	#[test]
@@ -3544,17 +3559,26 @@ mod tests {
 		let cfgs = create_peermgr_cfgs(2);
 		let peers = create_network(2, &cfgs);
 		establish_connection(&peers[0], &peers[1]);
-		assert_eq!(peers[0].peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 
 		// peers[0] awaiting_pong is set to true, but the Peer is still connected
 		peers[0].timer_tick_occurred();
 		peers[0].process_events();
-		assert_eq!(peers[0].peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 
 		// Since timer_tick_occurred() is called again when awaiting_pong is true, all Peers are disconnected
 		peers[0].timer_tick_occurred();
 		peers[0].process_events();
-		assert_eq!(peers[0].peers.read().unwrap().len(), 0);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 0);
+		}
 	}
 
 	fn do_test_peer_connected_error_disconnects(handler: usize) {
@@ -3665,9 +3689,15 @@ mod tests {
 		peers[0].new_inbound_connection(fd_a.clone(), None).unwrap();
 
 		// If we get a single timer tick before completion, that's fine
-		assert_eq!(peers[0].peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 		peers[0].timer_tick_occurred();
-		assert_eq!(peers[0].peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 
 		assert_eq!(peers[0].read_event(&mut fd_a, &initial_data).unwrap(), false);
 		peers[0].process_events();
@@ -3677,7 +3707,10 @@ mod tests {
 
 		// ...but if we get a second timer tick, we should disconnect the peer
 		peers[0].timer_tick_occurred();
-		assert_eq!(peers[0].peers.read().unwrap().len(), 0);
+		{
+			let peers_len = peers[0].peers.read().unwrap().len();
+			assert_eq!(peers_len, 0);
+		}
 
 		let b_data = fd_b.outbound_data.lock().unwrap().split_off(0);
 		assert!(peers[0].read_event(&mut fd_a, &b_data).is_err());
@@ -3740,7 +3773,10 @@ mod tests {
 		assert!(peer_b.peers.read().unwrap().get(&fd_b).unwrap().lock().unwrap().handshake_complete());
 
 		// Make sure we're still connected.
-		assert_eq!(peer_b.peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peer_b.peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 
 		// B should send a ping on the first timer tick after `handshake_complete`.
 		assert!(fd_b.outbound_data.lock().unwrap().split_off(0).is_empty());
@@ -3771,11 +3807,17 @@ mod tests {
 			peer_b.timer_tick_occurred();
 			send_warning();
 		}
-		assert_eq!(peer_b.peers.read().unwrap().len(), 1);
+		{
+			let peers_len = peer_b.peers.read().unwrap().len();
+			assert_eq!(peers_len, 1);
+		}
 
 		// One more tick should enforce the pong timeout.
 		peer_b.timer_tick_occurred();
-		assert_eq!(peer_b.peers.read().unwrap().len(), 0);
+		{
+			let peers_len = peer_b.peers.read().unwrap().len();
+			assert_eq!(peers_len, 0);
+		}
 	}
 
 	#[test]