Update to libp2p-0.29. (#7341)

* 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>

substrate/client/network/src/discovery.rs

@@ -816,7 +816,8 @@ mod tests {
 			let transport = MemoryTransport
 				.upgrade(upgrade::Version::V1)
 				.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-				.multiplex(yamux::Config::default());
+				.multiplex(yamux::Config::default())
+				.boxed();
 
 			let behaviour = {
 				let mut config = DiscoveryConfig::new(keypair.public());

substrate/client/network/src/light_client_handler.rs

@@ -1316,7 +1316,7 @@ mod tests {
 			connection::ConnectionId,
 			identity,
 			muxing::{StreamMuxerBox, SubstreamRef},
-			transport::{Transport, boxed::Boxed, memory::MemoryTransport},
+			transport::{Transport, Boxed, memory::MemoryTransport},
 			upgrade
 		},
 		noise::{self, Keypair, X25519, NoiseConfig},
@@ -1356,8 +1356,6 @@ mod tests {
 			.upgrade(upgrade::Version::V1)
 			.authenticate(NoiseConfig::xx(dh_key).into_authenticated())
 			.multiplex(yamux::Config::default())
-			.map(|(peer, muxer), _| (peer, StreamMuxerBox::new(muxer)))
-			.map_err(|e| io::Error::new(io::ErrorKind::Other, e))
 			.boxed();
 		Swarm::new(transport, LightClientHandler::new(cf, client, checker, ps), local_peer)
 	}

substrate/client/network/src/protocol/generic_proto/tests.rs

@@ -23,7 +23,6 @@ use libp2p::{PeerId, Multiaddr, Transport};
 use libp2p::core::{
 	connection::{ConnectionId, ListenerId},
 	ConnectedPoint,
-	muxing,
 	transport::MemoryTransport,
 	upgrade
 };
@@ -56,9 +55,7 @@ fn build_nodes() -> (Swarm<CustomProtoWithAddr>, Swarm<CustomProtoWithAddr>) {
 			.upgrade(upgrade::Version::V1)
 			.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
 			.multiplex(yamux::Config::default())
-			.map(|(peer, muxer), _| (peer, muxing::StreamMuxerBox::new(muxer)))
 			.timeout(Duration::from_secs(20))
-			.map_err(|err| io::Error::new(io::ErrorKind::Other, err))
 			.boxed();
 
 		let (peerset, _) = sc_peerset::Peerset::from_config(sc_peerset::PeersetConfig {

substrate/client/network/src/request_responses.rs

@@ -680,7 +680,8 @@ mod tests {
 				let transport = MemoryTransport
 					.upgrade(upgrade::Version::V1)
 					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-					.multiplex(libp2p::yamux::Config::default());
+					.multiplex(libp2p::yamux::Config::default())
+					.boxed();
 
 				let behaviour = {
 					let (tx, mut rx) = mpsc::channel(64);
@@ -782,7 +783,8 @@ mod tests {
 				let transport = MemoryTransport
 					.upgrade(upgrade::Version::V1)
 					.authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-					.multiplex(libp2p::yamux::Config::default());
+					.multiplex(libp2p::yamux::Config::default())
+					.boxed();
 
 				let behaviour = {
 					let (tx, mut rx) = mpsc::channel(64);

substrate/client/network/src/transport.rs

@@ -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)