Upgrade to tokio 0.3 (#1839)

## Description

This PR updates Lighthouse to tokio 0.3. It includes a number of dependency updates and some structural changes as to how we create and spawn tasks.

This also brings with it a number of various improvements:

- Discv5 update
- Libp2p update
- Fix for recompilation issues
- Improved UPnP port mapping handling
- Futures dependency update
- Log downgrade to traces for rejecting peers when we've reached our max



Co-authored-by: blacktemplar <blacktemplar@a1.net>

beacon_node/genesis/Cargo.toml

@@ -6,9 +6,10 @@ edition = "2018"
 
 [dev-dependencies]
 eth1_test_rig = { path = "../../testing/eth1_test_rig" }
+tokio-compat-02 = "0.1"
 
 [dependencies]
-futures = "0.3.5"
+futures = "0.3.7"
 types = { path = "../../consensus/types"}
 environment = { path = "../../lighthouse/environment"}
 eth1 = { path = "../eth1"}
@@ -18,7 +19,7 @@ merkle_proof = { path = "../../consensus/merkle_proof" }
 eth2_ssz = "0.1.2"
 eth2_hashing = "0.1.0"
 tree_hash = "0.1.1"
-tokio = { version = "0.2.22", features = ["full"] }
+tokio = { version = "0.3.2", features = ["full"] }
 parking_lot = "0.11.0"
 slog = "2.5.2"
 exit-future = "0.2.0"

beacon_node/genesis/src/eth1_genesis_service.rs

@@ -12,7 +12,7 @@ use std::sync::{
     Arc,
 };
 use std::time::Duration;
-use tokio::time::delay_for;
+use tokio::time::sleep;
 use types::{BeaconState, ChainSpec, Deposit, Eth1Data, EthSpec, Hash256};
 
 /// The number of blocks that are pulled per request whilst waiting for genesis.
@@ -151,7 +151,7 @@ impl Eth1GenesisService {
                         "valid_deposits" => eth1_service.get_raw_valid_signature_count(),
                     );
 
-                    delay_for(update_interval).await;
+                    sleep(update_interval).await;
 
                     continue;
                 }
@@ -231,9 +231,9 @@ impl Eth1GenesisService {
             // We assume that if we imported a large chunk of blocks then we're some distance from
             // the head and we should sync faster.
             if blocks_imported >= BLOCKS_PER_GENESIS_POLL {
-                delay_for(Duration::from_millis(50)).await;
+                sleep(Duration::from_millis(50)).await;
             } else {
-                delay_for(update_interval).await;
+                sleep(update_interval).await;
             }
         }
     }

beacon_node/genesis/tests/tests.rs

@@ -10,11 +10,12 @@ use futures::compat::Future01CompatExt;
 use genesis::{Eth1Config, Eth1GenesisService};
 use state_processing::is_valid_genesis_state;
 use std::time::Duration;
