From 12a49563ca254dc31dc0e8c569429e7e9c2ea409 Mon Sep 17 00:00:00 2001
From: rishflab <rishflab@hotmail.com>
Date: Wed, 13 Oct 2021 15:03:44 +1100
Subject: [PATCH] squash! Use upstream libp2p instead of our fork

---
 swap/src/cli.rs                           | 35 ++---------------------
 swap/src/cli/list_sellers.rs              |  5 ++--
 swap/src/network/cbor_request_response.rs |  4 +--
 3 files changed, 5 insertions(+), 39 deletions(-)

diff --git a/swap/src/cli.rs b/swap/src/cli.rs
index dcac95d1e..e4fbae815 100644
--- a/swap/src/cli.rs
+++ b/swap/src/cli.rs
@@ -129,7 +129,7 @@ mod tests {
     struct StaticQuoteAsbEvent;
 
     #[derive(libp2p::NetworkBehaviour)]
-    #[behaviour(out_event = "StaticQuoteAsbEvent")]
+    #[behaviour(event_process = true)]
     struct StaticQuoteAsbBehaviour {
         rendezvous: asb::rendezous::Behaviour,
         // Support `Ping` as a workaround until https://github.com/libp2p/rust-libp2p/issues/2109 is fixed.
@@ -141,25 +141,6 @@ mod tests {
         #[behaviour(ignore)]
         registered: bool,
     }
-
-    impl From<RequestResponseEvent<(), quote::BidQuote>> for StaticQuoteAsbEvent {
-        fn from(_: RequestResponseEvent<(), BidQuote>) -> Self {
-            StaticQuoteAsbEvent
-        }
-    }
-
-    impl From<libp2p::ping::Event> for StaticQuoteAsbEvent {
-        fn from(_: libp2p::ping::Event) -> Self {
-            StaticQuoteAsbEvent
-        }
-    }
-
-    impl From<libp2p::rendezvous::client::Event> for StaticQuoteAsbEvent {
-        fn from(_: libp2p::rendezvous::client::Event) -> Self {
-            StaticQuoteAsbEvent
-        }
-    }
-
     impl NetworkBehaviourEventProcess<libp2p::rendezvous::client::Event> for StaticQuoteAsbBehaviour {
         fn inject_event(&mut self, event: libp2p::rendezvous::client::Event) {
             if let libp2p::rendezvous::client::Event::Registered { .. } = event {
@@ -189,7 +170,7 @@ mod tests {
     struct RendezvousPointEvent;
 
     #[derive(libp2p::NetworkBehaviour)]
-    #[behaviour(out_event = "RendezvousPointEvent")]
+    #[behaviour(event_process = true)]
     struct RendezvousPointBehaviour {
         rendezvous: libp2p::rendezvous::server::Behaviour,
         // Support `Ping` as a workaround until https://github.com/libp2p/rust-libp2p/issues/2109 is fixed.
@@ -202,16 +183,4 @@ mod tests {
     impl NetworkBehaviourEventProcess<libp2p::ping::PingEvent> for RendezvousPointBehaviour {
         fn inject_event(&mut self, _: libp2p::ping::PingEvent) {}
     }
-
-    impl From<libp2p::ping::Event> for RendezvousPointEvent {
-        fn from(_: libp2p::ping::Event) -> Self {
-            RendezvousPointEvent
-        }
-    }
-
-    impl From<libp2p::rendezvous::server::Event> for RendezvousPointEvent {
-        fn from(_: libp2p::rendezvous::server::Event) -> Self {
-            RendezvousPointEvent
-        }
-    }
 }
diff --git a/swap/src/cli/list_sellers.rs b/swap/src/cli/list_sellers.rs
index 5f58ef53a..283f0fe95 100644
--- a/swap/src/cli/list_sellers.rs
+++ b/swap/src/cli/list_sellers.rs
@@ -5,7 +5,6 @@ use anyhow::{Context, Result};
 use futures::StreamExt;
 use libp2p::multiaddr::Protocol;
 use libp2p::ping::{Ping, PingConfig, PingEvent};
-use libp2p::rendezvous::Namespace;
 use libp2p::request_response::{RequestResponseEvent, RequestResponseMessage};
 use libp2p::swarm::SwarmEvent;
 use libp2p::{identity, rendezvous, Multiaddr, PeerId, Swarm};
@@ -29,7 +28,7 @@ pub async fn list_sellers(
     identity: identity::Keypair,
 ) -> Result<Vec<Seller>> {
     let behaviour = Behaviour {
-        rendezvous: libp2p::rendezvous::client::Behaviour::new(identity.clone()),
+        rendezvous: rendezvous::client::Behaviour::new(identity.clone()),
         quote: quote::cli(),
         ping: Ping::new(
             PingConfig::new()
@@ -155,7 +154,7 @@ impl EventLoop {
                                 );
 
                                 self.swarm.behaviour_mut().rendezvous.discover(
-                                    Some(Namespace::new(self.namespace.to_string()).expect("our namespace to be a correct string")),
+                                    Some(rendezvous::Namespace::new(self.namespace.to_string()).expect("our namespace to be a correct string")),
                                     None,
                                     None,
                                     self.rendezvous_peer_id,
diff --git a/swap/src/network/cbor_request_response.rs b/swap/src/network/cbor_request_response.rs
index 34920791a..939acdd3e 100644
--- a/swap/src/network/cbor_request_response.rs
+++ b/swap/src/network/cbor_request_response.rs
@@ -39,9 +39,7 @@ where
     where
         T: AsyncRead + Unpin + Send,
     {
-        let message = upgrade::read_length_prefixed(io, BUF_SIZE)
-            .await
-            .map_err(|e| io::Error::new(io::ErrorKind::Other, e))?;
+        let message = upgrade::read_length_prefixed(io, BUF_SIZE).await?;
         let mut de = serde_cbor::Deserializer::from_slice(&message);
         let msg = Req::deserialize(&mut de)
             .map_err(|error| io::Error::new(io::ErrorKind::Other, error))?;