chore: remove dcutr

jacderida · Jul 23, 2024 · a48b800 · a48b800
1 parent cd5f8d4
commit a48b800
Show file tree

Hide file tree

Showing 6 changed files with 3 additions and 64 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/sn_networking/Cargo.toml b/sn_networking/Cargo.toml
@@ -30,7 +30,6 @@ libp2p = { version = "0.53", features = [
     "request-response",
     "cbor",
     "identify",
-    "dcutr",
     "tcp",
     "relay",
     "noise",

diff --git a/sn_networking/src/driver.rs b/sn_networking/src/driver.rs
@@ -206,7 +206,6 @@ pub(super) struct NodeBehaviour {
     pub(super) upnp: libp2p::swarm::behaviour::toggle::Toggle<libp2p::upnp::tokio::Behaviour>,
     pub(super) relay_client: libp2p::relay::client::Behaviour,
     pub(super) relay_server: libp2p::relay::Behaviour,
-    pub(super) dcutr: libp2p::dcutr::Behaviour,
     pub(super) kademlia: kad::Behaviour<UnifiedRecordStore>,
     pub(super) request_response: request_response::cbor::Behaviour<Request, Response>,
 }
@@ -583,7 +582,6 @@ impl NetworkBuilder {
             identify,
             #[cfg(feature = "local-discovery")]
             mdns,
-            dcutr: libp2p::dcutr::Behaviour::new(peer_id),
         };
 
         #[cfg(not(target_arch = "wasm32"))]

diff --git a/sn_networking/src/event/mod.rs b/sn_networking/src/event/mod.rs
@@ -42,7 +42,6 @@ pub(super) enum NodeEvent {
     #[cfg(feature = "local-discovery")]
     Mdns(Box<mdns::Event>),
     Identify(Box<libp2p::identify::Event>),
-    Dcutr(Box<libp2p::dcutr::Event>),
     RelayClient(Box<libp2p::relay::client::Event>),
     RelayServer(Box<libp2p::relay::Event>),
     Void(void::Void),
@@ -79,11 +78,6 @@ impl From<libp2p::identify::Event> for NodeEvent {
         NodeEvent::Identify(Box::new(event))
     }
 }
-impl From<libp2p::dcutr::Event> for NodeEvent {
-    fn from(event: libp2p::dcutr::Event) -> Self {
-        NodeEvent::Dcutr(Box::new(event))
-    }
-}
 impl From<libp2p::relay::client::Event> for NodeEvent {
     fn from(event: libp2p::relay::client::Event) -> Self {
         NodeEvent::RelayClient(Box::new(event))

diff --git a/sn_networking/src/event/swarm.rs b/sn_networking/src/event/swarm.rs
@@ -59,18 +59,6 @@ impl SwarmDriver {
                 event_string = "kad_event";
                 self.handle_kad_event(kad_event)?;
             }
-            SwarmEvent::Behaviour(NodeEvent::Dcutr(event)) => {
-                #[cfg(feature = "open-metrics")]
-                if let Some(metrics) = &self.network_metrics {
-                    metrics.record(&(*event));
-                }
-
-                event_string = "dcutr_event";
-                info!(
-                    "Dcutr with remote peer: {:?} is: {:?}",
-                    event.remote_peer_id, event.result
-                );
-            }
             SwarmEvent::Behaviour(NodeEvent::RelayClient(event)) => {
                 event_string = "relay_client_event";
 

diff --git a/sn_networking/src/metrics/mod.rs b/sn_networking/src/metrics/mod.rs
@@ -165,12 +165,6 @@ impl Recorder<libp2p::kad::Event> for NetworkMetrics {
     }
 }
 
-impl Recorder<libp2p::dcutr::Event> for NetworkMetrics {
-    fn record(&self, event: &libp2p::dcutr::Event) {
-        self.libp2p_metrics.record(event)
-    }
-}
-
 impl Recorder<libp2p::relay::Event> for NetworkMetrics {
     fn record(&self, event: &libp2p::relay::Event) {
         self.libp2p_metrics.record(event)