rust-client: patch libp2pv0.46.1, remove relay-v1

rust-client/Cargo.toml

@@ -12,7 +12,7 @@ futures = "0.3"
 futures-timer = "2"
 hyper = "0.14.20" 
 hyper-rustls = { version = "0.23.0", features = ["http2"] }
-libp2p = { version = "0.43.0", default-features = false, features = ["dcutr", "dns-async-std", "identify", "noise", "relay", "ping", "tcp-async-io", "yamux"] }
+libp2p = { version = "0.46.1", default-features = false, features = ["dcutr", "dns-async-std", "identify", "noise", "relay", "ping", "tcp-async-io", "yamux"] }
 log = "0.4"
 prost = "0.9"
 clap = { version = "3.1.6", features = ["derive"]}

rust-client/src/main.rs

@@ -1,5 +1,4 @@
 use clap::Parser;
-use either::Either;
 use futures::future::FutureExt;
 use futures::stream::StreamExt;
 use libp2p::core::multiaddr::{Multiaddr, Protocol};
@@ -11,14 +10,13 @@ use libp2p::dns::DnsConfig;
 use libp2p::identify::{Identify, IdentifyConfig, IdentifyEvent};
 use libp2p::noise;
 use libp2p::ping::{Ping, PingConfig, PingEvent};
-use libp2p::relay::v1::{new_transport_and_behaviour, Relay, RelayConfig};
 use libp2p::relay::v2::client::{self, Client};
 use libp2p::swarm::dial_opts::DialOpts;
 use libp2p::swarm::{
     ConnectionHandlerUpgrErr, IntoConnectionHandler, NetworkBehaviour, Swarm, SwarmBuilder,
     SwarmEvent,
 };
-use libp2p::tcp::TcpConfig;
+use libp2p::tcp::{TcpTransport, GenTcpConfig};
 use libp2p::Transport;
 use libp2p::{identity, PeerId};
 use log::{info, warn};
@@ -50,11 +48,6 @@ struct Opt {
     #[clap(long)]
     secret_key_seed: u8,
 
-    /// If set to `true`, use relay-v1 protocol.
-    /// Per default relay-v2 is used.
-    #[clap(long)]
-    relay_v1: bool,
-
     /// Number of iterations to run.
     /// Will loop eternally if set to `None`.
     #[clap(long)]
@@ -111,7 +104,7 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
         })
         .unwrap_or(true)
     {
-        let mut swarm = init_swarm(local_key.clone(), opt.relay_v1).await?;
+        let mut swarm = init_swarm(local_key.clone()).await?;
         if protocols.is_none() {
             let supported_protocols = swarm
                 .behaviour_mut()
@@ -195,38 +188,24 @@ async fn main() -> Result<(), Box<dyn std::error::Error>> {
 
 async fn init_swarm(
     local_key: identity::Keypair,
-    use_relay_v1: bool,
 ) -> Result<Swarm<Behaviour>, Box<dyn std::error::Error>> {
     let local_peer_id = PeerId::from(local_key.public());
 
     let noise_keys = noise::Keypair::<noise::X25519Spec>::new()
         .into_authentic(&local_key)
         .expect("Signing libp2p-noise static DH keypair failed.");
 
-    let relay_behaviour;
-    let transport = if use_relay_v1 {
-        let transport = DnsConfig::system(TcpConfig::new().port_reuse(true)).await?;
-        let (relay_transport, behaviour) =
-            new_transport_and_behaviour(RelayConfig::default(), transport);
-        relay_behaviour = Either::Left(behaviour);
-        relay_transport
-            .upgrade(upgrade::Version::V1)
-            .authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-            .multiplex(libp2p::yamux::YamuxConfig::default())
-            .boxed()
-    } else {
-        let (relay_transport, relay_client) = Client::new_transport_and_behaviour(local_peer_id);
-        relay_behaviour = Either::Right(relay_client);
-
-        OrTransport::new(
-            relay_transport,
-            DnsConfig::system(TcpConfig::new().port_reuse(true)).await?,
-        )
-        .upgrade(upgrade::Version::V1)
-        .authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
-        .multiplex(libp2p::yamux::YamuxConfig::default())
-        .boxed()
-    };
+
+    let (relay_transport, relay_behaviour) = Client::new_transport_and_behaviour(local_peer_id);
+
+    let transport = OrTransport::new(
+        relay_transport,
+        DnsConfig::system(TcpTransport::new(GenTcpConfig::new().port_reuse(true))).await?,
+    )
+    .upgrade(upgrade::Version::V1)
+    .authenticate(noise::NoiseConfig::xx(noise_keys).into_authenticated())
+    .multiplex(libp2p::yamux::YamuxConfig::default())
+    .boxed();
 
     let identify_config = IdentifyConfig::new("/ipfs/0.1.0".to_string(), local_key.public())
         .with_agent_version(agent_version());
@@ -543,7 +522,7 @@ fn generate_ed25519(secret_key_seed: u8) -> identity::Keypair {
 #[derive(libp2p::NetworkBehaviour)]
 #[behaviour(out_event = "Event", event_process = false)]
 struct Behaviour {
-    relay: Either<Relay, Client>,
+    relay: Client,
     ping: Ping,
     identify: Identify,
     dcutr: dcutr::behaviour::Behaviour,
@@ -554,7 +533,7 @@ struct Behaviour {
 enum Event {
     Ping(PingEvent),
     Identify(IdentifyEvent),
-    Relay(Either<(), client::Event>),
+    Relay(client::Event),
     Dcutr(dcutr::behaviour::Event),
 }
 
@@ -570,8 +549,8 @@ impl From<IdentifyEvent> for Event {
     }
 }
 
-impl From<Either<(), client::Event>> for Event {
-    fn from(e: Either<(), client::Event>) -> Self {
+impl From<client::Event> for Event {
+    fn from(e: client::Event) -> Self {
         Event::Relay(e)
     }
 }