Upgrade simulator to stable futures

tests/simulator/src/local_network.rs

@@ -1,4 +1,3 @@
-use futures::{Future, IntoFuture};
 use node_test_rig::{
     environment::RuntimeContext, ClientConfig, LocalBeaconNode, LocalValidatorClient,
     RemoteBeaconNode, ValidatorConfig,
@@ -42,23 +41,24 @@ impl<E: EthSpec> Deref for LocalNetwork<E> {
 
 impl<E: EthSpec> LocalNetwork<E> {
     /// Creates a new network with a single `BeaconNode`.
-    pub fn new(
+    pub async fn new(
         context: RuntimeContext<E>,
         mut beacon_config: ClientConfig,
-    ) -> impl Future<Item = Self, Error = String> {
+    ) -> Result<Self, String> {
         beacon_config.network.discovery_port = BOOTNODE_PORT;
         beacon_config.network.libp2p_port = BOOTNODE_PORT;
         beacon_config.network.enr_udp_port = Some(BOOTNODE_PORT);
         beacon_config.network.enr_tcp_port = Some(BOOTNODE_PORT);
-        LocalBeaconNode::production(context.service_context("boot_node".into()), beacon_config).map(
-            |beacon_node| Self {
-                inner: Arc::new(Inner {
-                    context,
-                    beacon_nodes: RwLock::new(vec![beacon_node]),
-                    validator_clients: RwLock::new(vec![]),
-                }),
-            },
-        )
+        let beacon_node =
+            LocalBeaconNode::production(context.service_context("boot_node".into()), beacon_config)
+                .await?;
+        Ok(Self {
+            inner: Arc::new(Inner {
+                context,
+                beacon_nodes: RwLock::new(vec![beacon_node]),
+                validator_clients: RwLock::new(vec![]),
+            }),
+        })
     }
 
     /// Returns the number of beacon nodes in the network.
@@ -78,72 +78,65 @@ impl<E: EthSpec> LocalNetwork<E> {
     }
 
     /// Adds a beacon node to the network, connecting to the 0'th beacon node via ENR.
-    pub fn add_beacon_node(
-        &self,
-        mut beacon_config: ClientConfig,
-    ) -> impl Future<Item = (), Error = String> {
+    pub async fn add_beacon_node(&self, mut beacon_config: ClientConfig) -> Result<(), String> {
         let self_1 = self.clone();
         println!("Adding beacon node..");
-        self.beacon_nodes
-            .read()
-            .first()
-            .map(|boot_node| {
-                beacon_config.network.boot_nodes.push(
-                    boot_node
-                        .client
-                        .enr()
-                        .expect("bootnode must have a network"),
-                );
-            })
-            .expect("should have at least one node");
+        {
+            let read_lock = self.beacon_nodes.read();
+
+            let boot_node = read_lock.first().expect("should have at least one node");
+
+            beacon_config.network.boot_nodes.push(
+                boot_node
+                    .client
+                    .enr()
+                    .expect("bootnode must have a network"),
+            );
+        }
 
         let index = self.beacon_nodes.read().len();
 
-        LocalBeaconNode::production(
+        let beacon_node = LocalBeaconNode::production(
             self.context.service_context(format!("node_{}", index)),
             beacon_config,
         )
-        .map(move |beacon_node| {
-            self_1.beacon_nodes.write().push(beacon_node);
-        })
+        .await?;
+        self_1.beacon_nodes.write().push(beacon_node);
+        Ok(())
     }
 
     /// Adds a validator client to the network, connecting it to the beacon node with index
     /// `beacon_node`.
-    pub fn add_validator_client(
+    pub async fn add_validator_client(
         &self,
         mut validator_config: ValidatorConfig,
         beacon_node: usize,
         keypair_indices: Vec<usize>,
-    ) -> impl Future<Item = (), Error = String> {
+    ) -> Result<(), String> {
         let index = self.validator_clients.read().len();
         let context = self.context.service_context(format!("validator_{}", index));
         let self_1 = self.clone();
+        let socket_addr = {
+            let read_lock = self.beacon_nodes.read();
+            let beacon_node = read_lock
+                .get(beacon_node)
+                .ok_or_else(|| format!("No beacon node for index {}", beacon_node))?;
+            beacon_node
+                .client
+                .http_listen_addr()
+                .expect("Must have http started")
+        };
 
-        self.beacon_nodes
-            .read()
-            .get(beacon_node)
-            .map(move |beacon_node| {
-                let socket_addr = beacon_node
-                    .client
-                    .http_listen_addr()
-                    .expect("Must have http started");
-
-                validator_config.http_server =
-                    format!("http://{}:{}", socket_addr.ip(), socket_addr.port());
-
-                validator_config
-            })
-            .ok_or_else(|| format!("No beacon node for index {}", beacon_node))
-            .into_future()
-            .and_then(move |validator_config| {
-                LocalValidatorClient::production_with_insecure_keypairs(
-                    context,
-                    validator_config,
-                    &keypair_indices,
-                )
-            })
-            .map(move |validator_client| self_1.validator_clients.write().push(validator_client))
+        validator_config.http_server =
+            format!("http://{}:{}", socket_addr.ip(), socket_addr.port());
+        let validator_client = LocalValidatorClient::production_with_insecure_keypairs(
+            context,
+            validator_config,
+            &keypair_indices,
+        )
+        .await?;
+        self_1.validator_clients.write().push(validator_client);
+        Ok(())
     }
 
     /// For all beacon nodes in `Self`, return a HTTP client to access each nodes HTTP API.
@@ -157,13 +150,14 @@ impl<E: EthSpec> LocalNetwork<E> {
     }
 
     /// Return current epoch of bootnode.
-    pub fn bootnode_epoch(&self) -> impl Future<Item = Epoch, Error = String> {
+    pub async fn bootnode_epoch(&self) -> Result<Epoch, String> {
         let nodes = self.remote_nodes().expect("Failed to get remote nodes");
         let bootnode = nodes.first().expect("Should contain bootnode");
         bootnode
             .http
             .beacon()
             .get_head()
+            .await
             .map_err(|e| format!("Cannot get head: {:?}", e))
             .map(|head| head.finalized_slot.epoch(E::slots_per_epoch()))
     }