fix: boot node connections

graphops · Oct 3, 2023 · b11a1c9 · b11a1c9
1 parent c879099
commit b11a1c9
Show file tree

Hide file tree

Showing 4 changed files with 39 additions and 21 deletions.
diff --git a/examples/ping-pong/src/main.rs b/examples/ping-pong/src/main.rs
@@ -107,7 +107,7 @@ async fn main() {
  None,
  Some(true),
  // Example ENR address
- Some(vec![String::from("enr:-JK4QBcfVXu2YDeSKdjF2xE5EDM5f5E_1Akpkv_yw_byn1adESxDXVLVjapjDvS_ujx6MgWDu9hqO_Az_CbKLJ8azbMBgmlkgnY0gmlwhAVOUWOJc2VjcDI1NmsxoQOUZIqKLk5xkiH0RAFaMGrziGeGxypJ03kOod1-7Pum3oN0Y3CCfJyDdWRwgiMohXdha3UyDQ")]),
+ Some(vec![String::from("enr:-P-4QJI8tS1WTdIQxq_yIrD05oIIW1Xg-tm_qfP0CHfJGnp9dfr6ttQJmHwTNxGEl4Le8Q7YHcmi-kXTtphxFysS11oBgmlkgnY0gmlwhLymh5GKbXVsdGlhZGRyc7hgAC02KG5vZGUtMDEuZG8tYW1zMy53YWt1djIucHJvZC5zdGF0dXNpbS5uZXQGdl8ALzYobm9kZS0wMS5kby1hbXMzLndha3V2Mi5wcm9kLnN0YXR1c2ltLm5ldAYfQN4DiXNlY3AyNTZrMaEDbl1X_zJIw3EAJGtmHMVn4Z2xhpSoUaP5ElsHKCv7hlWDdGNwgnZfg3VkcIIjKIV3YWt1Mg8")]),
  None,
  )
  .await
@@ -193,6 +193,8 @@ async fn main_loop(agent: &GraphcastAgent, running: Arc<AtomicBool>) {
  .await
  {
  error!(error = tracing::field::debug(&e), "Failed to send message");
+ } else {
+ info!("Ping message sent successfully")
  };
  // agent.send_message(msg).await;
  } else {
@@ -217,7 +219,9 @@ async fn main_loop(agent: &GraphcastAgent, running: Arc<AtomicBool>) {
  .await
  {
  error!(error = tracing::field::debug(&e), "Failed to send message");
- };
+ } else {
+ info!("Pong message sent successfully")
+ }
  };
  }
 

diff --git a/src/graphcast_agent/message_typing.rs b/src/graphcast_agent/message_typing.rs
@@ -141,6 +141,7 @@ impl<
  .peer_id()
  .expect("Failed to find local node's peer id")
  .as_str()
+ && peer.connected()
  })
  .map(|peer: &WakuPeerData| {
  // Filter subscribe to all other peers

diff --git a/src/graphcast_agent/mod.rs b/src/graphcast_agent/mod.rs
@@ -530,6 +530,8 @@ pub fn register_handler(
  }
  }
  };
+
+ info!("Registering handler");
  waku_set_event_callback(handle_async);
  Ok(())
 }

diff --git a/src/graphcast_agent/waku_handling.rs b/src/graphcast_agent/waku_handling.rs
@@ -166,7 +166,7 @@ fn node_config(
  "PANIC" => WakuLogLevel::Panic,
  _ => WakuLogLevel::Warn,
  },
- Err(_) => WakuLogLevel::Error,
+ Err(_) => WakuLogLevel::Panic,
  };
 
  let gossipsub_params = GossipSubParams {
@@ -496,25 +496,36 @@ pub fn peers_data(
 
 /// Check for peer connectivity, try to reconnect if there are disconnected peers
 pub fn network_check(node_handle: &WakuNodeHandle<Running>) -> Result<(), WakuHandlingError> {
- peers_data(node_handle)?
- .iter()
- // Get unconnected peers and try to reconnect
- .filter(|&peer| !peer.connected())
- .map(|peer: &WakuPeerData| {
- debug!(
- peer = tracing::field::debug(&peer),
- "Disconnected peer data"
- );
- node_handle.connect_peer_with_id(peer.peer_id(), None)
- })
- .for_each(|res| {
- if let Err(e) = res {
- debug!(
- error = tracing::field::debug(&e),
- "Could not connect to peer"
- );
+ let peers = peers_data(node_handle)?;
+
+ for peer in peers.iter() {
+ let contains_filter = peer
+ .protocols()
+ .iter()
+ .any(|p| p == "/vac/waku/filter/2.0.0-beta1");
+ let contains_lightpush = peer
+ .protocols()
+ .iter()
+ .any(|p| p == "/vac/waku/lightpush/2.0.0-beta1");
+ let contains_relay = peer
+ .protocols()
+ .iter()
+ .any(|p| p == "/vac/waku/relay/2.0.0");
+
+ if contains_filter && contains_lightpush && contains_relay {
+ if !peer.connected() {
+ if let Err(e) = node_handle.connect_peer_with_id(peer.peer_id(), None) {
+ debug!(
+ error = tracing::field::debug(&e),
+ "Could not connect to peer"
+ );
+ }
  }
- });
+ } else {
+ // debug!("Disconnecting peer due to unsupported protocols");
+ node_handle.disconnect_peer_with_id(peer.peer_id()).unwrap();
+ }
+ }
  Ok(())
 }