+use tokio_compat_02::FutureExt;
 use types::{test_utils::generate_deterministic_keypair, Hash256, MinimalEthSpec};
 
 pub fn new_env() -> Environment<MinimalEthSpec> {
     EnvironmentBuilder::minimal()
-        .single_thread_tokio_runtime()
+        .multi_threaded_tokio_runtime()
         .expect("should start tokio runtime")
         .null_logger()
         .expect("should start null logger")
@@ -28,83 +29,86 @@ fn basic() {
     let log = env.core_context().log().clone();
     let mut spec = env.eth2_config().spec.clone();
 
-    env.runtime().block_on(async {
-        let eth1 = GanacheEth1Instance::new(DEFAULT_NETWORK_ID.into(), DEFAULT_CHAIN_ID.into())
-            .await
-            .expect("should start eth1 environment");
-        let deposit_contract = &eth1.deposit_contract;
-        let web3 = eth1.web3();
+    env.runtime().block_on(
+        async {
+            let eth1 = GanacheEth1Instance::new(DEFAULT_NETWORK_ID.into(), DEFAULT_CHAIN_ID.into())
+                .await
+                .expect("should start eth1 environment");
+            let deposit_contract = &eth1.deposit_contract;
+            let web3 = eth1.web3();
 
-        let now = web3
-            .eth()
-            .block_number()
-            .compat()
-            .await
-            .map(|v| v.as_u64())
-            .expect("should get block number");
+            let now = web3
+                .eth()
+                .block_number()
+                .compat()
+                .await
+                .map(|v| v.as_u64())
+                .expect("should get block number");
 
-        let service = Eth1GenesisService::new(
-            Eth1Config {
-                endpoints: vec![eth1.endpoint()],
-                deposit_contract_address: deposit_contract.address(),
-                deposit_contract_deploy_block: now,
-                lowest_cached_block_number: now,
-                follow_distance: 0,
-                block_cache_truncation: None,
-                ..Eth1Config::default()
-            },
-            log,
-            spec.clone(),
-        );
+            let service = Eth1GenesisService::new(
+                Eth1Config {
+                    endpoints: vec![eth1.endpoint()],
+                    deposit_contract_address: deposit_contract.address(),
+                    deposit_contract_deploy_block: now,
+                    lowest_cached_block_number: now,
+                    follow_distance: 0,
+                    block_cache_truncation: None,
+                    ..Eth1Config::default()
+                },
+                log,
+                spec.clone(),
+            );
 
-        // NOTE: this test is sensitive to the response speed of the external web3 server. If
-        // you're experiencing failures, try increasing the update_interval.
-        let update_interval = Duration::from_millis(500);
+            // NOTE: this test is sensitive to the response speed of the external web3 server. If
+            // you're experiencing failures, try increasing the update_interval.
+            let update_interval = Duration::from_millis(500);
 
-        spec.min_genesis_time = 0;
-        spec.min_genesis_active_validator_count = 8;
+            spec.min_genesis_time = 0;
+            spec.min_genesis_active_validator_count = 8;
 
-        let deposits = (0..spec.min_genesis_active_validator_count + 2)
-            .map(|i| {
-                deposit_contract.deposit_helper::<MinimalEthSpec>(
-                    generate_deterministic_keypair(i as usize),
-                    Hash256::from_low_u64_le(i),
-                    32_000_000_000,
-                )
-            })
-            .map(|deposit| DelayThenDeposit {
-                delay: Duration::from_secs(0),
-                deposit,
-            })
-            .collect::<Vec<_>>();
+            let deposits = (0..spec.min_genesis_active_validator_count + 2)
+                .map(|i| {
+                    deposit_contract.deposit_helper::<MinimalEthSpec>(
+                        generate_deterministic_keypair(i as usize),
+                        Hash256::from_low_u64_le(i),
+                        32_000_000_000,
+                    )
+                })
+                .map(|deposit| DelayThenDeposit {
+                    delay: Duration::from_secs(0),
+                    deposit,
+                })
+                .collect::<Vec<_>>();
 
-        let deposit_future = deposit_contract.deposit_multiple(deposits);
+            let deposit_future = deposit_contract.deposit_multiple(deposits);
 
-        let wait_future =
-            service.wait_for_genesis_state::<MinimalEthSpec>(update_interval, spec.clone());
+            let wait_future =
+                service.wait_for_genesis_state::<MinimalEthSpec>(update_interval, spec.clone());
 
-        let state = futures::try_join!(deposit_future, wait_future)
-            .map(|(_, state)| state)
-            .expect("should finish waiting for genesis");
+            let state = futures::try_join!(deposit_future, wait_future)
+                .map(|(_, state)| state)
+                .expect("should finish waiting for genesis");
 
-        // Note: using ganache these deposits are 1-per-block, therefore we know there should only be
-        // the minimum number of validators.
-        assert_eq!(
-            state.validators.len(),
-            spec.min_genesis_active_validator_count as usize,
-            "should have expected validator count"
-        );
+            // Note: using ganache these deposits are 1-per-block, therefore we know there should only be
+            // the minimum number of validators.
+            assert_eq!(
+                state.validators.len(),
+                spec.min_genesis_active_validator_count as usize,
+                "should have expected validator count"
+            );
 
-        assert!(state.genesis_time > 0, "should have some genesis time");
+            assert!(state.genesis_time > 0, "should have some genesis time");
 
-        assert!(
-            is_valid_genesis_state(&state, &spec),
-            "should be valid genesis state"
-        );
+            assert!(
+                is_valid_genesis_state(&state, &spec),
+                "should be valid genesis state"
+            );
 
-        assert!(
-            is_valid_genesis_state(&state, &spec),
-            "should be valid genesis state"
-        );
-    });
+            assert!(
+                is_valid_genesis_state(&state, &spec),
+                "should be valid genesis state"
+            );
+        }
+        .compat(),
+    );
 }