Upgrade to libp2p 0.15 (#4732)

* Fixes for libp2p 0.15

* More work

* Update libp2p

* Update to libp2p 0.15
This commit is contained in:
Pierre Krieger
2020-01-27 18:27:36 +01:00
committed by Gavin Wood
parent ed3da9f903
commit 5c8743510e
16 changed files with 332 additions and 237 deletions
+1 -1
View File
@@ -14,7 +14,7 @@ futures = "0.1.29"
futures03 = { package = "futures", version = "0.3.1", features = ["compat"] }
futures-timer = "0.4.0"
rand = "0.7.2"
libp2p = { version = "0.14.0-alpha.1", default-features = false, features = ["libp2p-websocket"] }
libp2p = { version = "0.15.0", default-features = false, features = ["libp2p-websocket"] }
sp-consensus = { version = "0.8", path = "../../../primitives/consensus/common" }
sc-client = { version = "0.8", path = "../../" }
sc-client-api = { version = "2.0.0", path = "../../api" }
+3 -1
View File
@@ -52,7 +52,7 @@ use sc_network::config::{NetworkConfiguration, TransportConfig, BoxFinalityProof
use libp2p::PeerId;
use parking_lot::Mutex;
use sp_core::H256;
use sc_network::{Context, ProtocolConfig};
use sc_network::ProtocolConfig;
use sp_runtime::generic::{BlockId, OpaqueDigestItemId};
use sp_runtime::traits::{Block as BlockT, Header as HeaderT, NumberFor};
use sp_runtime::Justification;
@@ -613,6 +613,7 @@ pub trait TestNetFactory: Sized {
let network = NetworkWorker::new(sc_network::config::Params {
roles: config.roles,
executor: None,
network_config: NetworkConfiguration {
listen_addresses: vec![listen_addr.clone()],
transport: TransportConfig::MemoryOnly,
@@ -688,6 +689,7 @@ pub trait TestNetFactory: Sized {
let network = NetworkWorker::new(sc_network::config::Params {
roles: config.roles,
executor: None,
network_config: NetworkConfiguration {
listen_addresses: vec![listen_addr.clone()],
transport: TransportConfig::MemoryOnly,