diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-04-01 19:42:19 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2016-04-01 19:42:19 +0800 |
| commit | c58079461bafe508bea9233e2b81852df5188f57 (patch) | |
| tree | 33d4c6a96eed3bf1ce9f69bbef3cbc1561f2b114 /tests/transaction_test_util.go | |
| parent | 10d3466c934bd425a8c941270749a652a588527d (diff) | |
| parent | 1f3596c25af077a3303c554ee6b49404b20f7117 (diff) | |
| download | dexon-c58079461bafe508bea9233e2b81852df5188f57.tar dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.gz dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.bz2 dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.lz dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.xz dexon-c58079461bafe508bea9233e2b81852df5188f57.tar.zst dexon-c58079461bafe508bea9233e2b81852df5188f57.zip | |
Merge pull request #2281 from obscuren/configurable-genesis
core: homestead chain configuration & artificial gas floor target mining flag
Diffstat (limited to 'tests/transaction_test_util.go')
| -rw-r--r-- | tests/transaction_test_util.go | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/transaction_test_util.go b/tests/transaction_test_util.go index 6302b9d5b..178f90284 100644 --- a/tests/transaction_test_util.go +++ b/tests/transaction_test_util.go @@ -21,10 +21,10 @@ import ( "errors" "fmt" "io" - "math/big" "runtime" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/logger/glog" "github.com/ethereum/go-ethereum/params" @@ -91,8 +91,6 @@ func RunTransactionTests(file string, skipTests []string) error { } func runTransactionTests(tests map[string]TransactionTest, skipTests []string) error { - params.HomesteadBlock = big.NewInt(900000) - skipTest := make(map[string]bool, len(skipTests)) for _, name := range skipTests { skipTest[name] = true @@ -166,7 +164,8 @@ func verifyTxFields(txTest TransactionTest, decodedTx *types.Transaction) (err e decodedSender common.Address ) - if params.IsHomestead(common.String2Big(txTest.Blocknumber)) { + chainConfig := &core.ChainConfig{HomesteadBlock: params.MainNetHomesteadBlock} + if chainConfig.IsHomestead(common.String2Big(txTest.Blocknumber)) { decodedSender, err = decodedTx.From() } else { decodedSender, err = decodedTx.FromFrontier() |