diff --git a/crates/radicle-cli/examples/rad-config.md b/crates/radicle-cli/examples/rad-config.md index 22af5685..3800e898 100644 --- a/crates/radicle-cli/examples/rad-config.md +++ b/crates/radicle-cli/examples/rad-config.md @@ -6,8 +6,7 @@ $ rad config { "publicExplorer": "https://app.radicle.xyz/nodes/$host/$rid$path", "preferredSeeds": [ - "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776", - "z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776" + "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776" ], "web": { "pinned": { @@ -65,7 +64,6 @@ $ rad config get node.alias alice $ rad config get preferredSeeds z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776 -z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776 $ rad config get node.limits.routingMaxSize 1000 ``` diff --git a/crates/radicle-cli/tests/commands.rs b/crates/radicle-cli/tests/commands.rs index 548414d0..dceb2203 100644 --- a/crates/radicle-cli/tests/commands.rs +++ b/crates/radicle-cli/tests/commands.rs @@ -5,7 +5,7 @@ use std::{net, thread, time}; use radicle::git; use radicle::node; use radicle::node::address::Store as _; -use radicle::node::config::seeds::{RADICLE_NODE_BOOTSTRAP_IRIS, RADICLE_NODE_TEAM}; +use radicle::node::config::seeds::RADICLE_NODE_BOOTSTRAP_IRIS; use radicle::node::config::DefaultSeedingPolicy; use radicle::node::routing::Store as _; use radicle::node::Handle as _; @@ -414,10 +414,7 @@ fn rad_config() { let mut environment = Environment::new(); let alias = Alias::new("alice"); let profile = environment.profile(profile::Config { - preferred_seeds: vec![ - RADICLE_NODE_BOOTSTRAP_IRIS.clone(), - RADICLE_NODE_TEAM.clone(), - ], + preferred_seeds: vec![RADICLE_NODE_BOOTSTRAP_IRIS.clone()], ..profile::Config::new(alias) }); let working = tempfile::tempdir().unwrap(); diff --git a/crates/radicle-node/src/service/limiter.rs b/crates/radicle-node/src/service/limiter.rs index f9185434..156fe30f 100644 --- a/crates/radicle-node/src/service/limiter.rs +++ b/crates/radicle-node/src/service/limiter.rs @@ -138,7 +138,7 @@ mod test { fn test_limitter_refill() { let mut r = RateLimiter::default(); let t = (3, 0.2); // Three tokens burst. One token every 5 seconds. - let a = HostName::Dns(String::from("seed.radicle.xyz")); + let a = HostName::Dns(String::from("seed.radicle.example.com")); let n = arbitrary::gen::(1); let n = Some(&n); @@ -172,8 +172,8 @@ mod test { let n = arbitrary::gen::(1); let n = Some(&n); let mut r = RateLimiter::default(); - let addr1 = HostName::Dns(String::from("seed.radicle.xyz")); - let addr2 = HostName::Dns(String::from("seed.radicle.net")); + let addr1 = HostName::Dns(String::from("seed.radicle.example.com")); + let addr2 = HostName::Dns(String::from("seed.radicle.example.net")); assert_eq!(r.limit(addr1.clone(), n, &t, LocalTime::from_secs(0)), false); assert_eq!(r.limit(addr1.clone(), n, &t, LocalTime::from_secs(0)), true); @@ -193,8 +193,8 @@ mod test { let n = arbitrary::gen::(1); let n = Some(&n); let mut r = RateLimiter::default(); - let addr1 = HostName::Dns(String::from("seed.radicle.xyz")); - let addr2 = HostName::Dns(String::from("seed.radicle.net")); + let addr1 = HostName::Dns(String::from("seed.radicle.example.com")); + let addr2 = HostName::Dns(String::from("seed.radicle.example.net")); assert_eq!(r.limit(addr1.clone(), n, &t1, LocalTime::from_secs(0)), false); assert_eq!(r.limit(addr1.clone(), n, &t1, LocalTime::from_secs(0)), true); diff --git a/crates/radicle/src/node.rs b/crates/radicle/src/node.rs index 62ebc83c..3bf4d03c 100644 --- a/crates/radicle/src/node.rs +++ b/crates/radicle/src/node.rs @@ -1640,7 +1640,7 @@ mod test { ); assert_matches!( json::from_str::>( - r#"[{"nid":"z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz","addrs":[{"addr":"seed.radicle.xyz:8776","source":"peer","lastSuccess":1699983994234,"lastAttempt":1699983994000,"banned":false}],"state":{"connected":{"since":1699983994,"fetching":[]}}}]"# + r#"[{"nid":"z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz","addrs":[{"addr":"seed.radicle.example.com:8776","source":"peer","lastSuccess":1699983994234,"lastAttempt":1699983994000,"banned":false}],"state":{"connected":{"since":1699983994,"fetching":[]}}}]"# ), Ok(CommandResult::Okay(_)) ); diff --git a/crates/radicle/src/node/config.rs b/crates/radicle/src/node/config.rs index 0d13b508..74f9fd54 100644 --- a/crates/radicle/src/node/config.rs +++ b/crates/radicle/src/node/config.rs @@ -42,15 +42,6 @@ pub mod seeds { .unwrap() .into() }); - - /// The Radicle seed node that the Radicle team uses. - pub static RADICLE_NODE_TEAM: LazyLock = LazyLock::new(|| { - // SAFETY: `ConnectAddress` is known at compile time. - #[allow(clippy::unwrap_used)] - PeerAddr::from_str("z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776") - .unwrap() - .into() - }); } /// Peer-to-peer network. @@ -67,13 +58,10 @@ impl Network { /// Bootstrap nodes for this network. pub fn bootstrap(&self) -> Vec<(Alias, ProtocolVersion, ConnectAddress)> { match self { - Self::Main => [ - ( - "iris.radicle.xyz", - seeds::RADICLE_NODE_BOOTSTRAP_IRIS.clone(), - ), - ("seed.radicle.xyz", seeds::RADICLE_NODE_TEAM.clone()), - ] + Self::Main => [( + "iris.radicle.xyz", + seeds::RADICLE_NODE_BOOTSTRAP_IRIS.clone(), + )] .into_iter() .map(|(a, s)| (Alias::new(a), 1, s)) .collect(), diff --git a/crates/radicle/src/profile.rs b/crates/radicle/src/profile.rs index 64866f30..0ca516ab 100644 --- a/crates/radicle/src/profile.rs +++ b/crates/radicle/src/profile.rs @@ -724,14 +724,14 @@ mod test { }, "cli": { "hints": true }, "node": { - "alias": "seed.radicle.xyz", + "alias": "seed.radicle.example.com", "listen": [], "peers": { "type": "dynamic", "target": 8 }, "connect": [ "z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo@rosa.radicle.xyz:8776", "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776" ], - "externalAddresses": [ "seed.radicle.xyz:8776" ], + "externalAddresses": [ "seed.radicle.example.com:8776" ], "db": { "journalMode": "wal" }, "network": "main", "log": "INFO", diff --git a/crates/radicle/src/test/arbitrary.rs b/crates/radicle/src/test/arbitrary.rs index 951e3e39..51bd71d2 100644 --- a/crates/radicle/src/test/arbitrary.rs +++ b/crates/radicle/src/test/arbitrary.rs @@ -279,7 +279,7 @@ impl Arbitrary for Address { cyphernet::addr::HostName::Ip(net::IpAddr::V6(net::Ipv6Addr::from(octets))) } AddressType::Dns => cyphernet::addr::HostName::Dns( - g.choose(&["seed.radicle.xyz", "iris.radicle.xyz", "rosa.radicle.xyz"]) + g.choose(&["iris.radicle.xyz", "rosa.radicle.xyz"]) .unwrap() .to_string(), ),