smoke-test: convert network tests to use LocalSwarm

testsuite/forge/src/backend/local/swarm.rs

@@ -371,6 +371,14 @@ impl LocalSwarm {
         self.validators.values_mut()
     }
 
+    pub fn fullnode(&self, peer_id: PeerId) -> Option<&LocalNode> {
+        self.fullnodes.get(&peer_id)
+    }
+
+    pub fn fullnode_mut(&mut self, peer_id: PeerId) -> Option<&mut LocalNode> {
+        self.fullnodes.get_mut(&peer_id)
+    }
+
     pub fn dir(&self) -> &Path {
         self.dir.as_ref()
     }

testsuite/forge/src/interface/node.rs

@@ -2,6 +2,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 use crate::{Result, Version};
+use anyhow::anyhow;
 use debug_interface::NodeDebugClient;
 use diem_config::{config::NodeConfig, network_id::NetworkId};
 use diem_sdk::{
@@ -75,6 +76,18 @@ pub trait Validator: Node {
         self.get_connected_peers(NetworkId::Validator, None)
             .map(|maybe_n| maybe_n.map(|n| n >= expected_peers as i64).unwrap_or(false))
     }
+
+    fn wait_for_connectivity(&self, expected_peers: usize, deadline: Instant) -> Result<()> {
+        while !self.check_connectivity(expected_peers)? {
+            if Instant::now() > deadline {
+                return Err(anyhow!("waiting for connectivity timed out"));
+            }
+
+            thread::sleep(Duration::from_millis(500));
+        }
+
+        Ok(())
+    }
 }
 
 /// Trait used to represent a running FullNode
@@ -87,6 +100,18 @@ pub trait FullNode: Node {
         self.get_connected_peers(NetworkId::Public, DIRECTION)
             .map(|maybe_n| maybe_n.map(|n| n >= EXPECTED_PEERS as i64).unwrap_or(false))
     }
+
+    fn wait_for_connectivity(&self, deadline: Instant) -> Result<()> {
+        while !self.check_connectivity()? {
+            if Instant::now() > deadline {
+                return Err(anyhow!("waiting for connectivity timed out"));
+            }
+
+            thread::sleep(Duration::from_millis(500));
+        }
+
+        Ok(())
+    }
 }
 
 impl<T: ?Sized> NodeExt for T where T: Node {}

testsuite/smoke-test/src/lib.rs

@@ -21,6 +21,8 @@ mod genesis;
 #[cfg(test)]
 mod key_manager;
 #[cfg(test)]
+mod network;
+#[cfg(test)]
 mod operational_tooling;
 #[cfg(test)]
 mod release_flow;
@@ -29,11 +31,6 @@ mod state_sync;
 #[cfg(test)]
 mod storage;
 
-// Left to convert
-
-#[cfg(test)]
-mod network;
-
 #[cfg(test)]
 mod smoke_test_environment;