diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-10-01 20:44:53 +0800 |
|---|---|---|
| committer | Péter Szilágyi <peterke@gmail.com> | 2016-10-03 16:24:04 +0800 |
| commit | f1949f4d996933dcfbbb17dc8c1e8ad4d07313ad (patch) | |
| tree | d00977eccdd2b5f618765f5a65bf7f63a080e25e /tests | |
| parent | 968ab8aa4f85649f94352565ac43eb6fe56312ce (diff) | |
| download | go-tangerine-f1949f4d996933dcfbbb17dc8c1e8ad4d07313ad.tar go-tangerine-f1949f4d996933dcfbbb17dc8c1e8ad4d07313ad.tar.gz go-tangerine-f1949f4d996933dcfbbb17dc8c1e8ad4d07313ad.tar.bz2 go-tangerine-f1949f4d996933dcfbbb17dc8c1e8ad4d07313ad.tar.lz go-tangerine-f1949f4d996933dcfbbb17dc8c1e8ad4d07313ad.tar.xz go-tangerine-f1949f4d996933dcfbbb17dc8c1e8ad4d07313ad.tar.zst go-tangerine-f1949f4d996933dcfbbb17dc8c1e8ad4d07313ad.zip | |
[release/1.4.15] cmd, core, internal, light, tests: avoid hashing the code in the VM
(cherry picked from commit cb84e3f02953f2df166ae69369d222dcbbd7d78d)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/block_test_util.go | 3 | ||||
| -rw-r--r-- | tests/util.go | 5 |
2 files changed, 5 insertions, 3 deletions
diff --git a/tests/block_test_util.go b/tests/block_test_util.go index 30bed3402..947bec647 100644 --- a/tests/block_test_util.go +++ b/tests/block_test_util.go @@ -31,6 +31,7 @@ import ( "github.com/ethereum/go-ethereum/core" "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/crypto" "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/event" "github.com/ethereum/go-ethereum/logger/glog" @@ -219,7 +220,7 @@ func (t *BlockTest) InsertPreState(db ethdb.Database) (*state.StateDB, error) { return nil, err } obj := statedb.CreateAccount(common.HexToAddress(addrString)) - obj.SetCode(code) + obj.SetCode(crypto.Keccak256Hash(code), code) obj.SetBalance(balance) obj.SetNonce(nonce) for k, v := range acct.Storage { diff --git a/tests/util.go b/tests/util.go index df3432bdf..48aee4069 100644 --- a/tests/util.go +++ b/tests/util.go @@ -108,12 +108,13 @@ func StateObjectFromAccount(db ethdb.Database, addr string, account Account, onD account.Code = account.Code[2:] } code := common.Hex2Bytes(account.Code) + codeHash := crypto.Keccak256Hash(code) obj := state.NewObject(common.HexToAddress(addr), state.Account{ Balance: common.Big(account.Balance), - CodeHash: crypto.Keccak256(code), + CodeHash: codeHash[:], Nonce: common.Big(account.Nonce).Uint64(), }, onDirty) - obj.SetCode(code) + obj.SetCode(codeHash, code) return obj } |