feat: routing table improvements by mickvandijke · Pull Request #36 · WithAutonomi/ant-node

mickvandijke · 2026-03-22T10:28:16Z

Summary

IP diversity config simplified: Replace the old 12-field TestnetConfig (ASN limits, geolocation checks, geographic diversity) with saorsa-core's 2-field IPDiversityConfig model (max_per_ip, max_per_subnet)
Close group cache persistence: Add close_group_cache_dir to NodeConfig so nodes persist close group peers and trust scores across restarts (defaults to root_dir alongside node_identity.key)
Updated tests: Renamed and updated development mode test to verify permissive diversity config

Known issues

saorsa-core dependency currently points to a local path (../saorsa-core-refactor) — needs to be updated to a crates.io version or git ref before merging

Test plan

Update saorsa-core dependency to published version
Add test for Testnet mode branch in build_core_config
Verify testnet config values propagate correctly to core
Run full test suite (cargo test)
Verify CI passes

🤖 Generated with Claude Code

Copilot

Pull request overview

This PR updates ant-node’s routing/peer-diversity configuration wiring to match the simplified saorsa-core IP diversity model and adds configuration to persist close-group cache data across restarts.

Changes:

Replace the old testnet diversity knobs with saorsa-core’s max_per_ip / max_per_subnet model and propagate those into core config.
Add close_group_cache_dir to NodeConfig and pass it through to saorsa-core (defaulting to root_dir).
Update the development-mode unit test to assert permissive diversity limits via the new fields.

Reviewed changes

Copilot reviewed 3 out of 4 changed files in this pull request and generated 2 comments.

File	Description
src/node.rs	Updates `build_core_config` diversity wiring and sets `close_group_cache_dir`; adjusts a unit test for the new diversity model.
src/config.rs	Simplifies `TestnetConfig` fields and adds `close_group_cache_dir` to `NodeConfig` with defaults.
Cargo.toml	Switches `saorsa-core` dependency from crates.io to a git branch.
Cargo.lock	Updates lockfile to reflect the new `saorsa-core` source and resulting dependency graph changes.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-30T20:01:30Z

Cargo.toml

 [dependencies]
 # Core (provides EVERYTHING: networking, DHT, security, trust, storage)
-saorsa-core = "0.18.1"
+saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", branch = "refactor/simplify-ip-diversity" }


saorsa-core is pulled from a moving git branch. This makes builds non-reproducible (the branch can change under the same Cargo.toml) and will also block cargo publish if this crate is published. Prefer a crates.io version, or at least pin the git dependency to an immutable rev (or a tag) instead of branch.

Suggested change

saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", branch = "refactor/simplify-ip-diversity" }

saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", rev = "<pinned-commit-sha>" }

Copilot · 2026-03-30T20:01:30Z

src/node.rs

                // Testnet allows loopback so nodes can be co-located on one machine.
                core_config.allow_loopback = true;
-                let mut diversity = CoreDiversityConfig::testnet();
-                diversity.max_nodes_per_asn = config.testnet.max_nodes_per_asn;
-                diversity.max_nodes_per_ipv6_64 = config.testnet.max_nodes_per_64;
-                diversity.enable_geolocation_check = config.testnet.enable_geo_checks;
-                diversity.min_geographic_diversity = if config.testnet.enable_geo_checks {
-                    3
-                } else {
-                    1
-                };
-                core_config.diversity_config = Some(diversity);
-
-                if config.testnet.enforce_age_requirements {
-                    warn!(
-                        "testnet.enforce_age_requirements is set but saorsa-core does not yet \
-                         expose a knob; age checks may remain relaxed"
-                    );
-                }
+                core_config.diversity_config = Some(CoreDiversityConfig {
+                    max_per_ip: config.testnet.max_per_ip,
+                    max_per_subnet: config.testnet.max_per_subnet,
+                });


There’s no unit test covering the NetworkMode::Testnet branch of build_core_config (e.g., that allow_loopback is enabled and max_per_ip/max_per_subnet are propagated). Adding a dedicated test would help prevent regressions in testnet behavior, especially after the diversity-config model change.

…oup cache Update to saorsa-core's simplified 2-field IPDiversityConfig (max_per_ip, max_per_subnet) replacing the old 12-field model (ASN limits, geolocation checks, geographic diversity). Add close_group_cache_dir to NodeConfig so nodes persist close group peers and trust scores across restarts, defaulting to root_dir alongside node_identity.key. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

…aorsa-core integration adjustments Switch `saorsa-core` to Git-based dependency with updated branch `refactor/simplify-ip-diversity`. Updated multiple dependencies across the ecosystem for enhanced stability and feature set alignment.

Switch from git branch dependency to crates.io release. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 3 out of 4 changed files in this pull request and generated 4 comments.

💡 Add Copilot custom instructions for smarter, more guided reviews. Learn how to get started.

Copilot · 2026-03-30T21:51:06Z

src/config.rs

+// These return `Option` because `serde(default = "...")` requires the function's
+// return type to match the field type (`Option<usize>`).
+#[allow(clippy::unnecessary_wraps)]
+const fn default_testnet_max_per_ip() -> Option<usize> {
+    Some(usize::MAX)
 }

