cmd/geth: fix the fork orders for DAO tests

release/1.9
Péter Szilágyi 4 years ago
parent 890757f03a
commit f52ff0f1e9
No known key found for this signature in database
GPG Key ID: E9AE538CEDF8293D
  1. 6
      cmd/geth/dao_test.go
  2. 2
      cmd/geth/genesis_test.go

@ -39,7 +39,9 @@ var daoOldGenesis = `{
"mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000", "mixhash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00", "timestamp" : "0x00",
"config" : {} "config" : {
"homesteadBlock" : 0
}
}` }`
// Genesis block for nodes which actively oppose the DAO fork // Genesis block for nodes which actively oppose the DAO fork
@ -54,6 +56,7 @@ var daoNoForkGenesis = `{
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00", "timestamp" : "0x00",
"config" : { "config" : {
"homesteadBlock" : 0,
"daoForkBlock" : 314, "daoForkBlock" : 314,
"daoForkSupport" : false "daoForkSupport" : false
} }
@ -71,6 +74,7 @@ var daoProForkGenesis = `{
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00", "timestamp" : "0x00",
"config" : { "config" : {
"homesteadBlock" : 0,
"daoForkBlock" : 314, "daoForkBlock" : 314,
"daoForkSupport" : true "daoForkSupport" : true
} }

@ -58,7 +58,7 @@ var customGenesisTests = []struct {
"parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000", "parentHash" : "0x0000000000000000000000000000000000000000000000000000000000000000",
"timestamp" : "0x00", "timestamp" : "0x00",
"config" : { "config" : {
"homesteadBlock" : 314, "homesteadBlock" : 42,
"daoForkBlock" : 141, "daoForkBlock" : 141,
"daoForkSupport" : true "daoForkSupport" : true
} }

Loading…
Cancel
Save