aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/ethtest
diff options
context:
space:
mode:
authorJeffrey Wilcke <jeffrey@ethereum.org>2016-04-01 19:42:19 +0800
committerJeffrey Wilcke <jeffrey@ethereum.org>2016-04-01 19:42:19 +0800
commitc58079461bafe508bea9233e2b81852df5188f57 (patch)
tree33d4c6a96eed3bf1ce9f69bbef3cbc1561f2b114 /cmd/ethtest
parent10d3466c934bd425a8c941270749a652a588527d (diff)
parent1f3596c25af077a3303c554ee6b49404b20f7117 (diff)
downloadgo-tangerine-c58079461bafe508bea9233e2b81852df5188f57.tar
go-tangerine-c58079461bafe508bea9233e2b81852df5188f57.tar.gz
go-tangerine-c58079461bafe508bea9233e2b81852df5188f57.tar.bz2
go-tangerine-c58079461bafe508bea9233e2b81852df5188f57.tar.lz
go-tangerine-c58079461bafe508bea9233e2b81852df5188f57.tar.xz
go-tangerine-c58079461bafe508bea9233e2b81852df5188f57.tar.zst
go-tangerine-c58079461bafe508bea9233e2b81852df5188f57.zip
Merge pull request #2281 from obscuren/configurable-genesis
core: homestead chain configuration & artificial gas floor target mining flag
Diffstat (limited to 'cmd/ethtest')
-rw-r--r--cmd/ethtest/main.go5
1 files changed, 3 insertions, 2 deletions
diff --git a/cmd/ethtest/main.go b/cmd/ethtest/main.go
index e19dca86b..3916e297f 100644
--- a/cmd/ethtest/main.go
+++ b/cmd/ethtest/main.go
@@ -27,6 +27,7 @@ import (
"github.com/codegangsta/cli"
"github.com/ethereum/go-ethereum/logger/glog"
+ "github.com/ethereum/go-ethereum/params"
"github.com/ethereum/go-ethereum/tests"
)
@@ -73,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(r, skipTests)
+ err = tests.RunBlockTestWithReader(params.MainNetHomesteadBlock, r, skipTests)
case "st", "state", "statetest", "statetests":
- err = tests.RunStateTestWithReader(r, skipTests)
+ err = tests.RunStateTestWithReader(tests.RuleSet{params.MainNetHomesteadBlock}, r, skipTests)
case "tx", "transactiontest", "transactiontests":
err = tests.RunTransactionTestsWithReader(r, skipTests)
case "vm", "vmtest", "vmtests":