Merge branch 'master' into haiko-webrtc-outbound-multistream-nego-fix

Author: haikoschol

src/transport/manager/mod.rs

@@ -1447,67 +1447,70 @@ mod tests {
         (dial_address, connection_id)
     }
 
+    #[tokio::test]
     #[cfg(feature = "websocket")]
-    struct MockTransport {
-        rx: tokio::sync::mpsc::Receiver<TransportEvent>,
-    }
-
-    #[cfg(feature = "websocket")]
-    impl MockTransport {
-        fn new(rx: tokio::sync::mpsc::Receiver<TransportEvent>) -> Self {
-            Self { rx }
+    #[cfg(feature = "quic")]
+    async fn transport_events() {
+        struct MockTransport {
+            rx: tokio::sync::mpsc::Receiver<TransportEvent>,
         }
-    }
 
-    #[cfg(feature = "websocket")]
-    impl Transport for MockTransport {
-        fn dial(&mut self, _connection_id: ConnectionId, _address: Multiaddr) -> crate::Result<()> {
-            Ok(())
+        impl MockTransport {
+            fn new(rx: tokio::sync::mpsc::Receiver<TransportEvent>) -> Self {
+                Self { rx }
+            }
         }
 
-        fn accept(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
-            Ok(())
-        }
+        impl Transport for MockTransport {
+            fn dial(
+                &mut self,
+                _connection_id: ConnectionId,
+                _address: Multiaddr,
+            ) -> crate::Result<()> {
+                Ok(())
+            }
 
-        fn accept_pending(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
-            Ok(())
-        }
+            fn accept(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
+                Ok(())
+            }
 
-        fn reject_pending(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
-            Ok(())
-        }
+            fn accept_pending(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
+                Ok(())
+            }
 
-        fn reject(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
-            Ok(())
-        }
+            fn reject_pending(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
+                Ok(())
+            }
 
-        fn open(
-            &mut self,
-            _connection_id: ConnectionId,
-            _addresses: Vec<Multiaddr>,
-        ) -> crate::Result<()> {
-            Ok(())
-        }
+            fn reject(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
+                Ok(())
+            }
 
-        fn negotiate(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
-            Ok(())
-        }
+            fn open(
+                &mut self,
+                _connection_id: ConnectionId,
+                _addresses: Vec<Multiaddr>,
+            ) -> crate::Result<()> {
+                Ok(())
+            }
 
-        fn cancel(&mut self, _connection_id: ConnectionId) {}
-    }
+            fn negotiate(&mut self, _connection_id: ConnectionId) -> crate::Result<()> {
+                Ok(())
+            }
 
-    #[cfg(feature = "websocket")]
-    impl Stream for MockTransport {
-        type Item = TransportEvent;
-        fn poll_next(mut self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<Option<Self::Item>> {
-            self.rx.poll_recv(cx)
+            fn cancel(&mut self, _connection_id: ConnectionId) {}
+        }
+
+        impl Stream for MockTransport {
+            type Item = TransportEvent;
+            fn poll_next(
+                mut self: Pin<&mut Self>,
+                cx: &mut Context<'_>,
+            ) -> Poll<Option<Self::Item>> {
+                self.rx.poll_recv(cx)
+            }
         }
-    }
 
-    #[tokio::test]
-    #[cfg(feature = "websocket")]
-    #[cfg(feature = "quic")]
-    async fn transport_events() {
         let mut transports = TransportContext::new();
 
         let (tx_tcp, rx) = tokio::sync::mpsc::channel(8);

src/transport/tcp/connection.rs

@@ -123,6 +123,15 @@ pub struct NegotiatedConnection {
     substream_open_timeout: Duration,
 }
 
+impl std::fmt::Debug for NegotiatedConnection {
+    fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
+        f.debug_struct("NegotiatedConnection")
+            .field("peer", &self.peer)
+            .field("endpoint", &self.endpoint)
+            .finish()
+    }
+}
+
 impl NegotiatedConnection {
     /// Get `ConnectionId` of the negotiated connection.
     pub fn connection_id(&self) -> ConnectionId {