From 2671375cc48d501cffa56ada68012d2b1556a30e Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Mon, 10 Jul 2023 10:47:31 +0900
Subject: [PATCH] fix(core/choice): log on dial and fix listen log

- Fixes typo in `<OrTransport as Transport>::listen_on` using the word "dial" instead of "listen_on".
- Adds logging to `<OrTransport as Transport>::dial`.

Follow-up to https://github.com/libp2p/rust-libp2p/pull/4133

Pull-Request: #4164.
---
 core/src/transport/choice.rs | 36 ++++++++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/core/src/transport/choice.rs b/core/src/transport/choice.rs
index d97de03d..8d3bfdec 100644
--- a/core/src/transport/choice.rs
+++ b/core/src/transport/choice.rs
@@ -53,14 +53,14 @@ where
         addr: Multiaddr,
     ) -> Result<(), TransportError<Self::Error>> {
         trace!(
-            "Attempting to dial {} using {}",
+            "Attempting to listen on {} using {}",
             addr,
             std::any::type_name::<A>()
         );
         let addr = match self.0.listen_on(id, addr) {
             Err(TransportError::MultiaddrNotSupported(addr)) => {
                 debug!(
-                    "Failed to dial {} using {}",
+                    "Failed to listen on {} using {}",
                     addr,
                     std::any::type_name::<A>()
                 );
@@ -70,14 +70,14 @@ where
         };
 
         trace!(
-            "Attempting to dial {} using {}",
+            "Attempting to listen on {} using {}",
             addr,
             std::any::type_name::<B>()
         );
         let addr = match self.1.listen_on(id, addr) {
             Err(TransportError::MultiaddrNotSupported(addr)) => {
                 debug!(
-                    "Failed to dial {} using {}",
+                    "Failed to listen on {} using {}",
                     addr,
                     std::any::type_name::<B>()
                 );
@@ -94,17 +94,41 @@ where
     }
 
     fn dial(&mut self, addr: Multiaddr) -> Result<Self::Dial, TransportError<Self::Error>> {
+        trace!(
+            "Attempting to dial {} using {}",
+            addr,
+            std::any::type_name::<A>()
+        );
         let addr = match self.0.dial(addr) {
             Ok(connec) => return Ok(EitherFuture::First(connec)),
-            Err(TransportError::MultiaddrNotSupported(addr)) => addr,
+            Err(TransportError::MultiaddrNotSupported(addr)) => {
+                debug!(
+                    "Failed to dial {} using {}",
+                    addr,
+                    std::any::type_name::<A>()
+                );
+                addr
+            }
             Err(TransportError::Other(err)) => {
                 return Err(TransportError::Other(Either::Left(err)))
             }
         };
 
+        trace!(
+            "Attempting to dial {} using {}",
+            addr,
+            std::any::type_name::<A>()
+        );
         let addr = match self.1.dial(addr) {
             Ok(connec) => return Ok(EitherFuture::Second(connec)),
-            Err(TransportError::MultiaddrNotSupported(addr)) => addr,
+            Err(TransportError::MultiaddrNotSupported(addr)) => {
+                debug!(
+                    "Failed to dial {} using {}",
+                    addr,
+                    std::any::type_name::<A>()
+                );
+                addr
+            }
             Err(TransportError::Other(err)) => {
                 return Err(TransportError::Other(Either::Right(err)))
             }