aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/block_test_util.go1
-rw-r--r--tests/difficulty_test.go2
-rw-r--r--tests/init.go18
-rw-r--r--tests/transaction_test.go2
4 files changed, 12 insertions, 11 deletions
diff --git a/tests/block_test_util.go b/tests/block_test_util.go
index a72799f6e..2db47da57 100644
--- a/tests/block_test_util.go
+++ b/tests/block_test_util.go
@@ -42,6 +42,7 @@ type BlockTest struct {
json btJSON
}
+// UnmarshalJSON implements json.Unmarshaler interface.
func (t *BlockTest) UnmarshalJSON(in []byte) error {
return json.Unmarshal(in, &t.json)
}
diff --git a/tests/difficulty_test.go b/tests/difficulty_test.go
index 600637300..20294cc9d 100644
--- a/tests/difficulty_test.go
+++ b/tests/difficulty_test.go
@@ -27,7 +27,7 @@ import (
var (
mainnetChainConfig = params.ChainConfig{
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(1150000),
DAOForkBlock: big.NewInt(1920000),
DAOForkSupport: true,
diff --git a/tests/init.go b/tests/init.go
index 0bea5ccd6..af65f9206 100644
--- a/tests/init.go
+++ b/tests/init.go
@@ -26,26 +26,26 @@ import (
// Forks table defines supported forks and their chain config.
var Forks = map[string]*params.ChainConfig{
"Frontier": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
},
"Homestead": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(0),
},
"EIP150": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(0),
EIP150Block: big.NewInt(0),
},
"EIP158": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(0),
EIP150Block: big.NewInt(0),
EIP155Block: big.NewInt(0),
EIP158Block: big.NewInt(0),
},
"Byzantium": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(0),
EIP150Block: big.NewInt(0),
EIP155Block: big.NewInt(0),
@@ -54,22 +54,22 @@ var Forks = map[string]*params.ChainConfig{
ByzantiumBlock: big.NewInt(0),
},
"FrontierToHomesteadAt5": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(5),
},
"HomesteadToEIP150At5": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(0),
EIP150Block: big.NewInt(5),
},
"HomesteadToDaoAt5": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(0),
DAOForkBlock: big.NewInt(5),
DAOForkSupport: true,
},
"EIP158ToByzantiumAt5": {
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
HomesteadBlock: big.NewInt(0),
EIP150Block: big.NewInt(0),
EIP155Block: big.NewInt(0),
diff --git a/tests/transaction_test.go b/tests/transaction_test.go
index c743996c2..42ad81877 100644
--- a/tests/transaction_test.go
+++ b/tests/transaction_test.go
@@ -35,7 +35,7 @@ func TestTransaction(t *testing.T) {
EIP150Block: big.NewInt(0),
EIP155Block: big.NewInt(0),
EIP158Block: big.NewInt(0),
- ChainId: big.NewInt(1),
+ ChainID: big.NewInt(1),
})
txt.config(`^Byzantium/`, params.ChainConfig{
HomesteadBlock: big.NewInt(0),