mab122
/
radicle-heartwood-lfs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: Remove `seed.radicle.xyz` 

The team node is not really special, remove occurrences.
This commit is contained in:
Lorenz Leutgeb 2025-06-13 09:40:01 +02:00
parent e30e66e009
commit a354686bbc
7 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
crates/radicle-cli/examples/rad-config.md
View File

@ -6,8 +6,7 @@ $ rad config
{ {
"publicExplorer": "https://app.radicle.xyz/nodes/$host/$rid$path", "publicExplorer": "https://app.radicle.xyz/nodes/$host/$rid$path",
"preferredSeeds": [ "preferredSeeds": [
"z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776", "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776"
"z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776"
], ],
"web": { "web": {
"pinned": { "pinned": {
@ -65,7 +64,6 @@ $ rad config get node.alias
alice alice
$ rad config get preferredSeeds $ rad config get preferredSeeds
z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776 z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776
z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776
$ rad config get node.limits.routingMaxSize $ rad config get node.limits.routingMaxSize
1000 1000
``` ```

7
crates/radicle-cli/tests/commands.rs
View File

@ -5,7 +5,7 @@ use std::{net, thread, time};
use radicle::git; use radicle::git;
use radicle::node; use radicle::node;
use radicle::node::address::Store as _; 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::config::DefaultSeedingPolicy;
use radicle::node::routing::Store as _; use radicle::node::routing::Store as _;
use radicle::node::Handle as _; use radicle::node::Handle as _;
@ -414,10 +414,7 @@ fn rad_config() {
let mut environment = Environment::new(); let mut environment = Environment::new();
let alias = Alias::new("alice"); let alias = Alias::new("alice");
let profile = environment.profile(profile::Config { let profile = environment.profile(profile::Config {
preferred_seeds: vec![ preferred_seeds: vec![RADICLE_NODE_BOOTSTRAP_IRIS.clone()],
RADICLE_NODE_BOOTSTRAP_IRIS.clone(),
RADICLE_NODE_TEAM.clone(),
],
..profile::Config::new(alias) ..profile::Config::new(alias)
}); });
let working = tempfile::tempdir().unwrap(); let working = tempfile::tempdir().unwrap();

10
crates/radicle-node/src/service/limiter.rs
View File

@ -138,7 +138,7 @@ mod test {
fn test_limitter_refill() { fn test_limitter_refill() {
let mut r = RateLimiter::default(); let mut r = RateLimiter::default();
let t = (3, 0.2); // Three tokens burst. One token every 5 seconds. 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::<NodeId>(1); let n = arbitrary::gen::<NodeId>(1);
let n = Some(&n); let n = Some(&n);
@ -172,8 +172,8 @@ mod test {
let n = arbitrary::gen::<NodeId>(1); let n = arbitrary::gen::<NodeId>(1);
let n = Some(&n); let n = Some(&n);
let mut r = RateLimiter::default(); let mut r = RateLimiter::default();
let addr1 = HostName::Dns(String::from("seed.radicle.xyz")); let addr1 = HostName::Dns(String::from("seed.radicle.example.com"));
let addr2 = HostName::Dns(String::from("seed.radicle.net")); 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)), false);
assert_eq!(r.limit(addr1.clone(), n, &t, LocalTime::from_secs(0)), true); assert_eq!(r.limit(addr1.clone(), n, &t, LocalTime::from_secs(0)), true);
@ -193,8 +193,8 @@ mod test {
let n = arbitrary::gen::<NodeId>(1); let n = arbitrary::gen::<NodeId>(1);
let n = Some(&n); let n = Some(&n);
let mut r = RateLimiter::default(); let mut r = RateLimiter::default();
let addr1 = HostName::Dns(String::from("seed.radicle.xyz")); let addr1 = HostName::Dns(String::from("seed.radicle.example.com"));
let addr2 = HostName::Dns(String::from("seed.radicle.net")); 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)), false);
assert_eq!(r.limit(addr1.clone(), n, &t1, LocalTime::from_secs(0)), true); assert_eq!(r.limit(addr1.clone(), n, &t1, LocalTime::from_secs(0)), true);

2
crates/radicle/src/node.rs
View File

@ -1640,7 +1640,7 @@ mod test {
); );
assert_matches!( assert_matches!(
json::from_str::<CommandResult<Seeds>>( json::from_str::<CommandResult<Seeds>>(
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(_)) Ok(CommandResult::Okay(_))
); );

20
crates/radicle/src/node/config.rs
View File

@ -42,15 +42,6 @@ pub mod seeds {
.unwrap() .unwrap()
.into() .into()
}); });
/// The Radicle seed node that the Radicle team uses.
pub static RADICLE_NODE_TEAM: LazyLock<ConnectAddress> = 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. /// Peer-to-peer network.
@ -67,13 +58,10 @@ impl Network {
/// Bootstrap nodes for this network. /// Bootstrap nodes for this network.
pub fn bootstrap(&self) -> Vec<(Alias, ProtocolVersion, ConnectAddress)> { pub fn bootstrap(&self) -> Vec<(Alias, ProtocolVersion, ConnectAddress)> {
match self { match self {
Self::Main => [ Self::Main => [(
( "iris.radicle.xyz",
"iris.radicle.xyz", seeds::RADICLE_NODE_BOOTSTRAP_IRIS.clone(),
seeds::RADICLE_NODE_BOOTSTRAP_IRIS.clone(), )]
),
("seed.radicle.xyz", seeds::RADICLE_NODE_TEAM.clone()),
]
.into_iter() .into_iter()
.map(|(a, s)| (Alias::new(a), 1, s)) .map(|(a, s)| (Alias::new(a), 1, s))
.collect(), .collect(),

4
crates/radicle/src/profile.rs
View File

@ -724,14 +724,14 @@ mod test {
}, },
"cli": { "hints": true }, "cli": { "hints": true },
"node": { "node": {
"alias": "seed.radicle.xyz", "alias": "seed.radicle.example.com",
"listen": [], "listen": [],
"peers": { "type": "dynamic", "target": 8 }, "peers": { "type": "dynamic", "target": 8 },
"connect": [ "connect": [
"z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo@rosa.radicle.xyz:8776", "z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo@rosa.radicle.xyz:8776",
"z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776" "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776"
], ],
"externalAddresses": [ "seed.radicle.xyz:8776" ], "externalAddresses": [ "seed.radicle.example.com:8776" ],
"db": { "journalMode": "wal" }, "db": { "journalMode": "wal" },
"network": "main", "network": "main",
"log": "INFO", "log": "INFO",

2
crates/radicle/src/test/arbitrary.rs
View File

@ -279,7 +279,7 @@ impl Arbitrary for Address {
cyphernet::addr::HostName::Ip(net::IpAddr::V6(net::Ipv6Addr::from(octets))) cyphernet::addr::HostName::Ip(net::IpAddr::V6(net::Ipv6Addr::from(octets)))
} }
AddressType::Dns => cyphernet::addr::HostName::Dns( 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() .unwrap()
.to_string(), .to_string(),
), ),