Revert "Allow each NetworkBehaviour to have their own ConnectionDenied reason"

This reverts commit 19348e9.

Author: thomaseizinger

examples/file-sharing.rs

@@ -408,7 +408,6 @@ mod network {
             &mut self,
             event: SwarmEvent<
                 ComposedEvent,
-                ComposedBehaviourConnectionDenied,
                 EitherError<ConnectionHandlerUpgrErr<io::Error>, io::Error>,
             >,
         ) {

misc/metrics/src/identify.rs

@@ -193,10 +193,8 @@ impl super::Recorder<libp2p_identify::Event> for Metrics {
     }
 }
 
-impl<TBvEv, TReason, THandleErr>
-    super::Recorder<libp2p_swarm::SwarmEvent<TBvEv, TReason, THandleErr>> for Metrics
-{
-    fn record(&self, event: &libp2p_swarm::SwarmEvent<TBvEv, TReason, THandleErr>) {
+impl<TBvEv, THandleErr> super::Recorder<libp2p_swarm::SwarmEvent<TBvEv, THandleErr>> for Metrics {
+    fn record(&self, event: &libp2p_swarm::SwarmEvent<TBvEv, THandleErr>) {
         if let libp2p_swarm::SwarmEvent::ConnectionClosed {
             peer_id,
             num_established,

misc/metrics/src/lib.rs

@@ -142,10 +142,8 @@ impl Recorder<libp2p_relay::v2::relay::Event> for Metrics {
     }
 }
 
-impl<TBvEv, TReason, THandleErr> Recorder<libp2p_swarm::SwarmEvent<TBvEv, TReason, THandleErr>>
-    for Metrics
-{
-    fn record(&self, event: &libp2p_swarm::SwarmEvent<TBvEv, TReason, THandleErr>) {
+impl<TBvEv, THandleErr> Recorder<libp2p_swarm::SwarmEvent<TBvEv, THandleErr>> for Metrics {
+    fn record(&self, event: &libp2p_swarm::SwarmEvent<TBvEv, THandleErr>) {
         self.swarm.record(event);
 
         #[cfg(feature = "identify")]

misc/metrics/src/swarm.rs

@@ -139,10 +139,8 @@ impl Metrics {
     }
 }
 
-impl<TBvEv, TReason, THandleErr>
-    super::Recorder<libp2p_swarm::SwarmEvent<TBvEv, TReason, THandleErr>> for Metrics
-{
-    fn record(&self, event: &libp2p_swarm::SwarmEvent<TBvEv, TReason, THandleErr>) {
+impl<TBvEv, THandleErr> super::Recorder<libp2p_swarm::SwarmEvent<TBvEv, THandleErr>> for Metrics {
+    fn record(&self, event: &libp2p_swarm::SwarmEvent<TBvEv, THandleErr>) {
         match event {
             libp2p_swarm::SwarmEvent::Behaviour(_) => {}
             libp2p_swarm::SwarmEvent::ConnectionEstablished { endpoint, .. } => {
@@ -271,7 +269,6 @@ impl<TBvEv, TReason, THandleErr>
             libp2p_swarm::SwarmEvent::Dialing(_) => {
                 self.dial_attempt.inc();
             }
-            libp2p_swarm::SwarmEvent::ConnectionDenied { .. } => {}
         }
     }
 }

protocols/autonat/Cargo.toml

@@ -24,7 +24,6 @@ libp2p-request-response = { version = "0.23.0", path = "../request-response" }
 log = "0.4"
 rand = "0.8"
 prost = "0.11"
-void = "1.0.2"
 
 [dev-dependencies]
 async-std = { version = "1.10", features = ["attributes"] }

protocols/autonat/src/behaviour.rs

@@ -35,7 +35,7 @@ use libp2p_request_response::{
     ProtocolSupport, RequestId, RequestResponse, RequestResponseConfig, RequestResponseEvent,
     RequestResponseMessage, ResponseChannel,
 };
-use libp2p_swarm::behaviour::THandlerInEvent;
+use libp2p_swarm::behaviour::{ConnectionDenied, THandlerInEvent};
 use libp2p_swarm::{
     behaviour::{
         AddressChange, ConnectionClosed, ConnectionEstablished, DialFailure, ExpiredExternalAddr,
@@ -50,7 +50,6 @@ use std::{
     task::{Context, Poll},
     time::Duration,
 };
-use void::Void;
 
 /// Config for the [`Behaviour`].
 #[derive(Debug, Clone, PartialEq, Eq)]
@@ -411,7 +410,6 @@ impl Behaviour {
 
 impl NetworkBehaviour for Behaviour {
     type ConnectionHandler = <RequestResponse<AutoNatCodec> as NetworkBehaviour>::ConnectionHandler;
-    type ConnectionDenied = Void;
     type OutEvent = Event;
 
     fn poll(&mut self, cx: &mut Context<'_>, params: &mut impl PollParameters) -> Poll<Action> {
@@ -463,7 +461,7 @@ impl NetworkBehaviour for Behaviour {
         &mut self,
         peer: &PeerId,
         connected_point: &ConnectedPoint,
-    ) -> Result<Self::ConnectionHandler, Self::ConnectionDenied> {
+    ) -> Result<Self::ConnectionHandler, ConnectionDenied> {
         self.inner.new_handler(peer, connected_point)
     }
 

protocols/dcutr/src/behaviour.rs

@@ -27,7 +27,8 @@ use libp2p_core::connection::{ConnectedPoint, ConnectionId};
 use libp2p_core::multiaddr::Protocol;
 use libp2p_core::{Multiaddr, PeerId};
 use libp2p_swarm::behaviour::{
-    ConnectionClosed, ConnectionEstablished, DialFailure, FromSwarm, THandlerInEvent,
+    ConnectionClosed, ConnectionDenied, ConnectionEstablished, DialFailure, FromSwarm,
+    THandlerInEvent,
 };
 use libp2p_swarm::dial_opts::{self, DialOpts};
 use libp2p_swarm::{
@@ -38,7 +39,6 @@ use std::collections::hash_map::Entry;
 use std::collections::{HashMap, HashSet, VecDeque};
 use std::task::{Context, Poll};
 use thiserror::Error;
-use void::Void;
 
 const MAX_NUMBER_OF_UPGRADE_ATTEMPTS: u8 = 3;
 
@@ -210,14 +210,13 @@ impl Behaviour {
 
 impl NetworkBehaviour for Behaviour {
     type ConnectionHandler = Handler;
-    type ConnectionDenied = Void;
     type OutEvent = Event;
 
     fn new_handler(
         &mut self,
         peer: &PeerId,
         connected_point: &ConnectedPoint,
-    ) -> Result<Self::ConnectionHandler, Self::ConnectionDenied> {
+    ) -> Result<Self::ConnectionHandler, ConnectionDenied> {
         match (
             self.awaiting_direct_inbound_connections.entry(*peer),
             self.awaiting_direct_outbound_connections.entry(*peer),

protocols/floodsub/Cargo.toml

@@ -21,7 +21,6 @@ prost = "0.11"
 rand = "0.8"
 smallvec = "1.6.1"
 thiserror = "1.0.37"
-void = "1.0.2"
 
 [build-dependencies]
 prost-build = "0.11"

protocols/floodsub/src/layer.rs

@@ -27,8 +27,8 @@ use crate::FloodsubConfig;
 use cuckoofilter::{CuckooError, CuckooFilter};
 use fnv::FnvHashSet;
 use libp2p_core::{connection::ConnectionId, ConnectedPoint, PeerId};
-use libp2p_swarm::behaviour::THandlerInEvent;
 use libp2p_swarm::behaviour::{ConnectionClosed, ConnectionEstablished, FromSwarm};
+use libp2p_swarm::behaviour::{ConnectionDenied, THandlerInEvent};
 use libp2p_swarm::ConnectionHandler;
 use libp2p_swarm::{
     dial_opts::DialOpts, NetworkBehaviour, NetworkBehaviourAction, NotifyHandler, OneShotHandler,
@@ -39,7 +39,6 @@ use smallvec::SmallVec;
 use std::collections::hash_map::{DefaultHasher, HashMap};
 use std::task::{Context, Poll};
 use std::{collections::VecDeque, iter};
-use void::Void;
 
 /// Network behaviour that handles the floodsub protocol.
 pub struct Floodsub {
@@ -335,14 +334,13 @@ impl Floodsub {
 
 impl NetworkBehaviour for Floodsub {
     type ConnectionHandler = OneShotHandler<FloodsubProtocol, FloodsubRpc, InnerMessage>;
-    type ConnectionDenied = Void;
     type OutEvent = FloodsubEvent;
 
     fn new_handler(
         &mut self,
         _: &PeerId,
         _: &ConnectedPoint,
-    ) -> Result<Self::ConnectionHandler, Self::ConnectionDenied> {
+    ) -> Result<Self::ConnectionHandler, ConnectionDenied> {
         Ok(Default::default())
     }
 

protocols/gossipsub/Cargo.toml

@@ -11,29 +11,29 @@ keywords = ["peer-to-peer", "libp2p", "networking"]
 categories = ["network-programming", "asynchronous"]
 
 [dependencies]
-asynchronous-codec = "0.6"
-base64 = "0.13.0"
-byteorder = "1.3.4"
+libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+libp2p-core = { version = "0.38.0", path = "../../core" }
 bytes = "1.0"
+byteorder = "1.3.4"
 fnv = "1.0.7"
 futures = "0.3.5"
-hex_fmt = "0.3.0"
-instant = "0.1.11"
-libp2p-core = { version = "0.38.0", path = "../../core" }
-libp2p-swarm = { version = "0.41.0", path = "../../swarm" }
+rand = "0.8"
+asynchronous-codec = "0.6"
+unsigned-varint = { version = "0.7.0", features = ["asynchronous_codec"] }
 log = "0.4.11"
-prometheus-client = "0.18.0" # Metrics dependencies
+sha2 = "0.10.0"
+base64 = "0.13.0"
+smallvec = "1.6.1"
 prost = "0.11"
 prost-codec = { version = "0.3", path = "../../misc/prost-codec" }
-rand = "0.8"
+hex_fmt = "0.3.0"
 regex = "1.5.5"
 serde = { version = "1", optional = true, features = ["derive"] }
-sha2 = "0.10.0"
-smallvec = "1.6.1"
 thiserror = "1.0"
-unsigned-varint = { version = "0.7.0", features = ["asynchronous_codec"] }
-void = "1.0.2"
 wasm-timer = "0.2.5"
+instant = "0.1.11"
+# Metrics dependencies
+prometheus-client = "0.18.0"
 
 [dev-dependencies]
 async-std = "1.6.3"