diff options
| author | Péter Szilágyi <peterke@gmail.com> | 2016-10-01 21:58:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-10-01 21:58:49 +0800 |
| commit | 0731b44809f72ed5880dc3654ee70ae85420bd77 (patch) | |
| tree | 68eb52c91a136e820f3656e394847c4e695afa63 /tests | |
| parent | d8715fba1a366944a069397775fc52a30358eff3 (diff) | |
| parent | cb84e3f02953f2df166ae69369d222dcbbd7d78d (diff) | |
| download | dexon-0731b44809f72ed5880dc3654ee70ae85420bd77.tar dexon-0731b44809f72ed5880dc3654ee70ae85420bd77.tar.gz dexon-0731b44809f72ed5880dc3654ee70ae85420bd77.tar.bz2 dexon-0731b44809f72ed5880dc3654ee70ae85420bd77.tar.lz dexon-0731b44809f72ed5880dc3654ee70ae85420bd77.tar.xz dexon-0731b44809f72ed5880dc3654ee70ae85420bd77.tar.zst dexon-0731b44809f72ed5880dc3654ee70ae85420bd77.zip | |
Merge pull request #3067 from karalabe/vm-avoid-hashing
cmd, core, internal, light, tests: avoid hashing the code in the VM
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 7da15cebe..7096b866d 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 08fac2dd1..ffbcb9d56 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 } |