Update and fix ethereum tests

.github/workflows/run-nethermind-tests.yml

@@ -267,10 +267,10 @@ jobs:
         dotnet test -c Release src/Nethermind/Ethereum.KeyAddress.Test
     - name: Ethereum.PoW.Test
       run: |
-        dotnet test -c Release src/Nethermind/Ethereum.Rlp.Test
+        dotnet test -c Release src/Nethermind/Ethereum.PoW.Test
     - name: Ethereum.Rlp.Test
       run: |
-        dotnet test -c Release src/Nethermind/Ethereum.Basic.Test
+        dotnet test -c Release src/Nethermind/Ethereum.Rlp.Test
     - name: Ethereum.Transaction.Test
       run: |
         dotnet test -c Release src/Nethermind/Ethereum.Transaction.Test
@@ -280,3 +280,6 @@ jobs:
     - name: Ethereum.Trie.Test
       run: |
         dotnet test -c Release src/Nethermind/Ethereum.Trie.Test
+    - name: Ethereum.VM.Test
+      run: |
+        dotnet test -c Release src/Nethermind/Ethereum.VM.Test

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

@@ -24,14 +24,10 @@
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-    <Content Include="..\..\tests\BlockchainTests\ValidBlocks\VMTests\vm*\*.*">
+    <Content Include="..\..\tests\BlockchainTests\InvalidBlocks\bc*\*.*">
       <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
-<!--    <Content Include="..\..\tests\BlockchainTests\InvalidBlocks\bc*\*.*">-->
-<!--      <Link>InvalidBlocks\%(RecursiveDir)%(FileName)%(Extension)</Link>-->
-<!--      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>-->
-<!--    </Content>-->
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Ethereum.Test.Base\Ethereum.Test.Base.csproj" />

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

@@ -17,21 +17,22 @@
  */
 
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Ethereum.Test.Base;
 using NUnit.Framework;
 
 namespace Ethereum.Blockchain.Block.Test
 {
     [TestFixture][Parallelizable(ParallelScope.All)]
-    public class ExampleTests : GeneralStateTestBase
+    public class ExampleTests : BlockchainTestBase
     {
         [TestCaseSource(nameof(LoadTests))]
-        public void Test(GeneralStateTest test)
+        public async Task Test(BlockchainTest test)
         {
-            Assert.True(RunTest(test).Pass);
+            await RunTest(test);
         }
 
-        public static IEnumerable<GeneralStateTest> LoadTests() { var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "bcExample");
-            return (IEnumerable<GeneralStateTest>)loader.LoadTests(); }
+        public static IEnumerable<BlockchainTest> LoadTests() { var loader = new TestsSourceLoader(new LoadBlockchainTestsStrategy(), "bcExample");
+            return (IEnumerable<BlockchainTest>)loader.LoadTests(); }
     }
 }

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

@@ -33,7 +33,7 @@ public void All_categories_are_tested()
             string[] directories =
                 Directory.GetDirectories(AppDomain.CurrentDomain.BaseDirectory)
                 .Select(Path.GetFileName)
-                .Where(d =>d.StartsWith("bc") || d.StartsWith("vm"))
+                .Where(d =>d.StartsWith("bc"))
                 .ToArray();
 
             Type[] types = GetType().Assembly.GetTypes();