From f52ff0f1e99ee2adbe4bd8f5ffdbce8e19a0b5dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A9ter=20Szil=C3=A1gyi?= <peterke@gmail.com>
Date: Wed, 3 Jun 2020 12:17:54 +0300
Subject: [PATCH] cmd/geth: fix the fork orders for DAO tests
---
cmd/geth/dao_test.go | 6 +++++-
cmd/geth/genesis_test.go | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/cmd/geth/dao_test.go b/cmd/geth/dao_test.go
index cb06038ec..f63b0dc6c 100644
--- a/cmd/geth/dao_test.go
+++ b/cmd/geth/dao_test.go
@@ -39,7 +39,9 @@ var daoOldGenesis = `{
"mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00",
- "config" : {}
+ "config" : {
+ "homesteadBlock" : 0
+ }
}`
// Genesis block for nodes which actively oppose the DAO fork
@@ -54,6 +56,7 @@ var daoNoForkGenesis = `{
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00",
"config" : {
+ "homesteadBlock" : 0,
"daoForkBlock" : 314,
"daoForkSupport" : false
}
@@ -71,6 +74,7 @@ var daoProForkGenesis = `{
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00",
"config" : {
+ "homesteadBlock" : 0,
"daoForkBlock" : 314,
"daoForkSupport" : true
}
diff --git a/cmd/geth/genesis_test.go b/cmd/geth/genesis_test.go
index 9ac2dded9..ee3991acd 100644
--- a/cmd/geth/genesis_test.go
+++ b/cmd/geth/genesis_test.go
@@ -58,7 +58,7 @@ var customGenesisTests = []struct {
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00",
"config" : {
- "homesteadBlock" : 314,
+ "homesteadBlock" : 42,
"daoForkBlock" : 141,
"daoForkSupport" : true
}
--
GitLab