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>

testing/eth1_test_rig/Cargo.toml

@@ -5,7 +5,7 @@ authors = ["Paul Hauner <paul@paulhauner.com>"]
 edition = "2018"
 
 [dependencies]
-tokio = { version = "0.3.2", features = ["time"] }
+tokio = { version = "1.1.0", features = ["time"] }
 tokio-compat-02 = "0.1"
 web3 = "0.14.0"
 futures = "0.3.7"

testing/node_test_rig/Cargo.toml

@@ -10,7 +10,7 @@ beacon_node = { path = "../../beacon_node" }
 types = { path = "../../consensus/types" }
 eth2_config = { path = "../../common/eth2_config" }
 tempfile = "3.1.0"
-reqwest = { version = "0.10.8", features = ["native-tls-vendored"] }
+reqwest = { version = "0.11.0", features = ["native-tls-vendored"] }
 url = "2.1.1"
 serde = "1.0.116"
 futures = "0.3.7"

testing/remote_signer_test/Cargo.toml

@@ -11,10 +11,9 @@ hex = "0.4.2"
 httpmock = "0.5.1"
 remote_signer_client = { path = "../../remote_signer/client" }
 remote_signer_consumer = { path = "../../common/remote_signer_consumer" }
-reqwest = { version = "0.10.8", features = ["blocking", "json"] }
+reqwest = { version = "0.11.0", features = ["blocking", "json"] }
 serde = { version = "1.0.116", features = ["derive"] }
 serde_json = "1.0.58"
 tempfile = "3.1.0"
-tokio = { version = "0.3.5", features = ["time"] }
+tokio = { version = "1.1.0", features = ["time"] }
 types = { path = "../../consensus/types" }
-tokio-compat-02 = "0.1"

testing/remote_signer_test/src/api_test_signer.rs

@@ -26,10 +26,7 @@ impl ApiTestSigner<E> {
 
         let client = environment
             .runtime()
-            .block_on(tokio_compat_02::FutureExt::compat(Client::new(
-                runtime_context,
-                &matches,
-            )))
+            .block_on(Client::new(runtime_context, &matches))
             .map_err(|e| format!("Failed to init Rest API: {}", e))
             .unwrap();
 

testing/remote_signer_test/src/consumer.rs

@@ -30,13 +30,13 @@ pub fn do_sign_request<E: EthSpec, T: RemoteSignerObject>(
 ) -> Result<String, Error> {
     let runtime = Builder::new_multi_thread().enable_all().build().unwrap();
 
-    runtime.block_on(tokio_compat_02::FutureExt::compat(test_client.sign(
+    runtime.block_on(test_client.sign(
         &test_input.public_key,
         test_input.bls_domain,
         test_input.data,
         test_input.fork,
         test_input.genesis_validators_root,
-    )))
+    ))
 }
 
 #[derive(Serialize)]

testing/simulator/Cargo.toml

@@ -13,9 +13,8 @@ types = { path = "../../consensus/types" }
 validator_client = { path = "../../validator_client" }
 parking_lot = "0.11.0"
 futures = "0.3.7"
-tokio = "0.3.2"
+tokio = "1.1.0"
 eth1_test_rig = { path = "../eth1_test_rig" }
 env_logger = "0.8.2"
 clap = "2.33.3"
 rayon = "1.4.1"
-tokio-compat-02 = "0.1"

testing/simulator/src/eth1_sim.rs

@@ -90,7 +90,8 @@ pub fn run_eth1_sim(matches: &ArgMatches) -> Result<(), String> {
         // Start a timer that produces eth1 blocks on an interval.
         tokio::spawn(async move {
             let mut interval = tokio::time::interval(eth1_block_time);
-            while interval.next().await.is_some() {
+            loop {
+                interval.tick().await;
                 let _ = ganache.evm_mine().await;
             }
         });
@@ -219,9 +220,7 @@ pub fn run_eth1_sim(matches: &ArgMatches) -> Result<(), String> {
         Ok::<(), String>(())
     };
 
-    env.runtime()
-        .block_on(tokio_compat_02::FutureExt::compat(main_future))
-        .unwrap();
+    env.runtime().block_on(main_future).unwrap();
 
     env.fire_signal();
     env.shutdown_on_idle();

testing/simulator/src/no_eth1_sim.rs

@@ -158,9 +158,7 @@ pub fn run_no_eth1_sim(matches: &ArgMatches) -> Result<(), String> {
         Ok::<(), String>(())
     };
 
-    env.runtime()
-        .block_on(tokio_compat_02::FutureExt::compat(main_future))
-        .unwrap();
+    env.runtime().block_on(main_future).unwrap();
 
     env.fire_signal();
     env.shutdown_on_idle();

testing/simulator/src/sync_sim.rs

@@ -130,9 +130,7 @@ fn syncing_sim(
         Ok::<(), String>(())
     };
 
-    env.runtime()
-        .block_on(tokio_compat_02::FutureExt::compat(main_future))
-        .unwrap();
+    env.runtime().block_on(main_future).unwrap();
 
     env.fire_signal();
     env.shutdown_on_idle();
@@ -217,7 +215,8 @@ pub async fn verify_one_node_sync<E: EthSpec>(
     // limited to at most `sync_timeout` epochs
     let mut interval = tokio::time::interval(epoch_duration);
     let mut count = 0;
-    while interval.next().await.is_some() {
+    loop {
+        interval.tick().await;
         if count >= sync_timeout || !check_still_syncing(&network_c).await? {
             break;
         }
@@ -254,7 +253,8 @@ pub async fn verify_two_nodes_sync<E: EthSpec>(
     // limited to at most `sync_timeout` epochs
     let mut interval = tokio::time::interval(epoch_duration);
     let mut count = 0;
-    while interval.next().await.is_some() {
+    loop {
+        interval.tick().await;
         if count >= sync_timeout || !check_still_syncing(&network_c).await? {
             break;
         }
@@ -302,7 +302,8 @@ pub async fn verify_in_between_sync<E: EthSpec>(
     // limited to at most `sync_timeout` epochs
     let mut interval = tokio::time::interval(epoch_duration);
     let mut count = 0;
-    while interval.next().await.is_some() {
+    loop {
+        interval.tick().await;
         if count >= sync_timeout || !check_still_syncing(&network_c).await? {
             break;
         }