Fix failing Autofac and context with mocks test

NethermindEth · Feb 13, 2025 · 92988d6 · 92988d6
1 parent 1b4c4f4
commit 92988d6
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/src/Nethermind/Nethermind.Core.Test/Modules/DiscoveryModule.cs b/src/Nethermind/Nethermind.Core.Test/Modules/DiscoveryModule.cs
@@ -36,6 +36,9 @@ protected override void Load(ContainerBuilder builder)
             // This load from file.
             .AddSingleton<NodesLoader>()
 
+            .AddSingleton<ITrustedNodesManager, ILogManager>((logManager) =>
+                new TrustedNodesManager(initConfig.TrustedNodesPath, logManager))
+
             .Bind<INodeSource, IStaticNodesManager>()
             .Bind<INodeSource, NodesLoader>()
             .AddComposite<INodeSource, CompositeNodeSource>()

diff --git a/src/Nethermind/Nethermind.Network/TrustedNodes/TrustedNodesManager.cs b/src/Nethermind/Nethermind.Network/TrustedNodes/TrustedNodesManager.cs
@@ -91,13 +91,10 @@ public async IAsyncEnumerable<Node> DiscoverNodes([EnumeratorCancellation] Cance
                 yield return new Node(netNode) { IsTrusted = true };
             }
 
-            // continuously yield new nodes as they are added via the channel.
-            while (await _nodeChannel.Reader.WaitToReadAsync(cancellationToken))
+            // yield new nodes as they are added via the channel
+            await foreach (Node node in _nodeChannel.Reader.ReadAllAsync(cancellationToken))
             {
-                while (_nodeChannel.Reader.TryRead(out Node node))
-                {
-                    yield return node;
-                }
+                yield return node;
             }
         }
 

diff --git a/src/Nethermind/Nethermind.Runner.Test/Ethereum/ContextWithMocks.cs b/src/Nethermind/Nethermind.Runner.Test/Ethereum/ContextWithMocks.cs
@@ -74,6 +74,7 @@ public static NethermindApi ContextWithMocks()
                 RewardCalculatorSource = Substitute.For<IRewardCalculatorSource>(),
                 TxPoolInfoProvider = Substitute.For<ITxPoolInfoProvider>(),
                 StaticNodesManager = Substitute.For<IStaticNodesManager>(),
+                TrustedNodesManager = Substitute.For<ITrustedNodesManager>(),
                 BloomStorage = Substitute.For<IBloomStorage>(),
                 Sealer = Substitute.For<ISealer>(),
                 BlockchainProcessor = Substitute.For<IBlockchainProcessor>(),