Remove predefined bootstrap nodes
Instead, expect a “network” field that names a network file that must exist under $RAD_HOME/networks.
A network file is a JSON file containing nodes and preferred nodes, e.g.
{
"nodes": {
"seed.radicle.xyz": "z6MksmpU5b1dS7oaqF2bHXhQi1DWy2hB7Mh9CuN7y1DN6QSz@seed.radicle.xyz:8776",
"iris.radicle.xyz": "z6MkrLMMsiPWUcNPHcRajuMi9mDfYckSoJyPwwnknocNYPm7@iris.radicle.xyz:8776",
"rosa.radicle.xyz": "z6Mkmqogy2qEM2ummccUthFEaaHvyYmYBYh3dbe9W4ebScxo@rosa.radicle.xyz:8776"
},
"preferredNodes": ["seed.radicle.xyz"]
}
13 files changed
+138
-108
f5fa84fa
→
7322e3ac
added networks/main
@@ -0,0 +1,8 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
modified radicle-cli/examples/rad-config.md
@@ -5,10 +5,7 @@ In its simplest form, `rad config` prints the current configuration.
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -64,8 +61,6 @@ You can also get any value in the configuration by path, eg.
|
|
|
|
|
|
| - | |
| - | |
|
|
|
|
|
modified radicle-cli/tests/commands.rs
@@ -5,7 +5,6 @@ use std::{net, thread, time};
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -30,7 +29,7 @@ const RAD_SEED: &str = "ffffffffffffffffffffffffffffffffffffffffffffffffffffffff
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -41,7 +40,7 @@ mod config {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -413,10 +412,7 @@ fn rad_inspect() {
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/lib.rs
@@ -39,7 +39,7 @@ pub mod prelude {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/main.rs
@@ -1,14 +1,14 @@
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -93,6 +93,11 @@ fn execute() -> anyhow::Result<()> {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -123,7 +128,7 @@ fn execute() -> anyhow::Result<()> {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/runtime.rs
@@ -21,7 +21,7 @@ use radicle::node::address::Store as _;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -87,6 +87,9 @@ pub enum Error {
|
|
|
|
|
|
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -116,6 +119,7 @@ impl Runtime {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -127,7 +131,6 @@ impl Runtime {
|
|
|
|
|
|
| - | |
|
|
|
|
|
@@ -155,7 +158,7 @@ impl Runtime {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -210,14 +213,15 @@ impl Runtime {
|
|
|
|
|
|
| - | |
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/service.rs
@@ -59,7 +59,7 @@ use crate::Link;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle-node/src/test/environment.rs
@@ -22,7 +22,7 @@ use radicle::node::seed::Store as _;
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -512,8 +512,10 @@ impl<G: cyphernet::Ecdh<Pk = NodeId> + Signer + Clone> Node<G> {
|
|
|
|
|
|
| + | |
|
|
|
|
| + | |
|
|
|
|
|
modified radicle/src/node.rs
@@ -291,7 +291,9 @@ impl AsRef<str> for UserAgent {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/node/config.rs
@@ -17,82 +17,6 @@ pub type ProtocolVersion = u8;
|
|
|
|
|
|
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
| - | |
|
|
|
|
|
@@ -404,8 +328,7 @@ pub struct Config {
|
|
|
|
|
|
| - | |
| - | |
| + | |
|
|
|
|
|
@@ -430,7 +353,7 @@ pub struct Config {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
@@ -442,7 +365,7 @@ impl Config {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
modified radicle/src/profile.rs
@@ -13,6 +13,8 @@
|
|
|
|
|
|
| + | |
| + | |
|
|
|
|
|
@@ -217,6 +219,7 @@ impl Profile {
|
|
|
|
|
|
| + | |
|
|
|
|
|
@@ -494,7 +497,13 @@ impl Home {
|
|
|
|
|
|
| - | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
@@ -527,6 +536,10 @@ impl Home {
|
|
|
|
|
|
| + | |
| + | |
| + | |
| + | |
|
|
|
|
|
modified radicle/src/profile/config.rs
@@ -50,7 +50,7 @@ impl Config {
|
|
|
|
|
|
| - | |
| + | |
|
|
|
|
|
added radicle/src/profile/networks.rs
@@ -0,0 +1,82 @@
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |
| + | |