revert me: add test urls

n0-computer · Apr 9, 2024 · c575237 · c575237
1 parent cb26b0a
commit c575237
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 4 deletions.
diff --git a/iroh-cli/src/config.rs b/iroh-cli/src/config.rs
@@ -12,7 +12,7 @@ use std::{
 use anyhow::{anyhow, bail, ensure, Context, Result};
 use config::{Environment, File, Value};
 use iroh::net::{
-    defaults::{default_eu_relay_node, default_na_relay_node},
+    defaults::{default_eu_relay_node, default_na_relay_node, default_test_relay_node},
     relay::{RelayMap, RelayNode},
 };
 use iroh::node::GcPolicy;
@@ -97,7 +97,11 @@ impl Default for NodeConfig {
     fn default() -> Self {
         Self {
             // TODO(ramfox): this should probably just be a relay map
-            relay_nodes: [default_na_relay_node(), default_eu_relay_node()].into(),
+            relay_nodes: [
+                /*default_na_relay_node(), default_eu_relay_node(), */
+                default_test_relay_node(),
+            ]
+            .into(),
             gc_policy: GcPolicy::Disabled,
             metrics_addr: Some(([127, 0, 0, 1], 9090).into()),
         }

diff --git a/iroh-net/src/defaults.rs b/iroh-net/src/defaults.rs
@@ -8,14 +8,20 @@ use crate::relay::{RelayMap, RelayNode};
 pub const NA_RELAY_HOSTNAME: &str = "use1-1.derp.iroh.network.";
 /// Hostname of the default EU relay.
 pub const EU_RELAY_HOSTNAME: &str = "euw1-1.derp.iroh.network.";
+/// Hostname of the default test relay.
+pub const TEST_RELAY_HOSTNAME: &str = "test-2.derp.iroh.network.";
 
 /// STUN port as defined by [RFC 8489](<https://www.rfc-editor.org/rfc/rfc8489#section-18.6>)
 pub const DEFAULT_RELAY_STUN_PORT: u16 = 3478;
 
 /// Get the default [`RelayMap`].
 pub fn default_relay_map() -> RelayMap {
-    RelayMap::from_nodes([default_na_relay_node(), default_eu_relay_node()])
-        .expect("default nodes invalid")
+    RelayMap::from_nodes([
+        default_na_relay_node(),
+        default_eu_relay_node(),
+        default_test_relay_node(),
+    ])
+    .expect("default nodes invalid")
 }
 
 /// Get the default [`RelayNode`] for NA.
@@ -31,6 +37,19 @@ pub fn default_na_relay_node() -> RelayNode {
     }
 }
 
+/// Get the default [`RelayNode`] for NA.
+pub fn default_test_relay_node() -> RelayNode {
+    // The default NA relay server run by number0.
+    let url: Url = format!("https://{TEST_RELAY_HOSTNAME}")
+        .parse()
+        .expect("default url");
+    RelayNode {
+        url: url.into(),
+        stun_only: false,
+        stun_port: DEFAULT_RELAY_STUN_PORT,
+    }
+}
+
 /// Get the default [`RelayNode`] for EU.
 pub fn default_eu_relay_node() -> RelayNode {
     // The default EU relay server run by number0.