attempt to remove iroh-relay feature flag usage

n0-computer · Nov 11, 2024 · b82ccb9 · b82ccb9
1 parent 28c7a0d
commit b82ccb9
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/iroh-net/bench/Cargo.toml b/iroh-net/bench/Cargo.toml
@@ -20,7 +20,6 @@ tracing = "0.1"
 tracing-subscriber = { version = "0.3.0", default-features = false, features = ["env-filter", "fmt", "ansi", "time", "local-time"] }
 socket2 = "0.5"
 futures-lite = "2.3.0"
-iroh-relay = { path = "../../iroh-relay", features = ["metrics"] }
 
 [features]
 default = ["local-relay"]

diff --git a/iroh-net/bench/src/bin/bulk.rs b/iroh-net/bench/src/bin/bulk.rs
@@ -40,7 +40,7 @@ pub fn run_iroh(opt: Opt) -> Result<()> {
             metrics.insert(iroh_net::metrics::PortmapMetrics::new(reg));
             #[cfg(feature = "local-relay")]
             if opt.with_relay {
-                metrics.insert(iroh_relay::server::Metrics::new(reg));
+                metrics.insert(iroh_net::metrics::RelayMetrics::new(reg));
             }
         })?;
     }

diff --git a/iroh-net/src/metrics.rs b/iroh-net/src/metrics.rs
@@ -1,6 +1,6 @@
 //! Co-locating all of the iroh-net metrics structs
-#[cfg(feature = "iroh-relay")]
-#[cfg_attr(iroh_docsrs, doc(cfg(feature = "iroh-relay")))]
+#[cfg(feature = "test-utils")]
+#[cfg_attr(iroh_docsrs, doc(cfg(feature = "test-utils")))]
 pub use iroh_relay::server::Metrics as RelayMetrics;
 pub use portmapper::Metrics as PortmapMetrics;