chore: fmt

n0-computer · Jun 29, 2023 · ff41242 · ff41242
1 parent 6d83ceb
commit ff41242
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 10 deletions.
diff --git a/iroh-net/src/hp/magicsock/conn.rs b/iroh-net/src/hp/magicsock/conn.rs
@@ -2442,12 +2442,11 @@ pub(crate) mod tests {
 
     use super::*;
     use crate::{
-        MagicEndpoint,
         hp::{
             derp::{DerpNode, DerpRegion, UseIpv4, UseIpv6},
             stun,
         },
-        tls,
+        tls, MagicEndpoint,
     };
 
     fn make_transmit(destination: SocketAddr) -> quinn_udp::Transmit {

diff --git a/iroh-net/src/lib.rs b/iroh-net/src/lib.rs
@@ -1,8 +1,8 @@
 #![recursion_limit = "256"]
 
 pub mod defaults;
-pub mod magic_endpoint;
 pub mod hp;
+pub mod magic_endpoint;
 pub mod net;
 pub mod tls;
 pub mod util;

diff --git a/iroh-net/src/magic_endpoint.rs b/iroh-net/src/magic_endpoint.rs
@@ -266,9 +266,7 @@ impl MagicEndpoint {
         alpn: &[u8],
         known_addrs: &[SocketAddr],
     ) -> anyhow::Result<quinn::Connection> {
-        if !known_addrs.is_empty() {
-            self.add_known_addrs(peer_id, known_addrs).await?;
-        }
+        self.add_known_addrs(peer_id, known_addrs).await?;
 
         let node_key: hp::key::node::PublicKey = peer_id.into();
         let addr = self
@@ -336,6 +334,7 @@ impl MagicEndpoint {
             netmap.peers.push(peer);
             netmap.clone()
         };
+
         self.conn.set_network_map(netmap).await?;
         Ok(())
     }

diff --git a/iroh/src/commands.rs b/iroh/src/commands.rs
@@ -254,7 +254,8 @@ pub fn create_quinn_client(
     keylog: bool,
 ) -> Result<quinn::Endpoint> {
     let keypair = iroh_net::tls::Keypair::generate();
-    let tls_client_config = iroh_net::tls::make_client_config(&keypair, None, alpn_protocols, keylog)?;
+    let tls_client_config =
+        iroh_net::tls::make_client_config(&keypair, None, alpn_protocols, keylog)?;
     let mut client_config = quinn::ClientConfig::new(Arc::new(tls_client_config));
     let mut endpoint = quinn::Endpoint::client(bind_addr)?;
     let mut transport_config = quinn::TransportConfig::default();

diff --git a/iroh/src/commands/doctor.rs b/iroh/src/commands/doctor.rs
@@ -12,13 +12,13 @@ use clap::Subcommand;
 use indicatif::{HumanBytes, MultiProgress, ProgressBar};
 use iroh_bytes::tokio_util::ProgressWriter;
 use iroh_net::{
-    MagicEndpoint,
     hp::{
         self,
         derp::{DerpMap, UseIpv4, UseIpv6},
         key::node::SecretKey,
     },
     tls::{Keypair, PeerId, PublicKey},
+    MagicEndpoint,
 };
 use postcard::experimental::max_size::MaxSize;
 use serde::{Deserialize, Serialize};

diff --git a/iroh/src/node.rs b/iroh/src/node.rs
@@ -26,9 +26,9 @@ use iroh_bytes::{
     util::{Hash, Progress},
 };
 use iroh_net::{
-    MagicEndpoint,
     hp::{cfg::Endpoint, derp::DerpMap},
     tls::{self, Keypair, PeerId},
+    MagicEndpoint,
 };
 use quic_rpc::server::RpcChannel;
 use quic_rpc::transport::flume::FlumeConnection;

diff --git a/iroh/tests/provide.rs b/iroh/tests/provide.rs
@@ -583,7 +583,8 @@ async fn test_run_fsm() {
     let addrs = node.local_endpoint_addresses().await.unwrap();
     let peer_id = node.peer_id();
     tokio::time::timeout(Duration::from_secs(10), async move {
-        let connection = MagicEndpoint::dial_peer(peer_id, &iroh_bytes::P2P_ALPN, &addrs, None, true).await?;
+        let connection =
+            MagicEndpoint::dial_peer(peer_id, &iroh_bytes::P2P_ALPN, &addrs, None, true).await?;
         let request = GetRequest::all(hash).into();
         let stream = get::run_connection(connection, request);
         let (collection, children, _) = aggregate_get_response(stream).await?;