From 92364d435417c878e6ca211cf45e681ff37ab22d Mon Sep 17 00:00:00 2001 From: Jeffrey Czyz Date: Fri, 11 Jun 2021 13:15:00 -0700 Subject: [PATCH] Simplify loop in connect_peer_if_necessary --- src/cli.rs | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/cli.rs b/src/cli.rs index be6c80c..b69f9af 100644 --- a/src/cli.rs +++ b/src/cli.rs @@ -471,24 +471,21 @@ pub(crate) async fn connect_peer_if_necessary( } match lightning_net_tokio::connect_outbound(Arc::clone(&peer_manager), pubkey, peer_addr).await { - Some(conn_closed_fut) => { - let mut closed_fut_box = Box::pin(conn_closed_fut); - let mut peer_connected = false; - while !peer_connected { - match futures::poll!(&mut closed_fut_box) { + Some(connection_closed_future) => { + let mut connection_closed_future = Box::pin(connection_closed_future); + loop { + match futures::poll!(&mut connection_closed_future) { std::task::Poll::Ready(_) => { println!("ERROR: Peer disconnected before we finished the handshake"); return Err(()); } std::task::Poll::Pending => {} } - for node_pubkey in peer_manager.get_peer_node_ids() { - if node_pubkey == pubkey { - peer_connected = true; - } - } // Avoid blocking the tokio context by sleeping a bit - tokio::time::sleep(Duration::from_millis(10)).await; + match peer_manager.get_peer_node_ids().iter().find(|id| **id == pubkey) { + Some(_) => break, + None => tokio::time::sleep(Duration::from_millis(10)).await, + } } } None => { -- 2.30.2