improve naming

Author: Frando

iroh-net/src/conn_manager.rs

@@ -369,7 +369,7 @@ mod tests {
     use futures_lite::StreamExt;
     use tokio::task::JoinSet;
 
-    use crate::test_utils::TestEndpointFactory;
+    use crate::test_utils::TestEndpointBuilder;
 
     use super::{ConnManager, HandleConnectionSender};
 
@@ -390,16 +390,16 @@ mod tests {
     #[tokio::test]
     async fn test_conn_manager() -> anyhow::Result<()> {
         let _guard = iroh_test::logging::setup();
-        let mut factory = TestEndpointFactory::run().await?;
+        let mut builder = TestEndpointBuilder::run().await?;
 
         let alpns = vec![TEST_ALPN.to_vec()];
-        let ep1 = factory.create_endpoint(alpns.clone()).await?;
-        let ep2 = factory.create_endpoint(alpns.clone()).await?;
+        let ep1 = builder.create_endpoint(alpns.clone()).await?;
+        let ep2 = builder.create_endpoint(alpns.clone()).await?;
         let n1 = ep1.node_id();
         let n2 = ep2.node_id();
         tracing::info!(?n1, ?n2, "endpoints created");
-        factory.on_node(&n1, Duration::from_secs(2)).await?;
-        factory.on_node(&n2, Duration::from_secs(2)).await?;
+        builder.on_node(&n1, Duration::from_secs(2)).await?;
+        builder.on_node(&n2, Duration::from_secs(2)).await?;
 
         let mut conn_manager1 = ConnManager::new(ep1.clone(), TEST_ALPN);
         let mut conn_manager2 = ConnManager::new(ep2.clone(), TEST_ALPN);

iroh-net/src/test_utils.rs

@@ -70,21 +70,20 @@ pub async fn run_relay_server() -> Result<(RelayMap, RelayUrl, CleanupDropGuard)
     Ok((m, url, CleanupDropGuard(tx)))
 }
 
-/// A factory for endpoints with preconfigured local discovery and relays.
+/// A builder for endpoints with preconfigured local discovery and relays.
 #[derive(Debug)]
-pub struct TestEndpointFactory {
+pub struct TestEndpointBuilder {
     relay_map: RelayMap,
     relay_url: RelayUrl,
     _relay_drop_guard: CleanupDropGuard,
     dns_pkarr_server: DnsPkarrServer,
     rng: rand_chacha::ChaCha12Rng,
 }
 
-impl TestEndpointFactory {
-    /// Starts local relay and discovery servers and returns a [`TestEndpointFactory`] to create
-    /// readily configured endpoints.
+impl TestEndpointBuilder {
+    /// Starts local relay and discovery servers and returns a builder to create readily configured endpoints.
     ///
-    /// The local servers will shut down once the [`TestEndpointFactory`] is dropped.
+    /// The local relay, DNS and pkarr servers will shut down once the [`TestEndpointBuilder`] is dropped.
     pub async fn run() -> anyhow::Result<Self> {
         let dns_pkarr_server = DnsPkarrServer::run().await?;
         let (relay_map, relay_url, relay_drop_guard) = run_relay_server().await?;