Radish alpha
r
Radicle web interface
Radicle
Git (anonymous pull)
Log in to clone via SSH
node: Simplify configuration
Alexis Sellier committed 1 year ago
commit bee6c4568fec727208dea20cec7397c88fc5c935
parent d4a69b433c41b46c2a1ed6e4955141bb6d3fe811
2 files changed +11 -16
modified radicle-httpd/src/api/v1/node.rs
@@ -8,7 +8,10 @@ use serde_json::json;

use radicle::identity::RepoId;
use radicle::node::routing::Store;
-
use radicle::node::{policy, AliasStore, Handle, NodeId, DEFAULT_TIMEOUT};
+
use radicle::node::{
+
    policy::{Policy, SeedPolicy},
+
    AliasStore, Handle, NodeId, DEFAULT_TIMEOUT,
+
};
use radicle::Node;

use crate::api::error::Error;
@@ -84,16 +87,11 @@ async fn node_policies_repos_handler(State(ctx): State<Context>) -> impl IntoRes
    let policies = ctx.profile.policies()?;
    let mut repos = Vec::new();

-
    for policy::SeedPolicy {
-
        rid: id,
-
        scope,
-
        policy,
-
    } in policies.seed_policies()?
-
    {
+
    for SeedPolicy { rid: id, policy } in policies.seed_policies()? {
        repos.push(json!({
            "id": id,
-
            "scope": scope,
-
            "policy": policy,
+
            "scope": policy.scope().unwrap_or_default(),
+
            "policy": Policy::from(policy),
        }));
    }

modified radicle-httpd/src/api/v1/profile.rs
@@ -83,13 +83,9 @@ mod routes {
                "node": {
                  "alias": "seed",
                  "listen": [],
-
                  "peers": {
-
                    "type": "dynamic",
-
                    "target": 8
-
                  },
+
                  "peers": { "type": "dynamic" },
                  "connect": [],
                  "externalAddresses": [],
-
                  "db": { "journalMode": "rollback" },
                  "network": "main",
                  "log": "INFO",
                  "relay": "auto",
@@ -115,8 +111,9 @@ mod routes {
                    }
                  },
                  "workers": 8,
-
                  "policy": "block",
-
                  "scope": "all"
+
                  "seedingPolicy": {
+
                      "default": "block",
+
                  }
                }
              },
              "home": seed.profile.path()