diff --git a/.github/workflows/nethermind-tests.yml b/.github/workflows/nethermind-tests.yml index 133b3f93b2f8..83ba586c503d 100644 --- a/.github/workflows/nethermind-tests.yml +++ b/.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 diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Blockhash/blockhash.json b/src/Nethermind/Ethereum.Blockchain.Block.Test/Blockhash/blockhash.json similarity index 100% rename from src/Nethermind/Ethereum.Blockchain.Test/Blockhash/blockhash.json rename to src/Nethermind/Ethereum.Blockchain.Block.Test/Blockhash/blockhash.json diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip3860LimitmeterInitCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Block.Test/BlockhashTests.cs similarity index 73% rename from src/Nethermind/Ethereum.Blockchain.Test/Eip3860LimitmeterInitCodeTests.cs rename to src/Nethermind/Ethereum.Blockchain.Block.Test/BlockhashTests.cs index bacdc7c7ea57..36b0c76707e9 100644 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip3860LimitmeterInitCodeTests.cs +++ b/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 LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP3860-limitmeterinitcode"); + var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Blockhash")); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj index 1787402212f2..1dff0badfeef 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj +++ b/src/Nethermind/Ethereum.Blockchain.Block.Test/Ethereum.Blockchain.Block.Test.csproj @@ -1,5 +1,5 @@ - + @@ -12,7 +12,15 @@ PreserveNewest + + + + PreserveNewest + + + + diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Test/ForgedTests.cs b/src/Nethermind/Ethereum.Blockchain.Block.Test/ForgedTests.cs index a0a2c7957bb6..5950609cb85b 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Test/ForgedTests.cs +++ b/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); } diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Test/StateTests.cs b/src/Nethermind/Ethereum.Blockchain.Block.Test/StateTests.cs index 656e042667c7..298b73893beb 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Test/StateTests.cs +++ b/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) { diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCreateCallCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCreateCallCodeTests.cs deleted file mode 100644 index df2bd0ad6f08..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCreateCallCodeTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2023 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CallCreateCallCodeTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCallCreateCallCodeTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesCallCodeHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesCallCodeHomesteadTests.cs deleted file mode 100644 index 035a83621966..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesCallCodeHomesteadTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CallDelegateCodesCallCodeHomesteadTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCallDelegateCodesCallCodeHomestead"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesHomesteadTests.cs deleted file mode 100644 index 223d7e702ba3..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallDelegateCodesHomesteadTests.cs +++ /dev/null @@ -1,25 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CallDelegateCodesHomesteadTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCallDelegateCodesHomestead"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ChangedEIP150Tests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ChangedEIP150Tests.cs deleted file mode 100644 index e767545f5a44..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ChangedEIP150Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ChangedEIP150Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stChangedEIP150"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeCopyTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeCopyTests.cs deleted file mode 100644 index 951067aa7b7f..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeCopyTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CodeCopyTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCodeCopyTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeSizeLimitTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeSizeLimitTests.cs deleted file mode 100644 index ec2f3899cca5..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CodeSizeLimitTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CodeSizeLimitTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCodeSizeLimit"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Create2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Create2Tests.cs deleted file mode 100644 index 4ea837b1759f..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Create2Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Create2Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCreate2"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CreateTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CreateTests.cs deleted file mode 100644 index c0761e20222b..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CreateTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CreateTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCreateTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/DelegateCallTestHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/DelegateCallTestHomesteadTests.cs deleted file mode 100644 index 5604942d4417..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/DelegateCallTestHomesteadTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class DelegateCallTestHomesteadTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stDelegatecallTestHomestead"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/EIP150SingleCodeGasPricesTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/EIP150SingleCodeGasPricesTests.cs deleted file mode 100644 index 85e455636700..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/EIP150SingleCodeGasPricesTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class EIP150SingleCodeGasPricesTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP150singleCodeGasPrices"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip150SpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip150SpecificTests.cs deleted file mode 100644 index 9602f8be4d4d..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip150SpecificTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip150SpecificTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP150Specific"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip158SpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip158SpecificTests.cs deleted file mode 100644 index e8b16addcdb3..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Eip158SpecificTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip158SpecificTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP158Specific"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Ethereum.Blockchain.Legacy.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Ethereum.Blockchain.Legacy.Test.csproj deleted file mode 100644 index 82c175be3fc2..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Ethereum.Blockchain.Legacy.Test.csproj +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExampleTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExampleTests.cs deleted file mode 100644 index 5147949057e9..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExampleTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ExampleTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stExample"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExtCodeHashTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExtCodeHashTests.cs deleted file mode 100644 index 119e3979f486..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ExtCodeHashTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ExtCodeHashTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stExtCodeHash"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/HomesteadSpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/HomesteadSpecificTests.cs deleted file mode 100644 index c23c1052ac42..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/HomesteadSpecificTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class HomesteadSpecificTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stHomesteadSpecific"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/InitCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/InitCodeTests.cs deleted file mode 100644 index e4d3423a1af9..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/InitCodeTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class InitCodeTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stInitCodeTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemExpandingEip150CallsTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemExpandingEip150CallsTests.cs deleted file mode 100644 index eb534eec6286..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemExpandingEip150CallsTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class MemExpandingEip150CallsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stMemExpandingEIP150Calls"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryStressTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryStressTests.cs deleted file mode 100644 index b8ed97fba088..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryStressTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class MemoryStressTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stMemoryStressTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryTests.cs deleted file mode 100644 index 2a215c22b9ea..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/MemoryTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class MemoryTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stMemoryTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/NonZeroCallTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/NonZeroCallTests.cs deleted file mode 100644 index eb816ae3aad8..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/NonZeroCallTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class NonZeroCallTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stNonZeroCallsTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/PreCompiledContracts2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/PreCompiledContracts2Tests.cs deleted file mode 100644 index 377611884a8b..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/PreCompiledContracts2Tests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class PreCompiledContracts2Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stPreCompiledContracts2"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/PreCompiledContractsTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/PreCompiledContractsTests.cs deleted file mode 100644 index 0c55e7fcf251..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/PreCompiledContractsTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class PreCompiledContractsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stPreCompiledContracts"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/QuadraticComplexityTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/QuadraticComplexityTests.cs deleted file mode 100644 index 0f7ae025fddd..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/QuadraticComplexityTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class QuadraticComplexityTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stQuadraticComplexityTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Random2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Random2Tests.cs deleted file mode 100644 index 04a97abdad1a..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/Random2Tests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Random2Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRandom2"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RandomTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RandomTests.cs deleted file mode 100644 index e77bf15e90ee..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RandomTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class RandomTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRandom"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RecursiveCreateTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RecursiveCreateTests.cs deleted file mode 100644 index cca3d38b529e..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RecursiveCreateTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class RecursiveCreateTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRecursiveCreate"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RefundTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RefundTests.cs deleted file mode 100644 index 18c2c316bfd7..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RefundTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class RefundTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRefundTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ReturnDataTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ReturnDataTests.cs deleted file mode 100644 index 8e718473a7f0..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ReturnDataTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ReturnDataTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stReturnDataTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RevertTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RevertTests.cs deleted file mode 100644 index 8d62cf44b283..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/RevertTests.cs +++ /dev/null @@ -1,34 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using System.Linq; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class RevertTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRevertTest"); - IEnumerable tests = loader.LoadTests(); - HashSet ignoredTests = new() - { - "RevertPrecompiledTouch", - }; - - return tests.Where(t => !ignoredTests.Any(pattern => t.Name.Contains(pattern))); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SStoreTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SStoreTests.cs deleted file mode 100644 index f5477c916627..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SStoreTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SStoreTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSStoreTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ShiftTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ShiftTests.cs deleted file mode 100644 index 5b614d672fa1..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ShiftTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ShiftTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stShift"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SolidityTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SolidityTests.cs deleted file mode 100644 index a292a97dae65..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SolidityTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SolidityTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSolidityTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SpecialTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SpecialTests.cs deleted file mode 100644 index 6fb70e5ee9c4..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SpecialTests.cs +++ /dev/null @@ -1,28 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SpecialTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - [Retry(3)] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSpecialTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/StackTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/StackTests.cs deleted file mode 100644 index 5921030d5903..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/StackTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class StackTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stStackTests"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/StaticCallTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/StaticCallTests.cs deleted file mode 100644 index 29afd2f8536d..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/StaticCallTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class StaticCallTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stStaticCall"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SystemOperationsTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SystemOperationsTests.cs deleted file mode 100644 index a1f1fefcb3e0..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/SystemOperationsTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SystemOperationsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSystemOperationsTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TimeConsumingTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TimeConsumingTests.cs deleted file mode 100644 index cc4c7372d419..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TimeConsumingTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class TimeConsumingTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stTimeConsuming"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TransactionTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TransactionTests.cs deleted file mode 100644 index 310d1e1b5e7d..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TransactionTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class TransactionTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stTransactionTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TransitionTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TransitionTests.cs deleted file mode 100644 index be1484e6f613..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/TransitionTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class TransitionTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stTransitionTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/WalletTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/WalletTests.cs deleted file mode 100644 index 7aa893f3b264..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/WalletTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class WalletTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stWalletTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroCallsRevertTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroCallsRevertTests.cs deleted file mode 100644 index 7e59be7dbde4..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroCallsRevertTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ZeroCallsRevertTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stZeroCallsRevert"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroCallsTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroCallsTests.cs deleted file mode 100644 index e864de956473..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroCallsTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ZeroCallsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stZeroCallsTest"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroKnowledge2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroKnowledge2Tests.cs deleted file mode 100644 index 2b9051b62304..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroKnowledge2Tests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ZeroKnowledge2Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stZeroKnowledge2"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroKnowledgeTests.cs b/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroKnowledgeTests.cs deleted file mode 100644 index af324039128f..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ZeroKnowledgeTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Legacy.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ZeroKnowledgeTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stZeroKnowledge"); - return loader.LoadTests(); - } - } -} - diff --git a/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Constants.cs b/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Constants.cs index 8c80687245d1..50b8bcacbbf7 100644 --- a/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Constants.cs +++ b/src/Nethermind/Ethereum.Blockchain.Pyspec.Test/Constants.cs @@ -5,6 +5,6 @@ namespace Ethereum.Blockchain.Pyspec.Test; public class Constants { public const string ARCHIVE_URL_TEMPLATE = "https://github.com/ethereum/execution-spec-tests/releases/download/{0}/{1}"; - public const string DEFAULT_ARCHIVE_VERSION = "v4.4.0"; + public const string DEFAULT_ARCHIVE_VERSION = "v5.0.0"; public const string DEFAULT_ARCHIVE_NAME = "fixtures_develop.tar.gz"; } diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ArgsZeroOneBalanceTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ArgsZeroOneBalanceTests.cs deleted file mode 100644 index 70861549a512..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ArgsZeroOneBalanceTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ArgsZeroOneBalanceTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stArgsZeroOneBalance"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/AttackTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/AttackTests.cs deleted file mode 100644 index c63c4027fe1b..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/AttackTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class AttackTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stAttackTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/BadOpcodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/BadOpcodeTests.cs deleted file mode 100644 index 826aa7d9bf59..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/BadOpcodeTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class BadOpcodeTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - [Retry(3)] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stBadOpcode"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/BlockhashTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/BlockhashTests.cs deleted file mode 100644 index a929c2829dc1..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/BlockhashTests.cs +++ /dev/null @@ -1,28 +0,0 @@ -// 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 -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class BlockhashTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "Blockhash")); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/BugsTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/BugsTests.cs deleted file mode 100644 index 544b1043d855..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/BugsTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class BugsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stBugs"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/CallCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/CallCodeTests.cs deleted file mode 100644 index 5f153b790c6e..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/CallCodeTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CallCodesTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stCallCodes"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/CallCreateCallCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/CallCreateCallCodeTests.cs deleted file mode 100644 index ac4c6254c378..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/CallCreateCallCodeTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CallCreateCallCodeTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stCallCreateCallCodeTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/CallDelegateCodesCallCodeHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/CallDelegateCodesCallCodeHomesteadTests.cs deleted file mode 100644 index 000b41b60525..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/CallDelegateCodesCallCodeHomesteadTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CallDelegateCodesCallCodeHomesteadTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stCallDelegateCodesCallCodeHomestead"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/CallDelegateCodesHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/CallDelegateCodesHomesteadTests.cs deleted file mode 100644 index cd13e782b2fe..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/CallDelegateCodesHomesteadTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CallDelegateCodesHomesteadTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stCallDelegateCodesHomestead"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ChainIdTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ChainIdTests.cs deleted file mode 100644 index eaba2c3f5216..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ChainIdTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ChainIdTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stChainId"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/CodeCopyTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/CodeCopyTests.cs deleted file mode 100644 index 14fe7570491c..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/CodeCopyTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CodeCopyTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stCodeCopyTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/CodeSizeLimitTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/CodeSizeLimitTests.cs deleted file mode 100644 index 211df7ec8172..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/CodeSizeLimitTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CodeSizeLimitTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stCodeSizeLimit"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Create2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Create2Tests.cs deleted file mode 100644 index f4fb73889246..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Create2Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Create2Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stCreate2"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/CreateTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/CreateTests.cs deleted file mode 100644 index fc8e60eee763..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/CreateTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class CreateTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - [Retry(3)] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stCreateTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/DelegateCallTestHomesteadTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/DelegateCallTestHomesteadTests.cs deleted file mode 100644 index 052065f73e28..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/DelegateCallTestHomesteadTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class DelegateCallTestHomesteadTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stDelegatecallTestHomestead"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/EIP150SingleCodeGasPricesTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/EIP150SingleCodeGasPricesTests.cs deleted file mode 100644 index 6b2be886136f..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/EIP150SingleCodeGasPricesTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip150SingleCodeGasPricesTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP150singleCodeGasPrices"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/EIP6110Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/EIP6110Tests.cs deleted file mode 100644 index 9a47a8a81f43..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/EIP6110Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip6110Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP6110"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip150SpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Eip150SpecificTests.cs deleted file mode 100644 index 4776c9a67d41..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip150SpecificTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip150SpecificTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP150Specific"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip1559Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Eip1559Tests.cs deleted file mode 100644 index 7a8131194b5e..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip1559Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip1559Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP1559"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip158SpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Eip158SpecificTests.cs deleted file mode 100644 index 481fe5d12f17..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip158SpecificTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip158SpecificTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP158Specific"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip2537Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Eip2537Tests.cs deleted file mode 100644 index c1d1d2422242..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip2537Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2024 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - // [TestFixture] - // [Parallelizable(ParallelScope.All)] - // public class Eip2537Tests : GeneralStateTestBase - // { - // [TestCaseSource(nameof(LoadTests))] - // public void Test(GeneralStateTest test) - // { - // Assert.That(RunTest(test).Pass, Is.True); - // } - // - // public static IEnumerable LoadTests() - // { - // var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP2537"); - // return loader.LoadTests(); - // } - // } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip2930Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Eip2930Tests.cs deleted file mode 100644 index 942d391022b9..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip2930Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip2930Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP2930"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip3540Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Eip3540Tests.cs deleted file mode 100644 index 8ffc83d518d4..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip3540Tests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test; - -[TestFixture] -[Parallelizable(ParallelScope.All)] -public class Eip3540Tests : GeneralStateTestBase -{ - // ToDo: Eip3540 is in development phase on another branch. This will be uncommented after merging that branch. - - // [TestCaseSource(nameof(LoadTests))] - // public void Test(GeneralStateTest test) - // { - // Assert.That(RunTest(test).Pass, Is.True); - // } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP3540"); - return loader.LoadTests(); - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip3607Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Eip3607Tests.cs deleted file mode 100644 index df29efdabbc2..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip3607Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Eip3607Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP3607"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj b/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj deleted file mode 100644 index 3c6f02d42f4d..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Ethereum.Blockchain.Test.csproj +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - %(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - - - %(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - - - %(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - - - %(RecursiveDir)%(FileName)%(Extension) - PreserveNewest - - - - - - - - - - - PreserveNewest - - - diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ExampleTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ExampleTests.cs deleted file mode 100644 index 46105ac95a38..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ExampleTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ExampleTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stExample"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ExtCodeHashTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ExtCodeHashTests.cs deleted file mode 100644 index 29b1ada04bb5..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ExtCodeHashTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ExtCodeHashTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stExtCodeHash"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/HomesteadSpecificTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/HomesteadSpecificTests.cs deleted file mode 100644 index 6bbe34598eca..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/HomesteadSpecificTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class HomesteadSpecificTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stHomesteadSpecific"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/InitCodeTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/InitCodeTests.cs deleted file mode 100644 index e1ca82e99474..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/InitCodeTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class InitCodeTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stInitCodeTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/LogTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/LogTests.cs deleted file mode 100644 index 725efc21d7b5..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/LogTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class LogTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stLogTests"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/MemExpandingEip150CallsTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/MemExpandingEip150CallsTests.cs deleted file mode 100644 index 482ef80690f6..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/MemExpandingEip150CallsTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class MemExpandingEip150CallsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stMemExpandingEIP150Calls"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/MemoryStressTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/MemoryStressTests.cs deleted file mode 100644 index 317dd72eb377..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/MemoryStressTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class MemoryStressTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stMemoryStressTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/MemoryTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/MemoryTests.cs deleted file mode 100644 index 1888488cc641..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/MemoryTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class MemoryTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - [Retry(3)] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stMemoryTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/MetaTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/MetaTests.cs deleted file mode 100644 index 7636815f1a73..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/MetaTests.cs +++ /dev/null @@ -1,85 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class MetaTests - { - private List excludesDirectories = new List() - { - "stEWASMTests", - "VMTests", - "Specs", - "runtimes", - "ref", - "TestFiles", - "Blockhash", - "stEIP2537", // ToDo Remove this after updating tests - "Data", - "Log", - "TestResults" - }; - - [Test] - public void All_categories_are_tested() - { - string[] directories = Directory.GetDirectories(AppDomain.CurrentDomain.BaseDirectory) - .Select(Path.GetFileName) - .ToArray(); - Type[] types = GetType().Assembly.GetTypes(); - List missingCategories = new List(); - foreach (string directory in directories) - { - string expectedTypeName = ExpectedTypeName(directory).Replace("-", ""); - Type type = types.SingleOrDefault(t => string.Equals(t.Name, expectedTypeName, StringComparison.InvariantCultureIgnoreCase)); - if (type is null && !excludesDirectories.Contains(directory)) - { - if (new DirectoryInfo(directory).GetFiles().Any(f => f.Name.Contains(".resources."))) - { - continue; - } - - missingCategories.Add(directory + " - " + expectedTypeName); - } - } - - foreach (string missing in missingCategories) - { - Console.WriteLine($"{missing} category is missing"); - } - - Assert.That(missingCategories.Count, Is.EqualTo(0)); - } - - private static string ExpectedTypeName(string directory) - { - string expectedTypeName = directory.Remove(0, 2); - if (!expectedTypeName.EndsWith("Tests")) - { - if (!expectedTypeName.EndsWith("Test")) - { - expectedTypeName += "Tests"; - } - else - { - expectedTypeName += "s"; - } - } - - if (directory.StartsWith("vm")) - { - return "Vm" + expectedTypeName; - } - - return expectedTypeName; - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/NonZeroCallTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/NonZeroCallTests.cs deleted file mode 100644 index d37ea0fae231..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/NonZeroCallTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class NonZeroCallsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stNonZeroCallsTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/PreCompiledContracts2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/PreCompiledContracts2Tests.cs deleted file mode 100644 index 27682f6c2ef4..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/PreCompiledContracts2Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class PreCompiledContracts2Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stPreCompiledContracts2"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/PreCompiledContractsTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/PreCompiledContractsTests.cs deleted file mode 100644 index ada9c2822623..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/PreCompiledContractsTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class PreCompiledContractsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stPreCompiledContracts"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/QuadraticComplexityTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/QuadraticComplexityTests.cs deleted file mode 100644 index 56a7f3c50e78..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/QuadraticComplexityTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class QuadraticComplexityTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stQuadraticComplexityTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Random2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/Random2Tests.cs deleted file mode 100644 index b105f5850a02..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/Random2Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class Random2Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stRandom2"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/RandomTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/RandomTests.cs deleted file mode 100644 index 140194260051..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/RandomTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class RandomTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stRandom"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/RecursiveCreateTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/RecursiveCreateTests.cs deleted file mode 100644 index 69bc615c7566..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/RecursiveCreateTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class RecursiveCreateTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stRecursiveCreate"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/RefundTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/RefundTests.cs deleted file mode 100644 index b5a0bd5a403d..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/RefundTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class RefundTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stRefundTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ReturnDataTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ReturnDataTests.cs deleted file mode 100644 index 8be41631af14..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ReturnDataTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ReturnDataTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stReturnDataTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/RevertTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/RevertTests.cs deleted file mode 100644 index 7f1fadb64585..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/RevertTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class RevertTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stRevertTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/SLoadTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/SLoadTests.cs deleted file mode 100644 index 42134fd5e502..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/SLoadTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SLoadTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stSLoadTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/SStoreTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/SStoreTests.cs deleted file mode 100644 index 8723c5ae56c6..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/SStoreTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SStoreTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stSStoreTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/SelfBalanceTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/SelfBalanceTests.cs deleted file mode 100644 index 64b6725d4c79..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/SelfBalanceTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SelfBalanceTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stSelfBalance"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ShiftTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ShiftTests.cs deleted file mode 100644 index df1abbabb21a..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ShiftTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ShiftTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stShift"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/SolidityTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/SolidityTests.cs deleted file mode 100644 index e8caaf346fd9..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/SolidityTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SolidityTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - [Retry(3)] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stSolidityTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/SpecialTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/SpecialTests.cs deleted file mode 100644 index cfeeff65bddb..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/SpecialTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SpecialTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests)), Retry(3)] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stSpecialTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/StackTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/StackTests.cs deleted file mode 100644 index 735c52983f01..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/StackTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class StackTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stStackTests"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/StaticCallTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/StaticCallTests.cs deleted file mode 100644 index 40dc6de1dab0..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/StaticCallTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class StaticCallTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stStaticCall"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/StaticFlagEnabledTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/StaticFlagEnabledTests.cs deleted file mode 100644 index 237b3f2de045..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/StaticFlagEnabledTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class StaticFlagEnabledTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stStaticFlagEnabled"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/SystemOperationsTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/SystemOperationsTests.cs deleted file mode 100644 index 8367c9adb6a4..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/SystemOperationsTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class SystemOperationsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stSystemOperationsTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/TimeConsumingTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/TimeConsumingTests.cs deleted file mode 100644 index 52941d306db6..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/TimeConsumingTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class TimeConsumingTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stTimeConsuming"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/TransactionJsonTest.cs b/src/Nethermind/Ethereum.Blockchain.Test/TransactionJsonTest.cs deleted file mode 100644 index 1467ff8ed394..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/TransactionJsonTest.cs +++ /dev/null @@ -1,39 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using Ethereum.Test.Base; -using FluentAssertions; -using Nethermind.Core; -using Nethermind.Core.Test.Builders; -using Nethermind.Int256; -using Nethermind.Serialization.Json; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class TransactionJsonTest : GeneralStateTestBase - { - [Test] - public void Can_load_access_lists() - { - const string lists = - "{\"accessLists\": [[{\"address\": \"0x0001020304050607080900010203040506070809\", \"storageKeys\": [\"0x00\", \"0x01\"]}]]}"; - - EthereumJsonSerializer serializer = new EthereumJsonSerializer(); - TransactionJson txJson = serializer.Deserialize(lists); - txJson.SecretKey = TestItem.PrivateKeyA.KeyBytes; - txJson.Value = new UInt256[1]; - txJson.GasLimit = new long[1]; - txJson.Data = new byte[1][]; - txJson.AccessLists.Should().NotBeNull(); - txJson.AccessLists[0][0].Address.Should() - .BeEquivalentTo(new Address("0x0001020304050607080900010203040506070809")); - txJson.AccessLists[0][0].StorageKeys[1][0].Should().Be((byte)1); - - Transaction tx = JsonToEthereumTest.Convert(new PostStateJson { Indexes = new IndexesJson() }, txJson); - tx.AccessList.Should().NotBeNull(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/TransactionTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/TransactionTests.cs deleted file mode 100644 index ba200752fc23..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/TransactionTests.cs +++ /dev/null @@ -1,39 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using System.Linq; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class TransactionTests : GeneralStateTestBase - { - // ToDo: This tests are passing on hive tests, but failing here - private readonly string[] ignored = - { - "HighGasPrice_d0g0v0", - "ValueOverflow" - }; - - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - if (ignored.Any(i => test.Name.Contains(i))) - { - return; - } - - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stTransactionTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/TransitionTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/TransitionTests.cs deleted file mode 100644 index 3ef886b011f3..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/TransitionTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class TransitionTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stTransitionTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/WalletTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/WalletTests.cs deleted file mode 100644 index e6e3fd31ca5f..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/WalletTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class WalletTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stWalletTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ZeroCallsRevertTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ZeroCallsRevertTests.cs deleted file mode 100644 index 68cea5976954..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ZeroCallsRevertTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ZeroCallsRevertTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stZeroCallsRevert"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ZeroCallsTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ZeroCallsTests.cs deleted file mode 100644 index 096086050a54..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ZeroCallsTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ZeroCallsTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stZeroCallsTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ZeroKnowledge2Tests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ZeroKnowledge2Tests.cs deleted file mode 100644 index 1fe846bf06a7..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ZeroKnowledge2Tests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ZeroKnowledge2Tests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stZeroKnowledge2"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/ZeroKnowledgeTests.cs b/src/Nethermind/Ethereum.Blockchain.Test/ZeroKnowledgeTests.cs deleted file mode 100644 index 5f06f881b7fa..000000000000 --- a/src/Nethermind/Ethereum.Blockchain.Test/ZeroKnowledgeTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Blockchain.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class ZeroKnowledgeTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stZeroKnowledge"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/BlockGasLimitTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/BlockGasLimitTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/BlockGasLimitTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/BlockGasLimitTests.cs index 6f853f109e67..0f12857feb34 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/BlockGasLimitTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/BlockGasLimitTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/Ethereum.Blockchain.Block.Legacy.Test.csproj b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/Ethereum.Legacy.Blockchain.Block.Test.csproj similarity index 100% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/Ethereum.Blockchain.Block.Legacy.Test.csproj rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/Ethereum.Legacy.Blockchain.Block.Test.csproj diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ExploitTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ExploitTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ExploitTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ExploitTests.cs index d44297e91a30..d38563a0e824 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ExploitTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ExploitTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ForgedTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ForgedTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ForgedTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ForgedTests.cs index 37d1d92d87fd..6dbf8d1ea0db 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ForgedTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ForgedTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ForkStressTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ForkStressTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ForkStressTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ForkStressTests.cs index cb4f161c835f..2b0988961c60 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ForkStressTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ForkStressTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/GasPricerTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/GasPricerTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/GasPricerTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/GasPricerTests.cs index 98a068c5b0b2..d1a0c141532a 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/GasPricerTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/GasPricerTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/InvalidHeaderTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/InvalidHeaderTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/InvalidHeaderTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/InvalidHeaderTests.cs index 2975ea50acf8..c2eec5fa97e0 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/InvalidHeaderTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/InvalidHeaderTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/MultiChainTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/MultiChainTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/MultiChainTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/MultiChainTests.cs index 2c22bb0caf93..7dd8fcbb24cf 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/MultiChainTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/MultiChainTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/RandomBlockchashTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/RandomBlockchashTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/RandomBlockchashTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/RandomBlockchashTests.cs index cbb00404d352..b66985eb9dc9 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/RandomBlockchashTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/RandomBlockchashTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/StateTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/StateTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/StateTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/StateTests.cs index eaad23627cd4..6612de9c947d 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/StateTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/StateTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/TotalDifficulty.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/TotalDifficulty.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/TotalDifficulty.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/TotalDifficulty.cs index ca207702306c..9f6cb0b02d32 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/TotalDifficulty.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/TotalDifficulty.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleHeaderValidityTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleHeaderValidityTests.cs similarity index 94% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleHeaderValidityTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleHeaderValidityTests.cs index bc6b9f69b6dd..a823bd88472b 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleHeaderValidityTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleHeaderValidityTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleSpecialTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleSpecialTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleSpecialTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleSpecialTests.cs index fb95513cba46..652e78a706ec 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleSpecialTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleSpecialTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleTests.cs index 47bb941b4f99..0ac0f05d0698 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/UncleTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/UncleTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ValidBlockTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ValidBlockTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ValidBlockTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ValidBlockTests.cs index a78284dea94e..1768d20b5b5b 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/ValidBlockTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/ValidBlockTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/WalletTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/WalletTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/WalletTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/WalletTests.cs index f38e13ff1ae0..16140af1cae3 100644 --- a/src/Nethermind/Ethereum.Blockchain.Block.Legacy.Test/WalletTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Block.Test/WalletTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Block.Legacy.Test +namespace Ethereum.Legacy.Blockchain.Block.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ArgsZeroOneBalanceTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ArgsZeroOneBalanceTests.cs similarity index 85% rename from src/Nethermind/Ethereum.Blockchain.Legacy.Test/ArgsZeroOneBalanceTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/ArgsZeroOneBalanceTests.cs index 1dd1c0d509b6..73541bf71673 100644 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/ArgsZeroOneBalanceTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ArgsZeroOneBalanceTests.cs @@ -5,10 +5,10 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Legacy.Test; +namespace Ethereum.Legacy.Blockchain.Test; [Parallelizable(ParallelScope.All)] -public class ArgsZeroOneBalanaceTests : GeneralStateTestBase +public class ArgsZeroOneBalanceTests : GeneralStateTestBase { [TestCaseSource(nameof(LoadTests))] public void Test(GeneralStateTest test) diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/AttackTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/AttackTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Legacy.Test/AttackTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/AttackTests.cs index c3c8450efeb5..4ebc59be7490 100644 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/AttackTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/AttackTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Legacy.Test; +namespace Ethereum.Legacy.Blockchain.Test; [Parallelizable(ParallelScope.All)] public class AttackTests : GeneralStateTestBase diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/BadOpCodeTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/BadOpCodeTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Legacy.Test/BadOpCodeTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/BadOpCodeTests.cs index f63fe28d09c7..e2f46d5ae2fc 100644 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/BadOpCodeTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/BadOpCodeTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Legacy.Test; +namespace Ethereum.Legacy.Blockchain.Test; [Parallelizable(ParallelScope.All)] public class BadOpCodeTests : GeneralStateTestBase diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/BugsTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/BugsTests.cs similarity index 87% rename from src/Nethermind/Ethereum.Blockchain.Legacy.Test/BugsTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/BugsTests.cs index 8504d5b4c5f3..ab7f33f57a0e 100644 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/BugsTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/BugsTests.cs @@ -5,10 +5,10 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Legacy.Test; +namespace Ethereum.Legacy.Blockchain.Test; [Parallelizable(ParallelScope.All)] -public class BugsTets : GeneralStateTestBase +public class BugsTests : GeneralStateTestBase { [TestCaseSource(nameof(LoadTests))] public void Test(GeneralStateTest test) diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCodesTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallCodesTests.cs similarity index 93% rename from src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCodesTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallCodesTests.cs index 3ccb9484b531..2092d621f225 100644 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/CallCodesTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallCodesTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Legacy.Test; +namespace Ethereum.Legacy.Blockchain.Test; [Parallelizable(ParallelScope.All)] public class CallCodesTests : GeneralStateTestBase diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip3651WarmCoinbaseTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallCreateCallCodeTests.cs similarity index 70% rename from src/Nethermind/Ethereum.Blockchain.Test/Eip3651WarmCoinbaseTests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallCreateCallCodeTests.cs index f23bedd762d3..b6dc53bdc258 100644 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip3651WarmCoinbaseTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallCreateCallCodeTests.cs @@ -5,11 +5,11 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Test; +namespace Ethereum.Legacy.Blockchain.Test; [TestFixture] [Parallelizable(ParallelScope.All)] -public class Eip3651WarmCoinbaseTests : GeneralStateTestBase +public class CallCreateCallCodeTests : GeneralStateTestBase { [TestCaseSource(nameof(LoadTests))] public void Test(GeneralStateTest test) @@ -19,7 +19,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP3651-warmcoinbase"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCallCreateCallCodeTest"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallDelegateCodesCallCodeHomesteadTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallDelegateCodesCallCodeHomesteadTests.cs new file mode 100644 index 000000000000..25662ec7a4cf --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallDelegateCodesCallCodeHomesteadTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class CallDelegateCodesCallCodeHomesteadTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCallDelegateCodesCallCodeHomestead"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallDelegateCodesHomesteadTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallDelegateCodesHomesteadTests.cs new file mode 100644 index 000000000000..77c197352f62 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CallDelegateCodesHomesteadTests.cs @@ -0,0 +1,24 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class CallDelegateCodesHomesteadTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCallDelegateCodesHomestead"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ChainIdTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ChainIdTests.cs new file mode 100644 index 000000000000..f7a3e6312819 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ChainIdTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ChainIdTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stChainId"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ChangedEIP150Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ChangedEIP150Tests.cs new file mode 100644 index 000000000000..3d00fe7839a6 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ChangedEIP150Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ChangedEIP150Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stChangedEIP150"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CodeCopyTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CodeCopyTests.cs new file mode 100644 index 000000000000..72f63ac92b7c --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CodeCopyTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class CodeCopyTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCodeCopyTest"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CodeSizeLimitTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CodeSizeLimitTests.cs new file mode 100644 index 000000000000..9466e78327bf --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CodeSizeLimitTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class CodeSizeLimitTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCodeSizeLimit"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Create2Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Create2Tests.cs new file mode 100644 index 000000000000..10fe821204c7 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Create2Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class Create2Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCreate2"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CreateTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CreateTests.cs new file mode 100644 index 000000000000..ccf9a43d41c9 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/CreateTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class CreateTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stCreateTest"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/DelegateCallTestHomesteadTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/DelegateCallTestHomesteadTests.cs new file mode 100644 index 000000000000..091f762bf2c1 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/DelegateCallTestHomesteadTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class DelegateCallTestHomesteadTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stDelegatecallTestHomestead"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1153Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1153Tests.cs new file mode 100644 index 000000000000..317726f3ac9a --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1153Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP1153Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP1153"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip1153Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1153transientStorageTests.cs similarity index 78% rename from src/Nethermind/Ethereum.Blockchain.Test/Eip1153Tests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1153transientStorageTests.cs index a0d9ec11c551..a90df15dd407 100644 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip1153Tests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1153transientStorageTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Test; +namespace Ethereum.Legacy.Blockchain.Test; [TestFixture] [Parallelizable(ParallelScope.All)] @@ -19,7 +19,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP1153-transientStorage"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP1153-transientStorage"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP150SingleCodeGasPricesTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP150SingleCodeGasPricesTests.cs new file mode 100644 index 000000000000..bb9f26da51a7 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP150SingleCodeGasPricesTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP150SingleCodeGasPricesTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP150singleCodeGasPrices"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1559Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1559Tests.cs new file mode 100644 index 000000000000..4ed518148d66 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP1559Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP1559Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP1559"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP2930Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP2930Tests.cs new file mode 100644 index 000000000000..3b0aeb5da6a9 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP2930Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP2930Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP2930"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3607Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3607Tests.cs new file mode 100644 index 000000000000..1dff5eccd76b --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3607Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP3607Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP3607"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3651Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3651Tests.cs new file mode 100644 index 000000000000..b3fb35a685af --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3651Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP3651Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP3651"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3651warmcoinbaseTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3651warmcoinbaseTests.cs new file mode 100644 index 000000000000..98f363a2d600 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3651warmcoinbaseTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Blockchain.Legacy.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP3651warmcoinbaseTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP3651-warmcoinbase"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3855Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3855Tests.cs new file mode 100644 index 000000000000..21dc3ab36ea8 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3855Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP3855Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP3855"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3855push0Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3855push0Tests.cs new file mode 100644 index 000000000000..0664789a0407 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3855push0Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Blockchain.Legacy.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP3855push0Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP3855-push0"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3860Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3860Tests.cs new file mode 100644 index 000000000000..e1b713a72159 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3860Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP3860Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP3860"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3860limitmeterinitcodeTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3860limitmeterinitcodeTests.cs new file mode 100644 index 000000000000..b0b53519322b --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP3860limitmeterinitcodeTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Blockchain.Legacy.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP3860limitmeterinitcodeTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP3860-limitmeterinitcode"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP4844Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP4844Tests.cs new file mode 100644 index 000000000000..83a42a8919a1 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP4844Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP4844Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP4844"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip4844Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP4844blobtransactionsTests.cs similarity index 78% rename from src/Nethermind/Ethereum.Blockchain.Test/Eip4844Tests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP4844blobtransactionsTests.cs index 81935e1c6c08..407915ec2b21 100644 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip4844Tests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP4844blobtransactionsTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Test; +namespace Ethereum.Blockchain.Legacy.Test; [TestFixture] [Parallelizable(ParallelScope.All)] @@ -19,7 +19,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP4844-blobtransactions"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP4844-blobtransactions"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip5656Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP5656MCOPYTests.cs similarity index 79% rename from src/Nethermind/Ethereum.Blockchain.Test/Eip5656Tests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP5656MCOPYTests.cs index 5cf5ecd6f7b4..02bb16400ccb 100644 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip5656Tests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP5656MCOPYTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Test; +namespace Ethereum.Blockchain.Legacy.Test; [TestFixture] [Parallelizable(ParallelScope.All)] @@ -19,7 +19,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP5656-MCOPY"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP5656-MCOPY"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP5656Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP5656Tests.cs new file mode 100644 index 000000000000..2fb14f29f097 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/EIP5656Tests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class EIP5656Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP5656"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Eip150SpecificTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Eip150SpecificTests.cs new file mode 100644 index 000000000000..7ec86298dc9a --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Eip150SpecificTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class Eip150SpecificTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP150Specific"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Eip158SpecificTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Eip158SpecificTests.cs new file mode 100644 index 000000000000..d483bd2a50bb --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Eip158SpecificTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class Eip158SpecificTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stEIP158Specific"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Ethereum.Legacy.Blockchain.Test.csproj b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Ethereum.Legacy.Blockchain.Test.csproj new file mode 100644 index 000000000000..11d6c0a0f50d --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Ethereum.Legacy.Blockchain.Test.csproj @@ -0,0 +1,24 @@ + + + + + + + %(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + + + %(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + + + %(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + + + + + + + + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ExampleTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ExampleTests.cs new file mode 100644 index 000000000000..ec25b97acbb9 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ExampleTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ExampleTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stExample"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ExtCodeHashTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ExtCodeHashTests.cs new file mode 100644 index 000000000000..3957461b26b7 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ExtCodeHashTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ExtCodeHashTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stExtCodeHash"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/HomesteadSpecificTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/HomesteadSpecificTests.cs new file mode 100644 index 000000000000..ee0f3361301a --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/HomesteadSpecificTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class HomesteadSpecificTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stHomesteadSpecific"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/InitCodeTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/InitCodeTests.cs new file mode 100644 index 000000000000..62bb11476db6 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/InitCodeTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class InitCodeTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stInitCodeTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/LogTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/LogTests.cs new file mode 100644 index 000000000000..ba4f228944b6 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/LogTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class LogTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stLogTests"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemExpandingEip150CallsTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemExpandingEip150CallsTests.cs new file mode 100644 index 000000000000..e2532ed67de5 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemExpandingEip150CallsTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class MemExpandingEip150CallsTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stMemExpandingEIP150Calls"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemoryStressTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemoryStressTests.cs new file mode 100644 index 000000000000..21d35dd2d638 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemoryStressTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class MemoryStressTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stMemoryStressTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemoryTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemoryTests.cs new file mode 100644 index 000000000000..3501593becb3 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MemoryTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class MemoryTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stMemoryTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MetaTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MetaTests.cs new file mode 100644 index 000000000000..820025aeca94 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/MetaTests.cs @@ -0,0 +1,79 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System; +using System.Collections.Generic; +using System.IO; +using System.Linq; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class MetaTests +{ + private readonly List excludesDirectories = + [ + "stEWASMTests", + "VMTests", + "Specs", + "runtimes", + "ref", + "TestFiles", + "Blockhash", + "Data", + "Log", + "TestResults" + ]; + + [Test] + public void All_categories_are_tested() + { + string[] directories = Directory.GetDirectories(AppDomain.CurrentDomain.BaseDirectory) + .Select(Path.GetFileName) + .ToArray(); + Type[] types = GetType().Assembly.GetTypes(); + List missingCategories = new List(); + foreach (string directory in directories) + { + string expectedTypeName = ExpectedTypeName(directory).Replace("-", ""); + Type type = types.SingleOrDefault(t => string.Equals(t.Name, expectedTypeName, StringComparison.InvariantCultureIgnoreCase)); + if (type is null && !excludesDirectories.Contains(directory)) + { + if (new DirectoryInfo(directory).GetFiles().Any(f => f.Name.Contains(".resources."))) + continue; + + missingCategories.Add(directory + " - " + expectedTypeName); + } + } + + foreach (string missing in missingCategories) + { + Console.WriteLine($"{missing} category is missing"); + } + + Assert.That(missingCategories.Count, Is.EqualTo(0)); + } + + private static string ExpectedTypeName(string directory) + { + string expectedTypeName = directory.Remove(0, 2); + if (!expectedTypeName.EndsWith("Tests")) + { + if (!expectedTypeName.EndsWith("Test")) + { + expectedTypeName += "Tests"; + } + else + { + expectedTypeName += "s"; + } + } + + if (directory.StartsWith("vm")) + return "Vm" + expectedTypeName; + + return expectedTypeName; + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/NonZeroCallsTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/NonZeroCallsTests.cs new file mode 100644 index 000000000000..6c2f75d3bf1d --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/NonZeroCallsTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class NonZeroCallsTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stNonZeroCallsTest"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/PreCompiledContracts2Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/PreCompiledContracts2Tests.cs new file mode 100644 index 000000000000..6f8199287cc2 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/PreCompiledContracts2Tests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class PreCompiledContracts2Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stPreCompiledContracts2"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/PreCompiledContractsTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/PreCompiledContractsTests.cs new file mode 100644 index 000000000000..9496c69c86e7 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/PreCompiledContractsTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class PreCompiledContractsTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stPreCompiledContracts"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/QuadraticComplexityTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/QuadraticComplexityTests.cs new file mode 100644 index 000000000000..18d0a424457b --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/QuadraticComplexityTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class QuadraticComplexityTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stQuadraticComplexityTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Random2Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Random2Tests.cs new file mode 100644 index 000000000000..0b9438f55ef2 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/Random2Tests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class Random2Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRandom2"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RandomTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RandomTests.cs new file mode 100644 index 000000000000..87a08b7798c8 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RandomTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class RandomTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRandom"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RecursiveCreateTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RecursiveCreateTests.cs new file mode 100644 index 000000000000..31081732de2b --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RecursiveCreateTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class RecursiveCreateTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRecursiveCreate"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RefundTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RefundTests.cs new file mode 100644 index 000000000000..0deafc7ed83e --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RefundTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class RefundTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRefundTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ReturnDataTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ReturnDataTests.cs new file mode 100644 index 000000000000..835782b50708 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ReturnDataTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ReturnDataTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stReturnDataTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RevertTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RevertTests.cs new file mode 100644 index 000000000000..d2f622115c43 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/RevertTests.cs @@ -0,0 +1,33 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using System.Linq; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class RevertTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stRevertTest"); + IEnumerable tests = loader.LoadTests(); + HashSet ignoredTests = new() + { + "RevertPrecompiledTouch", + }; + + return tests.Where(t => !ignoredTests.Any(pattern => t.Name.Contains(pattern))); ; + } +} + diff --git a/src/Nethermind/Ethereum.Blockchain.Test/Eip3855Push0Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SLoadTestTests.cs similarity index 70% rename from src/Nethermind/Ethereum.Blockchain.Test/Eip3855Push0Tests.cs rename to src/Nethermind/Ethereum.Legacy.Blockchain.Test/SLoadTestTests.cs index 281c0c6d4fb7..32dc5d064a14 100644 --- a/src/Nethermind/Ethereum.Blockchain.Test/Eip3855Push0Tests.cs +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SLoadTestTests.cs @@ -5,11 +5,10 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Test; +namespace Ethereum.Legacy.Blockchain.Test; -[TestFixture] [Parallelizable(ParallelScope.All)] -public class Eip3855Push0Tests : GeneralStateTestBase +public class SLoadTestTests : GeneralStateTestBase { [TestCaseSource(nameof(LoadTests))] public void Test(GeneralStateTest test) @@ -19,7 +18,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "stEIP3855-push0"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSLoadTest"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SLoadTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SLoadTests.cs new file mode 100644 index 000000000000..f2a986d5a9df --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SLoadTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Blockchain.Legacy.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class SLoadTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSLoadTest"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SStoreTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SStoreTests.cs new file mode 100644 index 000000000000..efca5b0a5427 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SStoreTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class SStoreTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSStoreTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SelfBalanceTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SelfBalanceTests.cs new file mode 100644 index 000000000000..08cc732dcc3e --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SelfBalanceTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class SelfBalanceTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSelfBalance"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ShiftTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ShiftTests.cs new file mode 100644 index 000000000000..556a452dd302 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ShiftTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ShiftTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stShift"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SolidityTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SolidityTests.cs new file mode 100644 index 000000000000..7352761d911e --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SolidityTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class SolidityTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSolidityTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SpecialTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SpecialTests.cs new file mode 100644 index 000000000000..ea9354c0d61a --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SpecialTests.cs @@ -0,0 +1,27 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class SpecialTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + [Retry(3)] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSpecialTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StackTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StackTests.cs new file mode 100644 index 000000000000..2c19e824dec7 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StackTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class StackTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stStackTests"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StaticCallTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StaticCallTests.cs new file mode 100644 index 000000000000..87681c3d153c --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StaticCallTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class StaticCallTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stStaticCall"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StaticFlagEnabledTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StaticFlagEnabledTests.cs new file mode 100644 index 000000000000..c494fcce2fe5 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/StaticFlagEnabledTests.cs @@ -0,0 +1,25 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class StaticFlagEnabledTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stStaticFlagEnabled"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SystemOperationsTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SystemOperationsTests.cs new file mode 100644 index 000000000000..ccaa3d0d4d67 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/SystemOperationsTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class SystemOperationsTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stSystemOperationsTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TimeConsumingTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TimeConsumingTests.cs new file mode 100644 index 000000000000..d5533c02d03c --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TimeConsumingTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class TimeConsumingTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stTimeConsuming"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TransactionTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TransactionTests.cs new file mode 100644 index 000000000000..06351b4d008b --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TransactionTests.cs @@ -0,0 +1,36 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using System.Linq; +using Ethereum.Test.Base; +using Ethereum.Test.Base.Interfaces; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class TransactionTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + try + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stTransactionTest"); + // We don't handle invalid transaction's RLP cases, that are loaded as FailedToLoadTest + return loader.LoadTests().OfType(); + } + catch + { + throw; + } + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TransitionTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TransitionTests.cs new file mode 100644 index 000000000000..cc24e621c1a3 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/TransitionTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class TransitionTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stTransitionTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/WalletTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/WalletTests.cs new file mode 100644 index 000000000000..9e216c9d2bf9 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/WalletTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class WalletTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stWalletTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroCallsRevertTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroCallsRevertTests.cs new file mode 100644 index 000000000000..b74345680f47 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroCallsRevertTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ZeroCallsRevertTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stZeroCallsRevert"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroCallsTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroCallsTests.cs new file mode 100644 index 000000000000..46ffd6c4db2a --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroCallsTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ZeroCallsTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stZeroCallsTest"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroKnowledge2Tests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroKnowledge2Tests.cs new file mode 100644 index 000000000000..e07f237c5a47 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroKnowledge2Tests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ZeroKnowledge2Tests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stZeroKnowledge2"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroKnowledgeTests.cs b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroKnowledgeTests.cs new file mode 100644 index 000000000000..f15cb484eb99 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Blockchain.Test/ZeroKnowledgeTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class ZeroKnowledgeTests : GeneralStateTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public void Test(GeneralStateTest test) + { + Assert.That(RunTest(test).Pass, Is.True); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stZeroKnowledge"); + return loader.LoadTests(); + } +} + diff --git a/src/Nethermind/Ethereum.Legacy.Transition.Test/BerlinToLondonTests.cs b/src/Nethermind/Ethereum.Legacy.Transition.Test/BerlinToLondonTests.cs new file mode 100644 index 000000000000..835f19a5c038 --- /dev/null +++ b/src/Nethermind/Ethereum.Legacy.Transition.Test/BerlinToLondonTests.cs @@ -0,0 +1,26 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using System.Collections.Generic; +using System.Threading.Tasks; +using Ethereum.Test.Base; +using NUnit.Framework; + +namespace Ethereum.Legacy.Transition.Test; + +[TestFixture] +[Parallelizable(ParallelScope.None)] +public class BerlinToLondonTests : BlockchainTestBase +{ + [TestCaseSource(nameof(LoadTests))] + public async Task Test(BlockchainTest test) + { + await RunTest(test); + } + + public static IEnumerable LoadTests() + { + var loader = new TestsSourceLoader(new LoadBlockchainTestsStrategy(), "bcBerlinToLondon"); + return loader.LoadTests(); + } +} diff --git a/src/Nethermind/Ethereum.Transition.Test/ByzantiumToConstantinopleFixTests.cs b/src/Nethermind/Ethereum.Legacy.Transition.Test/ByzantiumToConstantinopleFixTests.cs similarity index 94% rename from src/Nethermind/Ethereum.Transition.Test/ByzantiumToConstantinopleFixTests.cs rename to src/Nethermind/Ethereum.Legacy.Transition.Test/ByzantiumToConstantinopleFixTests.cs index ba743f0ee527..ddad01efea8c 100644 --- a/src/Nethermind/Ethereum.Transition.Test/ByzantiumToConstantinopleFixTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Transition.Test/ByzantiumToConstantinopleFixTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Transition.Test +namespace Ethereum.Legacy.Transition.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Transition.Test/Eip158ToByzantiumTests.cs b/src/Nethermind/Ethereum.Legacy.Transition.Test/Eip158ToByzantiumTests.cs similarity index 94% rename from src/Nethermind/Ethereum.Transition.Test/Eip158ToByzantiumTests.cs rename to src/Nethermind/Ethereum.Legacy.Transition.Test/Eip158ToByzantiumTests.cs index eb0c0dd46b8f..5566a3bffc7c 100644 --- a/src/Nethermind/Ethereum.Transition.Test/Eip158ToByzantiumTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Transition.Test/Eip158ToByzantiumTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Transition.Test +namespace Ethereum.Legacy.Transition.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj b/src/Nethermind/Ethereum.Legacy.Transition.Test/Ethereum.Legacy.Transition.Test.csproj similarity index 100% rename from src/Nethermind/Ethereum.Transition.Test/Ethereum.Transition.Test.csproj rename to src/Nethermind/Ethereum.Legacy.Transition.Test/Ethereum.Legacy.Transition.Test.csproj diff --git a/src/Nethermind/Ethereum.Transition.Test/FrontierToHomesteadTests.cs b/src/Nethermind/Ethereum.Legacy.Transition.Test/FrontierToHomesteadTests.cs similarity index 94% rename from src/Nethermind/Ethereum.Transition.Test/FrontierToHomesteadTests.cs rename to src/Nethermind/Ethereum.Legacy.Transition.Test/FrontierToHomesteadTests.cs index 443fe9e3c27d..62167d3db08e 100644 --- a/src/Nethermind/Ethereum.Transition.Test/FrontierToHomesteadTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Transition.Test/FrontierToHomesteadTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Transition.Test +namespace Ethereum.Legacy.Transition.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Transition.Test/HomesteadToDaoTests.cs b/src/Nethermind/Ethereum.Legacy.Transition.Test/HomesteadToDaoTests.cs similarity index 94% rename from src/Nethermind/Ethereum.Transition.Test/HomesteadToDaoTests.cs rename to src/Nethermind/Ethereum.Legacy.Transition.Test/HomesteadToDaoTests.cs index 9451f5ff36fc..0a213c05a7e7 100644 --- a/src/Nethermind/Ethereum.Transition.Test/HomesteadToDaoTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Transition.Test/HomesteadToDaoTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Transition.Test +namespace Ethereum.Legacy.Transition.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Transition.Test/HomesteadToEip150Tests.cs b/src/Nethermind/Ethereum.Legacy.Transition.Test/HomesteadToEip150Tests.cs similarity index 94% rename from src/Nethermind/Ethereum.Transition.Test/HomesteadToEip150Tests.cs rename to src/Nethermind/Ethereum.Legacy.Transition.Test/HomesteadToEip150Tests.cs index f244d82121ca..54295c08cfd5 100644 --- a/src/Nethermind/Ethereum.Transition.Test/HomesteadToEip150Tests.cs +++ b/src/Nethermind/Ethereum.Legacy.Transition.Test/HomesteadToEip150Tests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Transition.Test +namespace Ethereum.Legacy.Transition.Test { [TestFixture] [Parallelizable(ParallelScope.All)] diff --git a/src/Nethermind/Ethereum.Transition.Test/MergeToShanghaiTests.cs b/src/Nethermind/Ethereum.Legacy.Transition.Test/MergeToShanghaiTests.cs similarity index 79% rename from src/Nethermind/Ethereum.Transition.Test/MergeToShanghaiTests.cs rename to src/Nethermind/Ethereum.Legacy.Transition.Test/MergeToShanghaiTests.cs index f0fb44ba22eb..2aead08dbb68 100644 --- a/src/Nethermind/Ethereum.Transition.Test/MergeToShanghaiTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Transition.Test/MergeToShanghaiTests.cs @@ -6,7 +6,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Transition.Test; +namespace Ethereum.Legacy.Transition.Test; [TestFixture] [Parallelizable(ParallelScope.All)] @@ -20,7 +20,7 @@ public async Task Test(BlockchainTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadBlockchainTestsStrategy(), "bcMergeToShanghai"); + var loader = new TestsSourceLoader(new LoadLegacyBlockchainTestsStrategy(), "bcMergeToShanghai"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Transition.Test/MetaTests.cs b/src/Nethermind/Ethereum.Legacy.Transition.Test/MetaTests.cs similarity index 96% rename from src/Nethermind/Ethereum.Transition.Test/MetaTests.cs rename to src/Nethermind/Ethereum.Legacy.Transition.Test/MetaTests.cs index 73318524654a..8341e536b6fa 100644 --- a/src/Nethermind/Ethereum.Transition.Test/MetaTests.cs +++ b/src/Nethermind/Ethereum.Legacy.Transition.Test/MetaTests.cs @@ -7,7 +7,7 @@ using System.Linq; using NUnit.Framework; -namespace Ethereum.Transition.Test +namespace Ethereum.Legacy.Transition.Test { [TestFixture] [Parallelizable(ParallelScope.All)] @@ -26,9 +26,7 @@ public void All_categories_are_tested() { string expectedTypeName = ExpectedTypeName(directory); if (types.All(t => !string.Equals(t.Name, expectedTypeName, StringComparison.InvariantCultureIgnoreCase))) - { missingCategories.Add(directory); - } } foreach (string missing in missingCategories) diff --git a/src/Nethermind/Ethereum.VM.Test/AbiTests.cs b/src/Nethermind/Ethereum.Legacy.VM.Test/AbiTests.cs similarity index 97% rename from src/Nethermind/Ethereum.VM.Test/AbiTests.cs rename to src/Nethermind/Ethereum.Legacy.VM.Test/AbiTests.cs index 284e159fe91a..32a1caabc2df 100644 --- a/src/Nethermind/Ethereum.VM.Test/AbiTests.cs +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/AbiTests.cs @@ -8,7 +8,7 @@ using Nethermind.Core.Extensions; using NUnit.Framework; -namespace Ethereum.VM.Test; +namespace Ethereum.Legacy.VM.Test; internal class AbiTests { @@ -28,7 +28,7 @@ private static AbiType ToAbiType(string typeName) private static AbiTest Convert(string name, AbiTestJson testJson) { - AbiTest test = new AbiTest(); + AbiTest test = new(); test.Name = name; test.Result = Bytes.FromHexString(testJson.Result); test.Types = testJson.Types.Select(ToAbiType).ToArray(); diff --git a/src/Nethermind/Ethereum.VM.Test/ArithmeticTests.cs b/src/Nethermind/Ethereum.Legacy.VM.Test/ArithmeticTests.cs similarity index 80% rename from src/Nethermind/Ethereum.VM.Test/ArithmeticTests.cs rename to src/Nethermind/Ethereum.Legacy.VM.Test/ArithmeticTests.cs index 692690dba929..6afb75cabdae 100644 --- a/src/Nethermind/Ethereum.VM.Test/ArithmeticTests.cs +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/ArithmeticTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.VM.Test +namespace Ethereum.Legacy.VM.Test { [TestFixture] [Parallelizable(ParallelScope.All)] @@ -19,7 +19,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "vmArithmeticTest"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "VMTests", "vmArithmeticTest"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.VM.Test/BitwiseLogicOperationTests.cs b/src/Nethermind/Ethereum.Legacy.VM.Test/BitwiseLogicOperationTests.cs similarity index 80% rename from src/Nethermind/Ethereum.VM.Test/BitwiseLogicOperationTests.cs rename to src/Nethermind/Ethereum.Legacy.VM.Test/BitwiseLogicOperationTests.cs index b128a507861c..ce7605275998 100644 --- a/src/Nethermind/Ethereum.VM.Test/BitwiseLogicOperationTests.cs +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/BitwiseLogicOperationTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.VM.Test +namespace Ethereum.Legacy.VM.Test { [TestFixture] [Parallelizable(ParallelScope.All)] @@ -19,7 +19,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "vmBitwiseLogicOperation"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "vmBitwiseLogicOperation"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj b/src/Nethermind/Ethereum.Legacy.VM.Test/Ethereum.Legacy.VM.Test.csproj similarity index 87% rename from src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj rename to src/Nethermind/Ethereum.Legacy.VM.Test/Ethereum.Legacy.VM.Test.csproj index 6f57a0eb9757..262db6d8fa6d 100644 --- a/src/Nethermind/Ethereum.VM.Test/Ethereum.VM.Test.csproj +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/Ethereum.Legacy.VM.Test.csproj @@ -10,7 +10,7 @@ %(RecursiveDir)%(FileName)%(Extension) PreserveNewest - + %(RecursiveDir)%(FileName)%(Extension) PreserveNewest diff --git a/src/Nethermind/Ethereum.VM.Test/IOAndFlowOperationsTests.cs b/src/Nethermind/Ethereum.Legacy.VM.Test/IOAndFlowOperationsTests.cs similarity index 81% rename from src/Nethermind/Ethereum.VM.Test/IOAndFlowOperationsTests.cs rename to src/Nethermind/Ethereum.Legacy.VM.Test/IOAndFlowOperationsTests.cs index 1f24fb7077cc..260a281c5ed8 100644 --- a/src/Nethermind/Ethereum.VM.Test/IOAndFlowOperationsTests.cs +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/IOAndFlowOperationsTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.VM.Test +namespace Ethereum.Legacy.VM.Test { [TestFixture] [Parallelizable(ParallelScope.All)] @@ -20,7 +20,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "vmIOAndFlowOperations"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "vmIOAndFlowOperations"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/LogTests.cs b/src/Nethermind/Ethereum.Legacy.VM.Test/LogTests.cs similarity index 89% rename from src/Nethermind/Ethereum.Blockchain.Legacy.Test/LogTests.cs rename to src/Nethermind/Ethereum.Legacy.VM.Test/LogTests.cs index 650a03675f21..b7bd487a2c40 100644 --- a/src/Nethermind/Ethereum.Blockchain.Legacy.Test/LogTests.cs +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/LogTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.Blockchain.Legacy.Test +namespace Ethereum.Legacy.VM.Test { [TestFixture] [Parallelizable(ParallelScope.All)] @@ -19,9 +19,8 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "stLogTests"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "vmLogTest"); return loader.LoadTests(); } } } - diff --git a/src/Nethermind/Ethereum.VM.Test/MetaTests.cs b/src/Nethermind/Ethereum.Legacy.VM.Test/MetaTests.cs similarity index 96% rename from src/Nethermind/Ethereum.VM.Test/MetaTests.cs rename to src/Nethermind/Ethereum.Legacy.VM.Test/MetaTests.cs index 4181e7f42f0d..de21eef49b49 100644 --- a/src/Nethermind/Ethereum.VM.Test/MetaTests.cs +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/MetaTests.cs @@ -7,7 +7,7 @@ using System.Linq; using NUnit.Framework; -namespace Ethereum.VM.Test +namespace Ethereum.Legacy.VM.Test { [TestFixture] [Parallelizable(ParallelScope.All)] @@ -30,9 +30,7 @@ public void All_categories_are_tested() if (types.All(t => !string.Equals(t.Name, expectedTypeName, StringComparison.InvariantCultureIgnoreCase))) { if (new DirectoryInfo(directory).GetFiles().Any(f => f.Name.Contains(".resources."))) - { continue; - } missingCategories.Add(directory + " expected " + expectedTypeName); } diff --git a/src/Nethermind/Ethereum.VM.Test/PerformanceTests.cs b/src/Nethermind/Ethereum.Legacy.VM.Test/PerformanceTests.cs similarity index 82% rename from src/Nethermind/Ethereum.VM.Test/PerformanceTests.cs rename to src/Nethermind/Ethereum.Legacy.VM.Test/PerformanceTests.cs index c9b9dc637a50..84ee86b5a860 100644 --- a/src/Nethermind/Ethereum.VM.Test/PerformanceTests.cs +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/PerformanceTests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.VM.Test +namespace Ethereum.Legacy.VM.Test { [TestFixture] [Parallelizable(ParallelScope.All)] @@ -21,7 +21,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "vmPerformance"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "vmPerformance"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.VM.Test/Tests.cs b/src/Nethermind/Ethereum.Legacy.VM.Test/Tests.cs similarity index 82% rename from src/Nethermind/Ethereum.VM.Test/Tests.cs rename to src/Nethermind/Ethereum.Legacy.VM.Test/Tests.cs index 19a1d8f45def..51a22ccbc3aa 100644 --- a/src/Nethermind/Ethereum.VM.Test/Tests.cs +++ b/src/Nethermind/Ethereum.Legacy.VM.Test/Tests.cs @@ -5,7 +5,7 @@ using Ethereum.Test.Base; using NUnit.Framework; -namespace Ethereum.VM.Test +namespace Ethereum.Legacy.VM.Test { [TestFixture] [Parallelizable(ParallelScope.All)] @@ -20,7 +20,7 @@ public void Test(GeneralStateTest test) public static IEnumerable LoadTests() { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "vmTests"); + var loader = new TestsSourceLoader(new LoadLegacyGeneralStateTestsStrategy(), "vmTests"); return loader.LoadTests(); } } diff --git a/src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs b/src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs index 202c09ade825..296f3da23930 100644 --- a/src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs +++ b/src/Nethermind/Ethereum.Test.Base/BlockchainTestBase.cs @@ -39,7 +39,7 @@ namespace Ethereum.Test.Base; public abstract class BlockchainTestBase { private static readonly ILogger _logger; - private static readonly ILogManager _logManager = new TestLogManager(); + private static readonly ILogManager _logManager = new TestLogManager(LogLevel.Warn); private static ISealValidator Sealer { get; } private static DifficultyCalculatorWrapper DifficultyCalculator { get; } @@ -320,7 +320,7 @@ protected async Task RunTest(BlockchainTest test, Stopwatch? return correctRlp; } - private void InitializeTestState(BlockchainTest test, IWorldState stateProvider, ISpecProvider specProvider) + private static void InitializeTestState(BlockchainTest test, IWorldState stateProvider, ISpecProvider specProvider) { foreach (KeyValuePair accountState in ((IEnumerable>)test.Pre ?? Array.Empty>())) @@ -335,9 +335,7 @@ private void InitializeTestState(BlockchainTest test, IWorldState stateProvider, } stateProvider.Commit(specProvider.GenesisSpec); - stateProvider.CommitTree(0); - stateProvider.Reset(); } diff --git a/src/Nethermind/Ethereum.Test.Base/GeneralTestBase.cs b/src/Nethermind/Ethereum.Test.Base/GeneralTestBase.cs index 998319565324..b9aa74da334a 100644 --- a/src/Nethermind/Ethereum.Test.Base/GeneralTestBase.cs +++ b/src/Nethermind/Ethereum.Test.Base/GeneralTestBase.cs @@ -1,12 +1,8 @@ // SPDX-FileCopyrightText: 2025 Demerzel Solutions Limited // SPDX-License-Identifier: LGPL-3.0-only -using System; -using System.Collections.Generic; -using System.Diagnostics; using Autofac; using Nethermind.Api; -using NUnit.Framework; using Nethermind.Config; using Nethermind.Consensus.Processing; using Nethermind.Consensus.Validators; @@ -16,17 +12,20 @@ using Nethermind.Core.Specs; using Nethermind.Core.Test.Modules; using Nethermind.Crypto; -using Nethermind.Int256; using Nethermind.Evm; using Nethermind.Evm.EvmObjectFormat; -using Nethermind.Evm.Tracing; using Nethermind.Evm.State; +using Nethermind.Evm.Tracing; using Nethermind.Evm.TransactionProcessing; +using Nethermind.Int256; using Nethermind.Logging; using Nethermind.Specs; using Nethermind.Specs.Forks; using Nethermind.Specs.Test; -using Nethermind.State; +using NUnit.Framework; +using System; +using System.Collections.Generic; +using System.Diagnostics; namespace Ethereum.Test.Base { @@ -88,10 +87,10 @@ protected EthereumTestResult RunTest(GeneralStateTest test, ITxTracer txTracer) IMainProcessingContext mainBlockProcessingContext = container.Resolve(); IWorldState stateProvider = mainBlockProcessingContext.WorldState; - using var _ = stateProvider.BeginScope(null); + using IDisposable _ = stateProvider.BeginScope(null); ITransactionProcessor transactionProcessor = mainBlockProcessingContext.TransactionProcessor; - InitializeTestState(test.Pre, stateProvider, specProvider); + InitializeTestState(test.Pre, test.CurrentCoinbase, stateProvider, specProvider); BlockHeader header = new( test.PreviousHash, @@ -149,19 +148,11 @@ protected EthereumTestResult RunTest(GeneralStateTest test, ITxTracer txTracer) } stopwatch.Stop(); + if (txResult is not null && txResult.Value == TransactionResult.Ok) { stateProvider.Commit(specProvider.GetSpec((ForkActivation)1)); stateProvider.CommitTree(1); - - // '@winsvega added a 0-wei reward to the miner , so we had to add that into the state test execution phase. He needed it for retesteth.' - if (!stateProvider.AccountExists(test.CurrentCoinbase)) - { - stateProvider.CreateAccount(test.CurrentCoinbase, 0); - } - - stateProvider.Commit(specProvider.GetSpec((ForkActivation)1)); - stateProvider.RecalculateStateRoot(); } else @@ -179,11 +170,10 @@ protected EthereumTestResult RunTest(GeneralStateTest test, ITxTracer txTracer) _logger.Info($"\nDifferences from expected\n{string.Join("\n", differences)}"); } - // Assert.Zero(differences.Count, "differences"); return testResult; } - public static void InitializeTestState(Dictionary preState, IWorldState stateProvider, ISpecProvider specProvider) + public static void InitializeTestState(Dictionary preState, Address coinbase, IWorldState stateProvider, ISpecProvider specProvider) { foreach (KeyValuePair accountState in preState) { @@ -201,6 +191,13 @@ public static void InitializeTestState(Dictionary preStat stateProvider.Commit(specProvider.GenesisSpec); stateProvider.CommitTree(0); stateProvider.Reset(); + + if (!stateProvider.AccountExists(coinbase)) + { + stateProvider.CreateAccount(coinbase, 0); + stateProvider.Commit(specProvider.GetSpec((ForkActivation)1)); + stateProvider.RecalculateStateRoot(); + } } private List RunAssertions(GeneralStateTest test, IWorldState stateProvider) diff --git a/src/Nethermind/Ethereum.Test.Base/LoadEipTestsStrategy.cs b/src/Nethermind/Ethereum.Test.Base/LoadEipTestsStrategy.cs index 1a8e108ded58..9cd12eed7406 100644 --- a/src/Nethermind/Ethereum.Test.Base/LoadEipTestsStrategy.cs +++ b/src/Nethermind/Ethereum.Test.Base/LoadEipTestsStrategy.cs @@ -16,8 +16,6 @@ public IEnumerable Load(string testsDirectoryName, string wildcard if (!Path.IsPathRooted(testsDirectoryName)) { string testsDirectory = GetGeneralStateTestsDirectory(); - - testDirs = Directory.EnumerateDirectories(testsDirectory, testsDirectoryName, new EnumerationOptions { RecurseSubdirectories = true }); } else diff --git a/src/Nethermind/Ethereum.Test.Base/LoadEofTestsStrategy.cs b/src/Nethermind/Ethereum.Test.Base/LoadEofTestsStrategy.cs index 7344f0b354f3..a26ebf22a005 100644 --- a/src/Nethermind/Ethereum.Test.Base/LoadEofTestsStrategy.cs +++ b/src/Nethermind/Ethereum.Test.Base/LoadEofTestsStrategy.cs @@ -16,8 +16,6 @@ public IEnumerable Load(string testsDirectoryName, string wildcard if (!Path.IsPathRooted(testsDirectoryName)) { string testsDirectory = GetGeneralStateTestsDirectory(); - - testDirs = Directory.EnumerateDirectories(testsDirectory, testsDirectoryName, new EnumerationOptions { RecurseSubdirectories = true }); } else diff --git a/src/Nethermind/Ethereum.Test.Base/LoadGeneralStateTestsStrategy.cs b/src/Nethermind/Ethereum.Test.Base/LoadGeneralStateTestsStrategy.cs index b77bea91383c..19334b8606f0 100644 --- a/src/Nethermind/Ethereum.Test.Base/LoadGeneralStateTestsStrategy.cs +++ b/src/Nethermind/Ethereum.Test.Base/LoadGeneralStateTestsStrategy.cs @@ -16,8 +16,6 @@ public IEnumerable Load(string testsDirectoryName, string wildcard if (!Path.IsPathRooted(testsDirectoryName)) { string testsDirectory = GetGeneralStateTestsDirectory(); - - testDirs = Directory.EnumerateDirectories(testsDirectory, testsDirectoryName, new EnumerationOptions { RecurseSubdirectories = true }); } else diff --git a/src/Nethermind/Ethereum.Test.Base/LoadLegacyBlockchainTestsStrategy.cs b/src/Nethermind/Ethereum.Test.Base/LoadLegacyBlockchainTestsStrategy.cs index 537dd221457c..63dd6d9ca0f0 100644 --- a/src/Nethermind/Ethereum.Test.Base/LoadLegacyBlockchainTestsStrategy.cs +++ b/src/Nethermind/Ethereum.Test.Base/LoadLegacyBlockchainTestsStrategy.cs @@ -33,15 +33,15 @@ public IEnumerable Load(string testsDirectoryName, string wildcard return testJsons; } - private string GetLegacyBlockchainTestsDirectory() + private static string GetLegacyBlockchainTestsDirectory() { - char pathSeparator = Path.AltDirectorySeparatorChar; string currentDirectory = AppDomain.CurrentDomain.BaseDirectory; + string rootDirectory = currentDirectory.Remove(currentDirectory.LastIndexOf("src")); - return Path.Combine(currentDirectory.Remove(currentDirectory.LastIndexOf("src")), "src", "tests", "LegacyTests", "Constantinople", "BlockchainTests"); + return Path.Combine(rootDirectory, "src", "tests", "LegacyTests", "Cancun", "BlockchainTests"); } - private IEnumerable LoadTestsFromDirectory(string testDir, string wildcard) + private static IEnumerable LoadTestsFromDirectory(string testDir, string wildcard) { List testsByName = new(); IEnumerable testFiles = Directory.EnumerateFiles(testDir); diff --git a/src/Nethermind/Ethereum.Test.Base/LoadLegacyGeneralStateTestsStrategy.cs b/src/Nethermind/Ethereum.Test.Base/LoadLegacyGeneralStateTestsStrategy.cs index 99a07a29ac66..60f964c0d9be 100644 --- a/src/Nethermind/Ethereum.Test.Base/LoadLegacyGeneralStateTestsStrategy.cs +++ b/src/Nethermind/Ethereum.Test.Base/LoadLegacyGeneralStateTestsStrategy.cs @@ -33,11 +33,12 @@ public IEnumerable Load(string testsDirectoryName, string wildcard return testJsons; } - private string GetLegacyGeneralStateTestsDirectory() + private static string GetLegacyGeneralStateTestsDirectory() { string currentDirectory = AppDomain.CurrentDomain.BaseDirectory; + string rootDirectory = currentDirectory.Remove(currentDirectory.LastIndexOf("src")); - return Path.Combine(currentDirectory.Remove(currentDirectory.LastIndexOf("src")), "src", "tests", "LegacyTests", "Constantinople", "GeneralStateTests"); + return Path.Combine(rootDirectory, "src", "tests", "LegacyTests", "Cancun", "GeneralStateTests"); } private IEnumerable LoadTestsFromDirectory(string testDir, string wildcard) diff --git a/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj b/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj index 19f745904c0d..8c4d72e50f8f 100644 --- a/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj +++ b/src/Nethermind/Ethereum.Transaction.Test/Ethereum.Transaction.Test.csproj @@ -1,14 +1,19 @@ - + + - + + + + %(RecursiveDir)%(FileName)%(Extension) PreserveNewest + diff --git a/src/Nethermind/Ethereum.Transaction.Test/TransactionJsonTest.cs b/src/Nethermind/Ethereum.Transaction.Test/TransactionJsonTest.cs new file mode 100644 index 000000000000..7e79ef7c51d1 --- /dev/null +++ b/src/Nethermind/Ethereum.Transaction.Test/TransactionJsonTest.cs @@ -0,0 +1,38 @@ +// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited +// SPDX-License-Identifier: LGPL-3.0-only + +using Ethereum.Test.Base; +using FluentAssertions; +using Nethermind.Core; +using Nethermind.Core.Test.Builders; +using Nethermind.Int256; +using Nethermind.Serialization.Json; +using NUnit.Framework; + +namespace Ethereum.Blockchain.Test; + +[TestFixture] +[Parallelizable(ParallelScope.All)] +public class TransactionJsonTest : GeneralStateTestBase +{ + [Test] + public void Can_load_access_lists() + { + const string lists = + "{\"accessLists\": [[{\"address\": \"0x0001020304050607080900010203040506070809\", \"storageKeys\": [\"0x00\", \"0x01\"]}]]}"; + + EthereumJsonSerializer serializer = new EthereumJsonSerializer(); + TransactionJson txJson = serializer.Deserialize(lists); + txJson.SecretKey = TestItem.PrivateKeyA.KeyBytes; + txJson.Value = new UInt256[1]; + txJson.GasLimit = new long[1]; + txJson.Data = new byte[1][]; + txJson.AccessLists.Should().NotBeNull(); + txJson.AccessLists[0][0].Address.Should() + .BeEquivalentTo(new Address("0x0001020304050607080900010203040506070809")); + txJson.AccessLists[0][0].StorageKeys[1][0].Should().Be((byte)1); + + Nethermind.Core.Transaction tx = JsonToEthereumTest.Convert(new PostStateJson { Indexes = new IndexesJson() }, txJson); + tx.AccessList.Should().NotBeNull(); + } +} diff --git a/src/Nethermind/Ethereum.Transition.Test/BerlinToLondonTests.cs b/src/Nethermind/Ethereum.Transition.Test/BerlinToLondonTests.cs deleted file mode 100644 index 6bdc4a8dce38..000000000000 --- a/src/Nethermind/Ethereum.Transition.Test/BerlinToLondonTests.cs +++ /dev/null @@ -1,27 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using System.Threading.Tasks; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.Transition.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.None)] - public class BerlinToLondonTests : BlockchainTestBase - { - [TestCaseSource(nameof(LoadTests))] - public async Task Test(BlockchainTest test) - { - await RunTest(test); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadBlockchainTestsStrategy(), "bcBerlinToLondon"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/Ethereum.VM.Test/LogTests.cs b/src/Nethermind/Ethereum.VM.Test/LogTests.cs deleted file mode 100644 index 2273f4a7c598..000000000000 --- a/src/Nethermind/Ethereum.VM.Test/LogTests.cs +++ /dev/null @@ -1,26 +0,0 @@ -// SPDX-FileCopyrightText: 2022 Demerzel Solutions Limited -// SPDX-License-Identifier: LGPL-3.0-only - -using System.Collections.Generic; -using Ethereum.Test.Base; -using NUnit.Framework; - -namespace Ethereum.VM.Test -{ - [TestFixture] - [Parallelizable(ParallelScope.All)] - public class LogTests : GeneralStateTestBase - { - [TestCaseSource(nameof(LoadTests))] - public void Test(GeneralStateTest test) - { - Assert.That(RunTest(test).Pass, Is.True); - } - - public static IEnumerable LoadTests() - { - var loader = new TestsSourceLoader(new LoadGeneralStateTestsStrategy(), "vmLogTest"); - return loader.LoadTests(); - } - } -} diff --git a/src/Nethermind/EthereumTests.slnx b/src/Nethermind/EthereumTests.slnx index 3f484f1caf62..b5e21d12b74a 100644 --- a/src/Nethermind/EthereumTests.slnx +++ b/src/Nethermind/EthereumTests.slnx @@ -19,6 +19,7 @@ + @@ -47,22 +48,21 @@ - - - + + + + - - diff --git a/src/Nethermind/Nethermind.Consensus.Test/Scheduler/BackgroundTaskSchedulerTests.cs b/src/Nethermind/Nethermind.Consensus.Test/Scheduler/BackgroundTaskSchedulerTests.cs index f6c54aef25e3..94fd09cfe591 100644 --- a/src/Nethermind/Nethermind.Consensus.Test/Scheduler/BackgroundTaskSchedulerTests.cs +++ b/src/Nethermind/Nethermind.Consensus.Test/Scheduler/BackgroundTaskSchedulerTests.cs @@ -54,15 +54,15 @@ public async Task Test_task_will_execute_concurrently_when_configured_so() SemaphoreSlim waitSignal = new SemaphoreSlim(0); scheduler.ScheduleTask(1, async (_, token) => { - counter++; + Interlocked.Increment(ref counter); await waitSignal.WaitAsync(token); - counter--; + Interlocked.Decrement(ref counter); }); scheduler.ScheduleTask(1, async (_, token) => { - counter++; + Interlocked.Increment(ref counter); await waitSignal.WaitAsync(token); - counter--; + Interlocked.Decrement(ref counter); }); Assert.That(() => counter, Is.EqualTo(2).After(5000, 1)); diff --git a/src/tests b/src/tests index 08b5fe38c23c..c67e485ff8b5 160000 --- a/src/tests +++ b/src/tests @@ -1 +1 @@ -Subproject commit 08b5fe38c23c3ea4f88af93e10fbf03b715414f7 +Subproject commit c67e485ff8b5be9abc8ad15345ec21aa22e290d9 diff --git a/tools/Evm/Evm.slnx b/tools/Evm/Evm.slnx index 957bc390ccc4..46e72a9b9238 100644 --- a/tools/Evm/Evm.slnx +++ b/tools/Evm/Evm.slnx @@ -1,3 +1,50 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tools/Evm/T8n/T8nExecutor.cs b/tools/Evm/T8n/T8nExecutor.cs index 72935f0e7674..dec1b583c8a6 100644 --- a/tools/Evm/T8n/T8nExecutor.cs +++ b/tools/Evm/T8n/T8nExecutor.cs @@ -14,23 +14,20 @@ using Nethermind.Core.Specs; using Nethermind.Core.Test; using Nethermind.Crypto; -using Nethermind.Db; using Nethermind.Evm; using Nethermind.Evm.State; -using Nethermind.Evm.Tracing; using Nethermind.Blockchain.Tracing.GethStyle; using Nethermind.Blockchain.Tracing; using Nethermind.Evm.TransactionProcessing; using Nethermind.Logging; using Nethermind.State; -using Nethermind.Trie.Pruning; using Nethermind.Blockchain; namespace Evm.T8n; public static class T8nExecutor { - private static ILogManager _logManager = LimboLogs.Instance; + private static readonly ILogManager _logManager = LimboLogs.Instance; public static T8nExecutionResult Execute(T8nCommandArguments arguments) { @@ -55,7 +52,7 @@ public static T8nExecutionResult Execute(T8nCommandArguments arguments) _logManager); stateProvider.CreateAccount(test.CurrentCoinbase, 0); - GeneralStateTestBase.InitializeTestState(test.Alloc, stateProvider, test.SpecProvider); + GeneralStateTestBase.InitializeTestState(test.Alloc, test.CurrentCoinbase, stateProvider, test.SpecProvider); Block block = test.ConstructBlock(); var withdrawalProcessor = new WithdrawalProcessor(stateProvider, _logManager);