Updates for latest master

This commit is contained in:
Age Manning
2019-06-20 22:43:50 +10:00
parent fc8dc6dfa7
commit cf459b60a9
5 changed files with 21 additions and 46 deletions

View File

@@ -7,15 +7,14 @@ edition = "2018"
[dependencies]
beacon_chain = { path = "../beacon_chain" }
clap = "2.32.0"
# SigP repository until PR is merged
#libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "fb852bcc2b9b3935555cc93930e913cbec2b0688" }
libp2p = { path = "../../../sharding/rust-libp2p" }
# SigP repository
libp2p = { git = "https://github.com/SigP/rust-libp2p", rev = "8d5e5bbbe32d07ad271d6a2e15fde0347894061a" }
types = { path = "../../eth2/types" }
serde = "1.0"
serde_derive = "1.0"
ssz = { path = "../../eth2/utils/ssz" }
ssz_derive = { path = "../../eth2/utils/ssz_derive" }
slog = { version = "^2.2.3" , features = ["max_level_trace", "release_max_level_trace"] }
slog = { version = "2.4.1" , features = ["max_level_trace", "release_max_level_trace"] }
version = { path = "../version" }
tokio = "0.1.16"
futures = "0.1.25"

View File

@@ -147,11 +147,7 @@ impl<TSubstream: AsyncRead + AsyncWrite> Behaviour<TSubstream> {
pub fn new(local_public_key: PublicKey, net_conf: &NetworkConfig, log: &slog::Logger) -> Self {
let local_peer_id = local_public_key.clone().into_peer_id();
let behaviour_log = log.new(o!());
// identify configuration
let identify_config = net_conf.identify_config.clone();
// ping configuration
let ping_config = PingConfig::new()
.with_timeout(Duration::from_secs(30))
.with_interval(Duration::from_secs(20))