Remove the config module, the types belong in magicsock

This changes the public api because for some reason config was public.
n0-computer · Jun 17, 2024 · 23bc378 · 23bc378
1 parent 1390884
commit 23bc378
Show file tree

Hide file tree

Showing 5 changed files with 146 additions and 191 deletions.
diff --git a/iroh-gossip/src/net.rs b/iroh-gossip/src/net.rs
@@ -70,7 +70,7 @@ type ProtoMessage = proto::Message<PublicKey>;
 #[derive(Debug, Clone)]
 pub struct Gossip {
     to_actor_tx: mpsc::Sender<ToActor>,
-    on_endpoints_tx: mpsc::Sender<Vec<iroh_net::config::DirectAddress>>,
+    on_endpoints_tx: mpsc::Sender<Vec<iroh_net::endpoint::DirectAddress>>,
     _actor_handle: Arc<JoinHandle<anyhow::Result<()>>>,
     max_message_size: usize,
 }
@@ -249,7 +249,7 @@ impl Gossip {
     /// This is only best effort, and will drop new events if backed up.
     pub fn update_endpoints(
         &self,
-        endpoints: &[iroh_net::config::DirectAddress],
+        endpoints: &[iroh_net::endpoint::DirectAddress],
     ) -> anyhow::Result<()> {
         let endpoints = endpoints.to_vec();
         self.on_endpoints_tx
@@ -345,7 +345,7 @@ struct Actor {
     /// Input events to the state (emitted from the connection loops)
     in_event_rx: mpsc::Receiver<InEvent>,
     /// Updates of discovered endpoint addresses
-    on_endpoints_rx: mpsc::Receiver<Vec<iroh_net::config::DirectAddress>>,
+    on_endpoints_rx: mpsc::Receiver<Vec<iroh_net::endpoint::DirectAddress>>,
     /// Queued timers
     timers: Timers<Timer>,
     /// Currently opened quinn connections to peers

diff --git a/iroh-net/src/config.rs b/iroh-net/src/config.rs
diff --git a/iroh-net/src/endpoint.rs b/iroh-net/src/endpoint.rs
@@ -48,7 +48,7 @@ pub use quinn::{
 
 pub use super::magicsock::{
     ConnectionInfo, ConnectionType, ConnectionTypeStream, ControlMsg, DirectAddrInfo,
-    DirectAdressesStream,
+    DirectAddress, DirectAddressType, DirectAdressesStream,
 };
 
 pub use iroh_base::node_addr::{AddrInfo, NodeAddr};

diff --git a/iroh-net/src/lib.rs b/iroh-net/src/lib.rs
@@ -117,7 +117,6 @@
 #![recursion_limit = "256"]
 #![deny(missing_docs, rustdoc::broken_intra_doc_links)]
 
-pub mod config;
 pub mod defaults;
 pub mod dialer;
 mod disco;