refactoring: remove VerkleBlockchainTestsRunner

src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs

@@ -39,7 +39,7 @@
 
 namespace Ethereum.Test.Base
 {
-    public abstract class BlockchainTestBase
+    public class BlockchainTestBase: IBlockchainTestBase
     {
         private static InterfaceLogger _logger = new NUnitLogger(LogLevel.Trace);
         // private static ILogManager _logManager = new OneLoggerLogManager(_logger);
@@ -74,7 +74,7 @@ public UInt256 Calculate(BlockHeader header, BlockHeader parent)
             }
         }
 
-        protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch? stopwatch = null, bool failOnInvalidRlp = true)
+        public async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch? stopwatch = null, bool failOnInvalidRlp = true)
         {
             TestContext.WriteLine($"Running {test.Name}, Network: [{test.Network.Name}] at {DateTime.UtcNow:HH:mm:ss.ffffff}");
             if (test.NetworkAfterTransition is not null)

src/Nethermind/Ethereum.Test.Base/IBlockchainTestBase.cs

@@ -0,0 +1,14 @@
+// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited
+// SPDX-License-Identifier: LGPL-3.0-only
+
+using System.Diagnostics;
+using System.Threading.Tasks;
+
+namespace Ethereum.Test.Base;
+
+public interface IBlockchainTestBase
+{
+    public void Setup();
+
+    public Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch? stopwatch = null, bool failOnInvalidRlp = true);
+}

src/Nethermind/Ethereum.Test.Base/VerkleBlockChainTestBase.cs

@@ -35,7 +35,7 @@
 
 namespace Ethereum.Test.Base
 {
-    public abstract class VerkleBlockChainTestBase
+    public class VerkleBlockChainTestBase: IBlockchainTestBase
     {
         private static InterfaceLogger _logger = new NUnitLogger(LogLevel.Trace);
         // private static ILogManager _logManager = new OneLoggerLogManager(_logger);
@@ -70,7 +70,7 @@ public UInt256 Calculate(BlockHeader header, BlockHeader parent)
             }
         }
 
-        protected async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch? stopwatch = null, bool failOnInvalidRlp = true)
+        public async Task<EthereumTestResult> RunTest(BlockchainTest test, Stopwatch? stopwatch = null, bool failOnInvalidRlp = true)
         {
             Assert.IsNull(test.LoadFailure, "test data loading failure");
 

src/Nethermind/Nethermind.Test.Runner/BlockchainTestsRunner.cs

@@ -11,17 +11,19 @@
 
 namespace Nethermind.Test.Runner;
 
-public class BlockchainTestsRunner : BlockchainTestBase, IBlockchainTestRunner
+public class BlockchainTestsRunner : IBlockchainTestRunner
 {
     private readonly ConsoleColor _defaultColour;
     private readonly ITestSourceLoader _testsSource;
     private readonly string? _filter;
+    private readonly IBlockchainTestBase _blockchainTestBase;
 
-    public BlockchainTestsRunner(ITestSourceLoader testsSource, string? filter)
+    public BlockchainTestsRunner(ITestSourceLoader testsSource, string? filter, IBlockchainTestBase blockchainTestBase)
     {
         _testsSource = testsSource ?? throw new ArgumentNullException(nameof(testsSource));
         _defaultColour = Console.ForegroundColor;
         _filter = filter;
+        _blockchainTestBase  = blockchainTestBase;
     }
 
     public async Task<IEnumerable<EthereumTestResult>> RunTestsAsync()
@@ -32,7 +34,7 @@ public async Task<IEnumerable<EthereumTestResult>> RunTestsAsync()
         {
             if (_filter is not null && !Regex.Match(test.Name, $"^({_filter})").Success)
                 continue;
-            Setup();
+            _blockchainTestBase.Setup();
 
             Console.Write($"{test,-120} ");
             if (test.LoadFailure != null)
@@ -42,7 +44,7 @@ public async Task<IEnumerable<EthereumTestResult>> RunTestsAsync()
             }
             else
             {
-                EthereumTestResult result = await RunTest(test);
+                EthereumTestResult result = await _blockchainTestBase.RunTest(test);
                 testResults.Add(result);
                 if (result.Pass)
                     WriteGreen("PASS");

src/Nethermind/Nethermind.Test.Runner/Program.cs

@@ -68,9 +68,9 @@ private static async Task Run(Options options)
             while (!string.IsNullOrWhiteSpace(input))
             {
                 if (options.VerkleTest)
-                    await RunBlockTest(input, source => new VerkleBlockchainTestsRunner(source, options.Filter));
+                    await RunBlockTest(input, source => new BlockchainTestsRunner(source, options.Filter, new VerkleBlockChainTestBase()));
                 else if (options.BlockTest)
-                    await RunBlockTest(input, source => new BlockchainTestsRunner(source, options.Filter));
+                    await RunBlockTest(input, source => new BlockchainTestsRunner(source, options.Filter, new BlockchainTestBase()));
                 else
                     RunStateTest(input, source => new StateTestsRunner(source, whenTrace, !options.ExcludeMemory, !options.ExcludeStack, options.Filter));
                 if (!options.Stdin)