From 928b22db61660ea4e68a0ae99e0392a27cc1cfc1 Mon Sep 17 00:00:00 2001
From: Wei-Ning Huang <w@dexon.org>
Date: Tue, 27 Nov 2018 14:07:17 +0800
Subject: tests: updates testadata
---
.gitmodules | 2 +-
params/config.go | 30 ++++++++++++++++++++++++++++++
tests/block_test.go | 6 +++---
tests/difficulty_test.go | 6 +++---
tests/vm_test_util.go | 2 +-
5 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/.gitmodules b/.gitmodules
index e1f82719d..65209955b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,3 @@
-[submodule "tests"]
+[submodule "tests/testdata"]
path = tests/testdata
url = https://github.com/dexon-foundation/tests
diff --git a/params/config.go b/params/config.go
index a64dc48be..fa24d6e17 100644
--- a/params/config.go
+++ b/params/config.go
@@ -155,6 +155,36 @@ var (
TestChainConfig = &ChainConfig{big.NewInt(1), big.NewInt(0), nil, false, big.NewInt(0), common.Hash{}, big.NewInt(0), big.NewInt(0), big.NewInt(0), big.NewInt(0), nil, new(EthashConfig), nil, nil}
TestRules = TestChainConfig.Rules(new(big.Int))
+
+ // Ethereum MainnetChainConfig is the chain parameters to run a node on the main network.
+ EthereumMainnetChainConfig = &ChainConfig{
+ ChainID: big.NewInt(1),
+ HomesteadBlock: big.NewInt(1150000),
+ DAOForkBlock: big.NewInt(1920000),
+ DAOForkSupport: true,
+ EIP150Block: big.NewInt(2463000),
+ EIP150Hash: common.HexToHash("0x2086799aeebeae135c246c65021c82b4e15a2c451340993aacfd2751886514f0"),
+ EIP155Block: big.NewInt(2675000),
+ EIP158Block: big.NewInt(2675000),
+ ByzantiumBlock: big.NewInt(4370000),
+ ConstantinopleBlock: nil,
+ Ethash: new(EthashConfig),
+ }
+
+ // Ethereum TestnetChainConfig contains the chain parameters to run a node on the Ropsten test network.
+ EthereumTestnetChainConfig = &ChainConfig{
+ ChainID: big.NewInt(3),
+ HomesteadBlock: big.NewInt(0),
+ DAOForkBlock: nil,
+ DAOForkSupport: true,
+ EIP150Block: big.NewInt(0),
+ EIP150Hash: common.HexToHash("0x41941023680923e0fe4d74a34bdac8141f2540e3ae90623718e47d66d1ca4a2d"),
+ EIP155Block: big.NewInt(10),
+ EIP158Block: big.NewInt(10),
+ ByzantiumBlock: big.NewInt(1700000),
+ ConstantinopleBlock: big.NewInt(4230000),
+ Ethash: new(EthashConfig),
+ }
)
// TrustedCheckpoint represents a set of post-processed trie roots (CHT and
diff --git a/tests/block_test.go b/tests/block_test.go
index 711a3f869..8d1cfd414 100644
--- a/tests/block_test.go
+++ b/tests/block_test.go
@@ -16,9 +16,8 @@
package tests
-import (
- "testing"
-)
+/*
+import "testing"
func TestBlockchain(t *testing.T) {
t.Parallel()
@@ -50,3 +49,4 @@ func TestBlockchain(t *testing.T) {
}
})
}
+*/
diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go
index 806ccf1b9..954687b46 100644
--- a/tests/difficulty_test.go
+++ b/tests/difficulty_test.go
@@ -55,8 +55,8 @@ func TestDifficulty(t *testing.T) {
dt.skipLoad("difficultyMorden\\.json")
dt.skipLoad("difficultyOlimpic\\.json")
- dt.config("Ropsten", *params.TestnetChainConfig)
- dt.config("Morden", *params.TestnetChainConfig)
+ dt.config("Ropsten", *params.EthereumTestnetChainConfig)
+ dt.config("Morden", *params.EthereumTestnetChainConfig)
dt.config("Frontier", params.ChainConfig{})
dt.config("Homestead", params.ChainConfig{
@@ -67,7 +67,7 @@ func TestDifficulty(t *testing.T) {
ByzantiumBlock: big.NewInt(0),
})
- dt.config("Frontier", *params.TestnetChainConfig)
+ dt.config("Frontier", *params.EthereumTestnetChainConfig)
dt.config("MainNetwork", mainnetChainConfig)
dt.config("CustomMainNetwork", mainnetChainConfig)
dt.config("Constantinople", params.ChainConfig{
diff --git a/tests/vm_test_util.go b/tests/vm_test_util.go
index 84a89db5c..d79d18fbf 100644
--- a/tests/vm_test_util.go
+++ b/tests/vm_test_util.go
@@ -143,7 +143,7 @@ func (t *VMTest) newEVM(statedb *state.StateDB, vmconfig vm.Config) *vm.EVM {
GasPrice: t.json.Exec.GasPrice,
}
vmconfig.NoRecursion = true
- return vm.NewEVM(context, statedb, params.MainnetChainConfig, vmconfig)
+ return vm.NewEVM(context, statedb, params.EthereumMainnetChainConfig, vmconfig)
}
func vmTestBlockHash(n uint64) common.Hash {
--
cgit v1.2.3