f Pull out more handler vars

Author: tnull

lightning/src/ln/peer_handler.rs

@@ -3570,15 +3570,19 @@ mod tests {
 		let cfgs = create_peermgr_cfgs(2);
 		let peers = create_network(2, &cfgs);
 
+		let chan_handler = peers[handler & 1].message_handler.chan_handler;
+		let route_handler = peers[handler & 1].message_handler.route_handler;
+		let custom_message_handler = peers[handler & 1].message_handler.custom_message_handler;
+
 		match handler & !1 {
 			0 => {
-				peers[handler & 1].message_handler.chan_handler.conn_tracker.fail_connections.store(true, Ordering::Release);
+				chan_handler.conn_tracker.fail_connections.store(true, Ordering::Release);
 			}
 			2 => {
-				peers[handler & 1].message_handler.route_handler.conn_tracker.fail_connections.store(true, Ordering::Release);
+				route_handler.conn_tracker.fail_connections.store(true, Ordering::Release);
 			}
 			4 => {
-				peers[handler & 1].message_handler.custom_message_handler.conn_tracker.fail_connections.store(true, Ordering::Release);
+				custom_message_handler.conn_tracker.fail_connections.store(true, Ordering::Release);
 			}
 			_ => panic!(),
 		}
@@ -3591,13 +3595,13 @@ mod tests {
 			assert!(peers[1].list_peers().is_empty());
 		}
 		// At least one message handler should have seen the connection.
-		assert!(peers[handler & 1].message_handler.chan_handler.conn_tracker.had_peers.load(Ordering::Acquire) ||
-			peers[handler & 1].message_handler.route_handler.conn_tracker.had_peers.load(Ordering::Acquire) ||
-			peers[handler & 1].message_handler.custom_message_handler.conn_tracker.had_peers.load(Ordering::Acquire));
+		assert!(chan_handler.conn_tracker.had_peers.load(Ordering::Acquire) ||
+			route_handler.conn_tracker.had_peers.load(Ordering::Acquire) ||
+			custom_message_handler.conn_tracker.had_peers.load(Ordering::Acquire));
 		// And both message handlers doing tracking should see the disconnection
-		assert!(peers[handler & 1].message_handler.chan_handler.conn_tracker.connected_peers.lock().unwrap().is_empty());
-		assert!(peers[handler & 1].message_handler.route_handler.conn_tracker.connected_peers.lock().unwrap().is_empty());
-		assert!(peers[handler & 1].message_handler.custom_message_handler.conn_tracker.connected_peers.lock().unwrap().is_empty());
+		assert!(chan_handler.conn_tracker.connected_peers.lock().unwrap().is_empty());
+		assert!(route_handler.conn_tracker.connected_peers.lock().unwrap().is_empty());
+		assert!(custom_message_handler.conn_tracker.connected_peers.lock().unwrap().is_empty());
 	}
 
 	#[test]