diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-07-16 18:08:16 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-16 18:08:16 +0800 |
| commit | a4c4125b1155d9276614029163b498a17643f0f2 (patch) | |
| tree | 328c438483cb7c87333190605ec1ef79cfa162a6 /cmd/ethtest/main.go | |
| parent | aa1e052cb41c39363a9930added46dac5b6db832 (diff) | |
| parent | 993b41216092fa6dc20d3755afe322cd1376b398 (diff) | |
| download | go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.gz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.bz2 go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.lz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.xz go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.tar.zst go-tangerine-a4c4125b1155d9276614029163b498a17643f0f2.zip | |
Merge pull request #2814 from karalabe/dao-hard-finalcombo
cmd, core, eth, miner, params, tests: finalize the DAO fork
Diffstat (limited to 'cmd/ethtest/main.go')
| -rw-r--r-- | cmd/ethtest/main.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go index e0ad0a7ea..71465fb55 100644 --- a/cmd/ethtest/main.go +++ b/cmd/ethtest/main.go @@ -74,9 +74,9 @@ func runTestWithReader(test string, r io.Reader) error { var err error switch strings.ToLower(test) { case "bk", "block", "blocktest", "blockchaintest", "blocktests", "blockchaintests": - err = tests.RunBlockTestWithReader(params.MainNetHomesteadBlock, r, skipTests) + err = tests.RunBlockTestWithReader(params.MainNetHomesteadBlock, params.MainNetDAOForkBlock, r, skipTests) case "st", "state", "statetest", "statetests": - rs := tests.RuleSet{HomesteadBlock: params.MainNetHomesteadBlock} + rs := tests.RuleSet{HomesteadBlock: params.MainNetHomesteadBlock, DAOForkBlock: params.MainNetDAOForkBlock, DAOForkSupport: true} err = tests.RunStateTestWithReader(rs, r, skipTests) case "tx", "transactiontest", "transactiontests": err = tests.RunTransactionTestsWithReader(r, skipTests) |