Merge remote-tracking branch 'origin/master' into spec-v0.12

common/eth2_testnet_config/Cargo.toml

@@ -16,5 +16,5 @@ tempdir = "0.3.7"
 serde = "1.0.110"
 serde_yaml = "0.8.11"
 types = { path = "../../consensus/types"}
-eth2-libp2p = { path = "../../beacon_node/eth2-libp2p"}
+enr = { version = "0.1.0", features = ["libsecp256k1", "ed25519"] }
 eth2_ssz = "0.1.2"

common/eth2_testnet_config/src/lib.rs

@@ -7,7 +7,7 @@
 //!
 //! https://github.com/sigp/lighthouse/pull/605
 
-use eth2_libp2p::Enr;
+use enr::{CombinedKey, Enr};
 use ssz::{Decode, Encode};
 use std::fs::{create_dir_all, File};
 use std::io::{Read, Write};
@@ -39,7 +39,7 @@ pub const HARDCODED_BOOT_ENR: &[u8] = include_bytes!("../witti-v0-11-3/boot_enr.
 pub struct Eth2TestnetConfig<E: EthSpec> {
     pub deposit_contract_address: String,
     pub deposit_contract_deploy_block: u64,
-    pub boot_enr: Option<Vec<Enr>>,
+    pub boot_enr: Option<Vec<Enr<CombinedKey>>>,
     pub genesis_state: Option<BeaconState<E>>,
     pub yaml_config: Option<YamlConfig>,
 }
@@ -246,7 +246,7 @@ mod tests {
     }
 
     fn do_test<E: EthSpec>(
-        boot_enr: Option<Vec<Enr>>,
+        boot_enr: Option<Vec<Enr<CombinedKey>>>,
         genesis_state: Option<BeaconState<E>>,
         yaml_config: Option<YamlConfig>,
     ) {