cleanup

iroh-base/src/lib.rs

@@ -1,17 +1,38 @@
 //! Base types and utilities for Iroh
 #![cfg_attr(iroh_docsrs, feature(doc_auto_cfg))]
 
+// TODO: remove
 #[cfg(feature = "base32")]
 pub mod base32;
+
+// TODO: move to own crate
+#[cfg(feature = "ticket")]
+pub mod ticket;
+
 #[cfg(feature = "hash")]
-pub mod hash;
+mod hash;
 #[cfg(feature = "key")]
-pub mod key;
+mod key;
 #[cfg(feature = "key")]
-pub mod node_addr;
+mod node_addr;
 #[cfg(feature = "relay")]
-pub mod relay_map;
+mod relay_map;
 #[cfg(feature = "relay")]
 mod relay_url;
-#[cfg(feature = "ticket")]
-pub mod ticket;
+
+#[cfg(feature = "relay")]
+pub use self::relay_map::{
+    QuicConfig as RelayQuicConfig, RelayMap, RelayNode, DEFAULT_RELAY_QUIC_PORT, DEFAULT_STUN_PORT,
+};
+#[cfg(feature = "relay")]
+pub use self::relay_url::RelayUrl;
+
+#[cfg(feature = "hash")]
+pub use self::hash::{BlobFormat, Hash, HashAndFormat};
+
+#[cfg(feature = "key")]
+pub use self::key::{
+    KeyParsingError, NodeId, PublicKey, SecretKey, SharedSecret, Signature, PUBLIC_KEY_LENGTH,
+};
+#[cfg(feature = "key")]
+pub use self::node_addr::NodeAddr;