From cb7bc5913c4a13e2c03666b7d5ea9ca4aec34de6 Mon Sep 17 00:00:00 2001 From: meows Date: Fri, 6 Mar 2020 08:35:44 -0600 Subject: [PATCH] tests: tests/testdata merged with ethereum/tests@develop Includes configuration support for new Difficulty tests with EIP2384. Signed-off-by: meows --- tests/difficulty_test_util.go | 8 ++++++++ tests/testdata | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/tests/difficulty_test_util.go b/tests/difficulty_test_util.go index 99e477b3d4..627d3e78eb 100644 --- a/tests/difficulty_test_util.go +++ b/tests/difficulty_test_util.go @@ -98,6 +98,14 @@ var difficultyChainConfigurations = map[string]ctypes.ChainConfigurator{ EIP2200FBlock: big.NewInt(0), // Petersburg DisposalBlock: big.NewInt(0), }, + "EIP2384": &goethereum.ChainConfig{ + Ethash: new(ctypes.EthashConfig), + HomesteadBlock: big.NewInt(0), + ByzantiumBlock: big.NewInt(0), + ConstantinopleBlock: big.NewInt(0), + IstanbulBlock: big.NewInt(0), + MuirGlacierBlock: big.NewInt(0), + }, } type DifficultyTest struct { diff --git a/tests/testdata b/tests/testdata index 763e8c59fa..9626d1a15a 160000 --- a/tests/testdata +++ b/tests/testdata @@ -1 +1 @@ -Subproject commit 763e8c59fa561b93d7e6f32c6e17cf0957e6e4c3 +Subproject commit 9626d1a15ae3d3cd4501370b5642bc221719ea7e