pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-22 13:51:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update to libp2p-0.29. (#7341)

Browse Source 
* Update to libp2p-0.29.

* Update dependencies.

* Update Cargo.toml

Co-authored-by: Max Inden <mail@max-inden.de>

* Fix tests.

* Fix tests.

* Fix more tests.

* Update to 0.29.1

* Update ed25519-dalek dependency of sp-core.

* Update Cargo.lock.

Co-authored-by: Max Inden <mail@max-inden.de>
Co-authored-by: Pierre Krieger <pierre.krieger1708@gmail.com>
This commit is contained in:
Roman Borschel
2020-10-30 16:43:28 +01:00
committed by GitHub
parent 5ff5f64d80
commit ff1707cc7f
18 changed files with 302 additions and 249 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/network/src/transport.rs
+6 -9
View File
@@ -19,14 +19,14 @@
use libp2p::{
InboundUpgradeExt, OutboundUpgradeExt, PeerId, Transport,
core::{
self, either::EitherOutput, muxing::StreamMuxerBox,
transport::{boxed::Boxed, OptionalTransport}, upgrade
self, either::{EitherOutput, EitherTransport}, muxing::StreamMuxerBox,
transport::{Boxed, OptionalTransport}, upgrade
},
mplex, identity, bandwidth, wasm_ext, noise
};
#[cfg(not(target_os = "unknown"))]
use libp2p::{tcp, dns, websocket};
use std::{io, sync::Arc, time::Duration};
use std::{sync::Arc, time::Duration};
pub use self::bandwidth::BandwidthSinks;
@@ -41,7 +41,7 @@ pub fn build_transport(
keypair: identity::Keypair,
memory_only: bool,
wasm_external_transport: Option<wasm_ext::ExtTransport>,
) -> (Boxed<(PeerId, StreamMuxerBox), io::Error>, Arc<BandwidthSinks>) {
) -> (Boxed<(PeerId, StreamMuxerBox)>, Arc<BandwidthSinks>) {
// Build the base layer of the transport.
let transport = if let Some(t) = wasm_external_transport {
OptionalTransport::some(t)
@@ -54,9 +54,9 @@ pub fn build_transport(
let desktop_trans = websocket::WsConfig::new(desktop_trans.clone())
.or_transport(desktop_trans);
OptionalTransport::some(if let Ok(dns) = dns::DnsConfig::new(desktop_trans.clone()) {
dns.boxed()
EitherTransport::Left(dns)
} else {
desktop_trans.map_err(dns::DnsErr::Underlying).boxed()
EitherTransport::Right(desktop_trans.map_err(dns::DnsErr::Underlying))
})
} else {
OptionalTransport::none()
@@ -113,15 +113,12 @@ pub fn build_transport(
yamux_config.set_window_update_mode(libp2p::yamux::WindowUpdateMode::OnRead);
core::upgrade::SelectUpgrade::new(yamux_config, mplex_config)
.map_inbound(move |muxer| core::muxing::StreamMuxerBox::new(muxer))
.map_outbound(move |muxer| core::muxing::StreamMuxerBox::new(muxer))
};
let transport = transport.upgrade(upgrade::Version::V1)
.authenticate(authentication_config)
.multiplex(multiplexing_config)
.timeout(Duration::from_secs(20))
.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
.boxed();
(transport, bandwidth)