From 99a9edf7d5dea64be9d34714d15175a5f25bd6c2 Mon Sep 17 00:00:00 2001 From: pawan Date: Fri, 22 May 2020 20:45:53 +0530 Subject: [PATCH] Get enr dependency instead of libp2p --- common/eth2_testnet_config/Cargo.toml | 2 +- common/eth2_testnet_config/src/lib.rs | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/common/eth2_testnet_config/Cargo.toml b/common/eth2_testnet_config/Cargo.toml index a531cb7547..e90d9413f2 100644 --- a/common/eth2_testnet_config/Cargo.toml +++ b/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" diff --git a/common/eth2_testnet_config/src/lib.rs b/common/eth2_testnet_config/src/lib.rs index 0237295dbf..71edcbcf37 100644 --- a/common/eth2_testnet_config/src/lib.rs +++ b/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}; @@ -36,7 +36,7 @@ pub const HARDCODED_BOOT_ENR: &[u8] = include_bytes!("../schlesi-v0-11/boot_enr. pub struct Eth2TestnetConfig { pub deposit_contract_address: String, pub deposit_contract_deploy_block: u64, - pub boot_enr: Option>, + pub boot_enr: Option>>, pub genesis_state: Option>, pub yaml_config: Option, } @@ -239,7 +239,7 @@ mod tests { } fn do_test( - boot_enr: Option>, + boot_enr: Option>>, genesis_state: Option>, yaml_config: Option, ) {