Make OnlyStaticPeers load only static peers (#7514)

NethermindEth · Sep 30, 2024 · b4b0b02 · b4b0b02
1 parent 481f302
commit b4b0b02
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 5 deletions.
diff --git a/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs b/src/Nethermind/Nethermind.Init/Steps/InitializeNetwork.cs
@@ -468,7 +468,9 @@ private async Task InitPeer()
             _ = new NodeSourceToDiscV4Feeder(enrDiscovery, _api.DiscoveryApp, 50).Run(_api.ProcessExit!.Token);
         }
 
-        CompositeNodeSource nodeSources = new(_api.StaticNodesManager, nodesLoader, enrDiscovery, _api.DiscoveryApp);
+        CompositeNodeSource nodeSources = _networkConfig.OnlyStaticPeers
+            ? new(_api.StaticNodesManager, nodesLoader)
+            : new(_api.StaticNodesManager, nodesLoader, enrDiscovery, _api.DiscoveryApp);
         _api.PeerPool = new PeerPool(nodeSources, _api.NodeStatsManager, peerStorage, _networkConfig, _api.LogManager);
         _api.PeerManager = new PeerManager(
             _api.RlpxPeer,

diff --git a/src/Nethermind/Nethermind.Network.Test/NodesLoaderTests.cs b/src/Nethermind/Nethermind.Network.Test/NodesLoaderTests.cs
@@ -85,5 +85,19 @@ public void Can_load_persisted()
                 Assert.False(node.IsStatic);
             }
         }
+
+        [Test]
+        public void Can_load_only_static_nodes()
+        {
+            _networkConfig.StaticPeers = enode1String;
+            _networkConfig.Bootnodes = enode2String;
+            _networkConfig.OnlyStaticPeers = true;
+            List<Node> nodes = _loader.LoadInitialList();
+            Assert.That(nodes.Count, Is.EqualTo(1));
+            foreach (Node node in nodes)
+            {
+                Assert.True(node.IsStatic);
+            }
+        }
     }
 }
diff --git a/src/Nethermind/Nethermind.Network/NodesLoader.cs b/src/Nethermind/Nethermind.Network/NodesLoader.cs
@@ -44,11 +44,14 @@ public IAsyncEnumerable<Node> DiscoverNodes(CancellationToken cancellationToken)
             List<Node> allPeers = new();
             LoadPeersFromDb(allPeers);
 
-            LoadConfigPeers(allPeers, _networkConfig.Bootnodes, n =>
+            if (!_networkConfig.OnlyStaticPeers)
             {
-                n.IsBootnode = true;
-                if (_logger.IsDebug) _logger.Debug($"Bootnode     : {n}");
-            });
+                LoadConfigPeers(allPeers, _networkConfig.Bootnodes, n =>
+                {
+                    n.IsBootnode = true;
+                    if (_logger.IsDebug) _logger.Debug($"Bootnode     : {n}");
+                });
+            }
 
             LoadConfigPeers(allPeers, _networkConfig.StaticPeers, n =>
             {