-const fn default_testnet_max_per_64() -> usize {
-    100
+#[allow(clippy::unnecessary_wraps)]
+const fn default_testnet_max_per_subnet() -> Option<usize> {
+    Some(usize::MAX)
 }


usize::MAX as a default for TOML-serialized config values is not representable in TOML (integers are limited to signed 64-bit), so NodeConfig::to_file() / toml::to_string_pretty will error on 64-bit platforms. Prefer representing “unlimited” as None for these Option<usize> fields (or use a concrete value <= i64::MAX), and update the doc comments accordingly.

Copilot · 2026-03-30T21:51:07Z

src/config.rs

    /// Create a development configuration preset.
    ///
    /// This has minimal restrictions and is only suitable for local testing.
    #[must_use]
    pub fn development() -> Self {
        Self {
            network_mode: NetworkMode::Development,
            testnet: TestnetConfig {
-                max_nodes_per_asn: usize::MAX,
-                max_nodes_per_64: usize::MAX,
-                enforce_age_requirements: false,
-                enable_geo_checks: false,
+                max_per_ip: Some(usize::MAX),
+                max_per_subnet: Some(usize::MAX),
            },
            ..Self::default()
        }


NodeConfig::development() sets testnet: TestnetConfig { ... }, but build_core_config() ignores config.testnet in NetworkMode::Development (it always uses CoreDiversityConfig::permissive()). This makes these values dead/unused and can confuse readers; consider removing the testnet override here or changing the development preset to configure the actual development-mode behavior.

Copilot · 2026-03-30T21:51:07Z

src/node.rs

+        // Persist close group peers + trust scores across restarts.
+        // Default to root_dir (alongside node_identity.key) when not explicitly set.
+        core_config.close_group_cache_dir = Some(
+            config
+                .close_group_cache_dir
+                .clone()
+                .unwrap_or_else(|| config.root_dir.clone()),
+        );


close_group_cache_dir can be set to a custom path, but only config.root_dir is create_dir_all’d before P2PNode::new(). If close_group_cache_dir points to a non-existent directory, saorsa-core may fail when trying to persist the cache. Consider ensuring the resolved close_group_cache_dir exists (create it) before initializing the core node.

Copilot · 2026-03-30T21:51:07Z

src/node.rs

+        assert_eq!(diversity.max_per_ip, Some(usize::MAX));
+        assert_eq!(diversity.max_per_subnet, Some(usize::MAX));


The development-mode diversity test asserts specific internal field values (Some(usize::MAX)), which makes the test brittle against representation changes (e.g., permissive/unlimited might be expressed as None). It would be more robust to assert equivalence to CoreDiversityConfig::permissive() (or assert the semantic behavior the node relies on) instead of hard-coding sentinel values.

Suggested change

assert_eq!(diversity.max_per_ip, Some(usize::MAX));

assert_eq!(diversity.max_per_subnet, Some(usize::MAX));

let expected = saorsa_core::config::CoreDiversityConfig::permissive();

assert_eq!(diversity, expected);

mickvandijke changed the title ~~feat: align with saorsa-core IP diversity simplification and close group cache~~ feat: routing table improvements Mar 25, 2026

mickvandijke force-pushed the feat/ip-diversity-simplification branch from 6a15bf3 to 49bb707 Compare March 30, 2026 18:55

mickvandijke marked this pull request as ready for review March 30, 2026 19:58

Copilot AI review requested due to automatic review settings March 30, 2026 19:58

Copilot started reviewing on behalf of mickvandijke March 30, 2026 19:58 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

mickvandijke and others added 3 commits March 30, 2026 22:45

chore: update saorsa-core to 0.20.0

5be539f

Switch from git branch dependency to crates.io release. Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Copilot AI review requested due to automatic review settings March 30, 2026 21:46

jacderida force-pushed the feat/ip-diversity-simplification branch from 1fb5928 to 5be539f Compare March 30, 2026 21:46

Copilot started reviewing on behalf of jacderida March 30, 2026 21:47 View session

Copilot AI reviewed Mar 30, 2026

View reviewed changes

jacderida approved these changes Mar 30, 2026

View reviewed changes

jacderida merged commit c14ecb2 into WithAutonomi:main Mar 30, 2026
15 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: routing table improvements#36

feat: routing table improvements#36
jacderida merged 3 commits intoWithAutonomi:mainfrom
mickvandijke:feat/ip-diversity-simplification

mickvandijke commented Mar 22, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Copilot AI left a comment

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Copilot AI Mar 30, 2026

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

	saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", branch = "refactor/simplify-ip-diversity" }
	saorsa-core = { git = "https://github.com/saorsa-labs/saorsa-core.git", rev = "<pinned-commit-sha>" }

		assert_eq!(diversity.max_per_ip, Some(usize::MAX));
		assert_eq!(diversity.max_per_subnet, Some(usize::MAX));

Conversation

mickvandijke commented Mar 22, 2026

Summary

Known issues

Test plan

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Reviewed changes

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Copilot AI Mar 30, 2026

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants