diff --git a/lib/src/client.rs b/lib/src/client.rs index 34805aa9a0..9fada89972 100644 --- a/lib/src/client.rs +++ b/lib/src/client.rs @@ -323,7 +323,6 @@ impl ClientInner { required_services, tls_config, config.network.desired_peer_count, - config.network.autonat_allow_non_global_ips, config.network.only_secure_ws_connections, config.network.allow_loopback_addresses, config diff --git a/lib/src/config/config.rs b/lib/src/config/config.rs index 9744e6bd3c..8473bfb269 100644 --- a/lib/src/config/config.rs +++ b/lib/src/config/config.rs @@ -140,10 +140,6 @@ pub struct NetworkConfig { #[builder(default = "12")] pub desired_peer_count: usize, - /// Optional setting to allow network autonat to use non global IPs - #[builder(default)] - pub autonat_allow_non_global_ips: bool, - /// Optional bool to only accept secure websocket connections #[builder(default)] pub only_secure_ws_connections: bool, @@ -758,7 +754,6 @@ impl ClientConfigBuilder { desired_peer_count: config_file.network.desired_peer_count, tls: config_file.network.tls.as_ref().map(|s| s.clone().into()), - autonat_allow_non_global_ips: config_file.network.autonat_allow_non_global_ips, only_secure_ws_connections: false, allow_loopback_addresses: config_file.network.allow_loopback_addresses, dht_quorum: config_file.network.dht_quorum, diff --git a/lib/src/config/config_file/client.example.toml b/lib/src/config/config_file/client.example.toml index 004998fc09..6d95ed75c7 100644 --- a/lib/src/config/config_file/client.example.toml +++ b/lib/src/config/config_file/client.example.toml @@ -47,10 +47,6 @@ seed_nodes = [ # Default: Generated from version, operating system and processor architecture #user_agent = "core-rs-albatross/0.1.0 (native; linux x86_64)" -# If the network should allow the autonat feature to use non-global IPs. -# Default: false -#autonat_allow_non_global_ips = false - # If the node should try to connect to loopback addresses, which are usually not reachable # from the public internet. This setting is useful for testing inside a local (Docker) network. # Default: false diff --git a/lib/src/config/config_file/mod.rs b/lib/src/config/config_file/mod.rs index 8101c48ab6..287f36b466 100644 --- a/lib/src/config/config_file/mod.rs +++ b/lib/src/config/config_file/mod.rs @@ -177,8 +177,6 @@ pub struct NetworkSettings { #[serde(default = "NetworkSettings::default_desired_peer_count")] pub desired_peer_count: usize, #[serde(default)] - pub autonat_allow_non_global_ips: bool, - #[serde(default)] pub allow_loopback_addresses: bool, #[serde(default)] pub dht_quorum: Option, diff --git a/network-libp2p/src/config.rs b/network-libp2p/src/config.rs index fe6bd1ff17..87c22937d2 100644 --- a/network-libp2p/src/config.rs +++ b/network-libp2p/src/config.rs @@ -31,7 +31,6 @@ pub struct Config { pub required_services: Services, pub tls: Option, pub desired_peer_count: usize, - pub autonat_allow_non_global_ips: bool, pub only_secure_ws_connections: bool, pub allow_loopback_addresses: bool, pub dht_quorum: NonZeroU8, @@ -47,7 +46,6 @@ impl Config { required_services: Services, tls_settings: Option, desired_peer_count: usize, - autonat_allow_non_global_ips: bool, only_secure_ws_connections: bool, allow_loopback_addresses: bool, dht_quorum: NonZeroU8, @@ -96,7 +94,6 @@ impl Config { required_services, tls: tls_settings, desired_peer_count, - autonat_allow_non_global_ips, only_secure_ws_connections, allow_loopback_addresses, dht_quorum, diff --git a/network-libp2p/tests/network.rs b/network-libp2p/tests/network.rs index 70426977e9..1481486d2d 100644 --- a/network-libp2p/tests/network.rs +++ b/network-libp2p/tests/network.rs @@ -63,7 +63,6 @@ fn network_config(address: Multiaddr) -> Config { required_services: Services::all(), tls: None, desired_peer_count: 3, - autonat_allow_non_global_ips: true, only_secure_ws_connections: false, allow_loopback_addresses: true, dht_quorum: NonZeroU8::new(1).unwrap(), diff --git a/network-libp2p/tests/request_response.rs b/network-libp2p/tests/request_response.rs index 3ae2063de6..19d88ae0d5 100644 --- a/network-libp2p/tests/request_response.rs +++ b/network-libp2p/tests/request_response.rs @@ -244,7 +244,6 @@ fn network_config(address: Multiaddr) -> Config { required_services: Services::all(), tls: None, desired_peer_count: 3, - autonat_allow_non_global_ips: true, only_secure_ws_connections: false, allow_loopback_addresses: true, dht_quorum: NonZeroU8::new(1).unwrap(), diff --git a/scripts/devnet/templates/node_conf.toml.j2 b/scripts/devnet/templates/node_conf.toml.j2 index 97eddc83a6..4165542814 100644 --- a/scripts/devnet/templates/node_conf.toml.j2 +++ b/scripts/devnet/templates/node_conf.toml.j2 @@ -14,7 +14,6 @@ seed_nodes = [ ] {% endif %} -autonat_allow_non_global_ips = true desired_peer_count = {{ min_peers }} [consensus] diff --git a/test-utils/src/test_network.rs b/test-utils/src/test_network.rs index 82e754916d..3343b29fa5 100644 --- a/test-utils/src/test_network.rs +++ b/test-utils/src/test_network.rs @@ -72,7 +72,6 @@ impl TestNetwork for Network { Services::all(), None, 3, - true, false, true, NonZeroU8::new(1).unwrap(),