Merge branch 'transport-redesign' into implement-autonat-v2

umgefahren · Apr 30, 2024 · 480337e · 480337e
2 parents e640920 + 0d5dcba
commit 480337e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 30 deletions.
diff --git a/swarm/src/lib.rs b/swarm/src/lib.rs
@@ -597,9 +597,7 @@ where
         }
 
         self.behaviour
-            .on_swarm_event(FromSwarm::NewListener(behaviour::NewListener {
-                listener_id,
-            }));
+            .on_swarm_event(FromSwarm::NewListener(behaviour::NewListener { listener_id }));
 
         Ok(())
     }
@@ -610,9 +608,7 @@ where
     /// The address is broadcast to all [`NetworkBehaviour`]s via [`FromSwarm::ExternalAddrConfirmed`].
     pub fn add_external_address(&mut self, a: Multiaddr) {
         self.behaviour
-            .on_swarm_event(FromSwarm::ExternalAddrConfirmed(ExternalAddrConfirmed {
-                addr: &a,
-            }));
+            .on_swarm_event(FromSwarm::ExternalAddrConfirmed(ExternalAddrConfirmed { addr: &a }));
         self.confirmed_external_addr.insert(a);
     }
 
@@ -1059,9 +1055,9 @@ where
                 );
                 let addrs = self.listened_addrs.remove(&listener_id).unwrap_or_default();
                 for addr in addrs.iter() {
-                    self.behaviour.on_swarm_event(FromSwarm::ExpiredListenAddr(
-                        ExpiredListenAddr { listener_id, addr },
-                    ));
+                    self.behaviour.on_swarm_event(
+                        FromSwarm::ExpiredListenAddr(ExpiredListenAddr { listener_id, addr })
+                    );
                 }
                 self.behaviour
                     .on_swarm_event(FromSwarm::ListenerClosed(ListenerClosed {
@@ -2155,9 +2151,9 @@ mod tests {
             {}
 
             match swarm2.poll_next_unpin(cx) {
-                Poll::Ready(Some(SwarmEvent::OutgoingConnectionError {
-                    peer_id, error, ..
-                })) => Poll::Ready((peer_id, error)),
+                Poll::Ready(Some(SwarmEvent::OutgoingConnectionError { peer_id, error, .. })) => {
+                    Poll::Ready((peer_id, error))
+                }
                 Poll::Ready(x) => panic!("unexpected {x:?}"),
                 Poll::Pending => Poll::Pending,
             }
@@ -2223,9 +2219,7 @@ mod tests {
                             return Poll::Ready(Ok(()));
                         }
                     }
-                    Poll::Ready(Some(SwarmEvent::IncomingConnectionError {
-                        local_addr, ..
-                    })) => {
+                    Poll::Ready(Some(SwarmEvent::IncomingConnectionError { local_addr, .. })) => {
                         assert!(!got_inc_err);
                         assert_eq!(local_addr, local_address);
                         got_inc_err = true;
@@ -2346,10 +2340,9 @@ mod tests {
         // This constitutes a fairly typical error for chained transports.
         let error = DialError::Transport(vec![(
             "/ip4/127.0.0.1/tcp/80".parse().unwrap(),
-            TransportError::Other(io::Error::new(
-                io::ErrorKind::Other,
-                MemoryTransportError::Unreachable,
-            )),
+            TransportError::Other(
+                io::Error::new(io::ErrorKind::Other, MemoryTransportError::Unreachable)
+            ),
         )]);
 
         let string = format!("{error}");

diff --git a/transports/tcp/src/lib.rs b/transports/tcp/src/lib.rs
@@ -802,9 +802,7 @@ mod tests {
                     .unwrap()
             ),
             Ok(SocketAddr::new(
-                IpAddr::V6(Ipv6Addr::new(
-                    65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535,
-                )),
+                IpAddr::V6(Ipv6Addr::new(65535, 65535, 65535, 65535, 65535, 65535, 65535, 65535,)),
                 8080,
             ))
         );
@@ -1092,6 +1090,7 @@ mod tests {
 
     #[test]
     fn port_reuse_listening() {
+        env_logger::try_init().ok();
         let _ = tracing_subscriber::fmt()
             .with_env_filter(tracing_subscriber::EnvFilter::from_default_env())
             .try_init();
@@ -1276,10 +1275,11 @@ mod tests {
 
         #[cfg(feature = "tokio")]
         {
-            let rt = ::tokio::runtime::Builder::new_current_thread()
-                .enable_io()
-                .build()
-                .unwrap();
+            let rt =
+                ::tokio::runtime::Builder::new_current_thread()
+                    .enable_io()
+                    .build()
+                    .unwrap();
             assert!(rt.block_on(cycle_listeners::<tokio::Tcp>()));
         }
     }
@@ -1312,10 +1312,11 @@ mod tests {
         }
         #[cfg(feature = "tokio")]
         {
-            let rt = ::tokio::runtime::Builder::new_current_thread()
-                .enable_io()
-                .build()
-                .unwrap();
+            let rt =
+                ::tokio::runtime::Builder::new_current_thread()
+                    .enable_io()
+                    .build()
+                    .unwrap();
             rt.block_on(async {
                 test::<tokio::Tcp>();
             });