Update EthereumTests

.github/workflows/nethermind-tests.yml

@@ -33,21 +33,20 @@ jobs:
         project:
           - Ethereum.Abi.Test
           - Ethereum.Basic.Test
-          - Ethereum.Blockchain.Block.Legacy.Test
           - Ethereum.Blockchain.Block.Test
-          - Ethereum.Blockchain.Legacy.Test
           - Ethereum.Blockchain.Pyspec.Test
-          - Ethereum.Blockchain.Test
           - Ethereum.Difficulty.Test
           - Ethereum.HexPrefix.Test
           - Ethereum.KeyAddress.Test
           - Ethereum.KeyStore.Test
+          - Ethereum.Legacy.Blockchain.Block.Test
+          - Ethereum.Legacy.Blockchain.Test
+          - Ethereum.Legacy.Transition.Test
+          - Ethereum.Legacy.VM.Test
           - Ethereum.PoW.Test
           - Ethereum.Rlp.Test
           - Ethereum.Transaction.Test
-          - Ethereum.Transition.Test
           - Ethereum.Trie.Test
-          - Ethereum.VM.Test
           - Nethermind.Abi.Test
           - Nethermind.Api.Test
           - Nethermind.AuRa.Test

src/Nethermind/Ethereum.Blockchain.Test/Eip3860LimitmeterInitCodeTests.cs → src/Nethermind/Ethereum.Blockchain.Block.Test/BlockhashTests.cs

@@ -1,15 +1,17 @@
 // SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited
 // SPDX-License-Identifier: LGPL-3.0-only
 
+using System;
 using System.Collections.Generic;
+using System.IO;
 using Ethereum.Test.Base;
 using NUnit.Framework;
 
-namespace Ethereum.Blockchain.Test;
+namespace Ethereum.Blockchain.Block.Test;
 
 [TestFixture]
 [Parallelizable(ParallelScope.All)]
-public class Eip3860LimitmeterInitCodeTests : GeneralStateTestBase
+public class BlockhashTests : GeneralStateTestBase
 {
     [TestCaseSource(nameof(LoadTests))]
     public void Test(GeneralStateTest test)
@@ -19,7 +21,7 @@ public void Test(GeneralStateTest test)
 
     public static IEnumerable<GeneralStateTest> LoadTests()
     {
-        var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP3860-limitmeterinitcode");
+        var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Blockhash"));
         return loader.LoadTests<GeneralStateTest>();
     }
 }

src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj

@@ -1,5 +1,5 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  
+
   <Import Project="../tests.props" />
 
   <ItemGroup>
@@ -12,7 +12,15 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+
+  <ItemGroup>
+      <None Update="Blockhash\blockhash.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\Ethereum.Test.Base\Ethereum.Test.Base.csproj" />
   </ItemGroup>
+
 </Project>

src/Nethermind/Ethereum.Blockchain.Block.Test/ForgedTests.cs

@@ -16,10 +16,11 @@ public class ForgedTests : BlockchainTestBase
         [TestCaseSource(nameof(LoadTests))]
         public async Task Test(BlockchainTest test)
         {
-            bool isWindows = System.Runtime.InteropServices.RuntimeInformation
-            .IsOSPlatform(OSPlatform.Windows);
+            bool isWindows = RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
             if (isWindows)
+            {
                 return;
+            }
 
             await RunTest(test);
         }

src/Nethermind/Ethereum.Blockchain.Block.Test/StateTests.cs

@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Threading.Tasks;
 using Ethereum.Test.Base;
-using Nethermind.Core.Attributes;
 using NUnit.Framework;
 
 namespace Ethereum.Blockchain.Block.Test
@@ -13,7 +12,6 @@ namespace Ethereum.Blockchain.Block.Test
     [Parallelizable(ParallelScope.All)]
     public class StateTests : BlockchainTestBase
     {
-        [Todo(Improve.TestCoverage, "SuicideStorage tests")]
         [TestCaseSource(nameof(LoadTests)), Retry(3)]
         public async Task Test(BlockchainTest test)
         {