pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-28 12:07:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Upgrade to libp2p 0.15 (#4732)

Browse Source 
* 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
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/service.rs
+7 -3
View File
@@ -36,7 +36,7 @@ use futures::{prelude::*, channel::mpsc};
use log::{warn, error, info, trace};
use libp2p::{PeerId, Multiaddr, kad::record};
use libp2p::core::{transport::boxed::Boxed, muxing::StreamMuxerBox};
use libp2p::swarm::{NetworkBehaviour, SwarmEvent};
use libp2p::swarm::{NetworkBehaviour, SwarmBuilder, SwarmEvent};
use parking_lot::Mutex;
use sc_peerset::PeersetHandle;
use sp_runtime::{traits::{Block as BlockT, NumberFor}, ConsensusEngineId};
@@ -213,7 +213,7 @@ impl<B: BlockT + 'static, S: NetworkSpecialization<B>, H: ExHashT> NetworkWorker
)?;
// Build the swarm.
let (mut swarm, bandwidth) = {
let (mut swarm, bandwidth): (Swarm::<B, S, H>, _) = {
let user_agent = format!(
"{} ({})",
params.network_config.client_version,
@@ -241,7 +241,11 @@ impl<B: BlockT + 'static, S: NetworkSpecialization<B>, H: ExHashT> NetworkWorker
};
transport::build_transport(local_identity, config_mem, config_wasm)
};
(Swarm::<B, S, H>::new(transport, behaviour, local_peer_id.clone()), bandwidth)
let mut builder = SwarmBuilder::new(transport, behaviour, local_peer_id.clone());
if let Some(spawner) = params.executor {
builder = builder.executor_fn(spawner);
}
(builder.build(), bandwidth)
};
// Listen on multiaddresses.