Update to tokio 1.1 (#2172)

## Issue Addressed

resolves #2129
resolves #2099 
addresses some of #1712
unblocks #2076
unblocks #2153 

## Proposed Changes

- Updates all the dependencies mentioned in #2129, except for web3. They haven't merged their tokio 1.0 update because they are waiting on some dependencies of their own. Since we only use web3 in tests, I think updating it in a separate issue is fine. If they are able to merge soon though, I can update in this PR. 

- Updates `tokio_util` to 0.6.2 and `bytes` to 1.0.1.

- We haven't made a discv5 release since merging tokio 1.0 updates so I'm using a commit rather than release atm. **Edit:** I think we should merge an update of `tokio_util` to 0.6.2 into discv5 before this release because it has panic fixes in `DelayQueue`  --> PR in discv5:  https://github.com/sigp/discv5/pull/58

## Additional Info

tokio 1.0 changes that required some changes in lighthouse:

- `interval.next().await.is_some()` -> `interval.tick().await`
- `sleep` future is now `!Unpin` -> https://github.com/tokio-rs/tokio/issues/3028
- `try_recv` has been temporarily removed from `mpsc` -> https://github.com/tokio-rs/tokio/issues/3350
- stream features have moved to `tokio-stream` and `broadcast::Receiver::into_stream()` has been temporarily removed -> `https://github.com/tokio-rs/tokio/issues/2870
- I've copied over the `BroadcastStream` wrapper from this PR, but can update to use `tokio-stream` once it's merged https://github.com/tokio-rs/tokio/pull/3384

Co-authored-by: realbigsean <seananderson33@gmail.com>

validator_client/Cargo.toml

@@ -9,9 +9,8 @@ name = "validator_client"
 path = "src/lib.rs"
 
 [dev-dependencies]
-tokio = { version = "0.3.2", features = ["time", "rt-multi-thread", "macros"] }
+tokio = { version = "1.1.0", features = ["time", "rt-multi-thread", "macros"] }
 deposit_contract = { path = "../common/deposit_contract" }
-tokio-compat-02 = "0.1"
 
 [dependencies]
 eth2_ssz = "0.1.2"
@@ -30,7 +29,7 @@ serde_yaml = "0.8.13"
 slog = { version = "2.5.2", features = ["max_level_trace", "release_max_level_trace"] }
 slog-async = "2.5.0"
 slog-term = "2.6.0"
-tokio = { version = "0.3.2", features = ["time"] }
+tokio = { version = "1.1.0", features = ["time"] }
 futures = "0.3.7"
 dirs = "3.0.1"
 directory = { path = "../common/directory" }
@@ -53,8 +52,8 @@ eth2_keystore = { path = "../crypto/eth2_keystore" }
 account_utils = { path = "../common/account_utils" }
 lighthouse_version = { path = "../common/lighthouse_version" }
 warp_utils = { path = "../common/warp_utils" }
-warp = { git = "https://github.com/sigp/warp ", branch = "lighthouse" }
-hyper = "0.13.8"
+warp = "0.3.0"
+hyper = "0.14.4"
 serde_utils = { path = "../consensus/serde_utils" }
 libsecp256k1 = "0.3.5"
 ring = "0.16.19"

validator_client/src/attestation_service.rs

@@ -6,7 +6,6 @@ use crate::{
 };
 use environment::RuntimeContext;
 use futures::future::FutureExt;
-use futures::StreamExt;
 use slog::{crit, error, info, trace};
 use slot_clock::SlotClock;
 use std::collections::HashMap;
@@ -149,7 +148,8 @@ impl<T: SlotClock + 'static, E: EthSpec> AttestationService<T, E> {
         let executor = self.context.executor.clone();
 
         let interval_fut = async move {
-            while interval.next().await.is_some() {
+            loop {
+                interval.tick().await;
                 let log = self.context.log();
 
                 if let Err(e) = self.spawn_attestation_tasks(slot_duration) {

validator_client/src/duties_service.rs

@@ -5,7 +5,7 @@ use crate::{
 };
 use environment::RuntimeContext;
 use futures::channel::mpsc::Sender;
-use futures::{SinkExt, StreamExt};
+use futures::SinkExt;
 use parking_lot::RwLock;
 use slog::{debug, error, trace, warn};
 use slot_clock::SlotClock;
@@ -490,7 +490,8 @@ impl<T: SlotClock + 'static, E: EthSpec> DutiesService<T, E> {
         let executor = self.inner.context.executor.clone();
 
         let interval_fut = async move {
-            while interval.next().await.is_some() {
+            loop {
+                interval.tick().await;
                 self.clone().do_update(&mut block_service_tx, &spec).await;
             }
         };

validator_client/src/fork_service.rs

@@ -3,7 +3,6 @@ use crate::http_metrics::metrics;
 use environment::RuntimeContext;
 use eth2::types::StateId;
 use futures::future::FutureExt;
-use futures::StreamExt;
 use parking_lot::RwLock;
 use slog::Logger;
 use slog::{debug, trace};
@@ -164,7 +163,8 @@ impl<T: SlotClock + 'static, E: EthSpec> ForkService<T, E> {
         let executor = context.executor.clone();
 
         let interval_fut = async move {
-            while interval.next().await.is_some() {
+            loop {
+                interval.tick().await;
                 self.clone().do_update().await.ok();
             }
         };

validator_client/src/http_api/tests.rs

@@ -25,7 +25,6 @@ use std::sync::Arc;
 use tempfile::{tempdir, TempDir};
 use tokio::runtime::Runtime;
 use tokio::sync::oneshot;
-use tokio_compat_02::FutureExt;
 
 const PASSWORD_BYTES: &[u8] = &[42, 50, 37];
 
@@ -439,141 +438,126 @@ struct KeystoreValidatorScenario {
 fn invalid_pubkey() {
     let runtime = build_runtime();
     let weak_runtime = Arc::downgrade(&runtime);
-    runtime.block_on(
-        async {
-            ApiTester::new(weak_runtime)
-                .await
-                .invalidate_api_token()
-                .test_get_lighthouse_version_invalid()
-                .await;
-        }
-        .compat(),
-    );
+    runtime.block_on(async {
+        ApiTester::new(weak_runtime)
+            .await
+            .invalidate_api_token()
+            .test_get_lighthouse_version_invalid()
+            .await;
+    });
 }
 
 #[test]
 fn simple_getters() {
     let runtime = build_runtime();
     let weak_runtime = Arc::downgrade(&runtime);
-    runtime.block_on(
-        async {
-            ApiTester::new(weak_runtime)
-                .await
-                .test_get_lighthouse_version()
-                .await
-                .test_get_lighthouse_health()
-                .await
-                .test_get_lighthouse_spec()
-                .await;
-        }
-        .compat(),
-    );
+    runtime.block_on(async {
+        ApiTester::new(weak_runtime)
+            .await
+            .test_get_lighthouse_version()
+            .await
+            .test_get_lighthouse_health()
+            .await
+            .test_get_lighthouse_spec()
+            .await;
+    });
 }
 
 #[test]
 fn hd_validator_creation() {
     let runtime = build_runtime();
     let weak_runtime = Arc::downgrade(&runtime);
-    runtime.block_on(
-        async {
-            ApiTester::new(weak_runtime)
-                .await
-                .assert_enabled_validators_count(0)
-                .assert_validators_count(0)
-                .create_hd_validators(HdValidatorScenario {
-                    count: 2,
-                    specify_mnemonic: true,
-                    key_derivation_path_offset: 0,
-                    disabled: vec![],
-                })
-                .await
-                .assert_enabled_validators_count(2)
-                .assert_validators_count(2)
-                .create_hd_validators(HdValidatorScenario {
-                    count: 1,
-                    specify_mnemonic: false,
-                    key_derivation_path_offset: 0,
-                    disabled: vec![0],
-                })
-                .await
-                .assert_enabled_validators_count(2)
-                .assert_validators_count(3)
-                .create_hd_validators(HdValidatorScenario {
-                    count: 0,
-                    specify_mnemonic: true,
-                    key_derivation_path_offset: 4,
-                    disabled: vec![],
-                })
-                .await
-                .assert_enabled_validators_count(2)
-                .assert_validators_count(3);
-        }
-        .compat(),
-    );
+    runtime.block_on(async {
+        ApiTester::new(weak_runtime)
+            .await
+            .assert_enabled_validators_count(0)
+            .assert_validators_count(0)
+            .create_hd_validators(HdValidatorScenario {
+                count: 2,
+                specify_mnemonic: true,
+                key_derivation_path_offset: 0,
+                disabled: vec![],
+            })
+            .await
+            .assert_enabled_validators_count(2)
+            .assert_validators_count(2)
+            .create_hd_validators(HdValidatorScenario {
+                count: 1,
+                specify_mnemonic: false,
+                key_derivation_path_offset: 0,
+                disabled: vec![0],
+            })
+            .await
+            .assert_enabled_validators_count(2)
+            .assert_validators_count(3)
+            .create_hd_validators(HdValidatorScenario {
+                count: 0,
+                specify_mnemonic: true,
+                key_derivation_path_offset: 4,
+                disabled: vec![],
+            })
+            .await
+            .assert_enabled_validators_count(2)
+            .assert_validators_count(3);
+    });
 }
 
 #[test]
 fn validator_enabling() {
     let runtime = build_runtime();
     let weak_runtime = Arc::downgrade(&runtime);
-    runtime.block_on(
-        async {
-            ApiTester::new(weak_runtime)
-                .await
-                .create_hd_validators(HdValidatorScenario {
-                    count: 2,
-                    specify_mnemonic: false,
-                    key_derivation_path_offset: 0,
-                    disabled: vec![],
-                })
-                .await
-                .assert_enabled_validators_count(2)
-                .assert_validators_count(2)
-                .set_validator_enabled(0, false)
-                .await
-                .assert_enabled_validators_count(1)
-                .assert_validators_count(2)
-                .set_validator_enabled(0, true)
-                .await
-                .assert_enabled_validators_count(2)
-                .assert_validators_count(2);
-        }
-        .compat(),
-    );
+    runtime.block_on(async {
+        ApiTester::new(weak_runtime)
+            .await
+            .create_hd_validators(HdValidatorScenario {
+                count: 2,
+                specify_mnemonic: false,
+                key_derivation_path_offset: 0,
+                disabled: vec![],
+            })
+            .await
+            .assert_enabled_validators_count(2)
+            .assert_validators_count(2)
+            .set_validator_enabled(0, false)
+            .await
+            .assert_enabled_validators_count(1)
+            .assert_validators_count(2)
+            .set_validator_enabled(0, true)
+            .await
+            .assert_enabled_validators_count(2)
+            .assert_validators_count(2);
+    });
 }
 
 #[test]
 fn keystore_validator_creation() {
     let runtime = build_runtime();
     let weak_runtime = Arc::downgrade(&runtime);
-    runtime.block_on(
-        async {
-            ApiTester::new(weak_runtime)
-                .await
-                .assert_enabled_validators_count(0)
-                .assert_validators_count(0)
-                .create_keystore_validators(KeystoreValidatorScenario {
-                    correct_password: true,
-                    enabled: true,
-                })
-                .await
-                .assert_enabled_validators_count(1)
-                .assert_validators_count(1)
-                .create_keystore_validators(KeystoreValidatorScenario {
-                    correct_password: false,
-                    enabled: true,
-                })
-                .await
-                .assert_enabled_validators_count(1)
-                .assert_validators_count(1)
-                .create_keystore_validators(KeystoreValidatorScenario {
-                    correct_password: true,
-                    enabled: false,
-                })
-                .await
-                .assert_enabled_validators_count(1)
-                .assert_validators_count(2);
-        }
-        .compat(),
-    );
+    runtime.block_on(async {
+        ApiTester::new(weak_runtime)
+            .await
+            .assert_enabled_validators_count(0)
+            .assert_validators_count(0)
+            .create_keystore_validators(KeystoreValidatorScenario {
+                correct_password: true,
+                enabled: true,
+            })
+            .await
+            .assert_enabled_validators_count(1)
+            .assert_validators_count(1)
+            .create_keystore_validators(KeystoreValidatorScenario {
+                correct_password: false,
+                enabled: true,
+            })
+            .await
+            .assert_enabled_validators_count(1)
+            .assert_validators_count(1)
+            .create_keystore_validators(KeystoreValidatorScenario {
+                correct_password: true,
+                enabled: false,
+            })
+            .await
+            .assert_enabled_validators_count(1)
+            .assert_validators_count(2);
+    });
 }

validator_client/src/notifier.rs

@@ -1,5 +1,4 @@
 use crate::ProductionValidatorClient;
-use futures::StreamExt;
 use slog::{error, info};
 use slot_clock::SlotClock;
 use tokio::time::{interval_at, Duration, Instant};
@@ -24,7 +23,8 @@ pub fn spawn_notifier<T: EthSpec>(client: &ProductionValidatorClient<T>) -> Resu
     let interval_fut = async move {
         let log = context.log();
 
-        while interval.next().await.is_some() {
+        loop {
+            interval.tick().await;
             let num_available = duties_service.beacon_nodes.num_available().await;
             let num_synced = duties_service.beacon_nodes.num_synced().await;
             let num_total = duties_service.beacon_nodes.num_total().await;