diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-07 20:17:48 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-07 20:17:48 +0800 |
| commit | fed3e6a808921fb8274b50043c5c39a24a1bbccf (patch) | |
| tree | d632e95cfce78bd9a99a52bf7f30ee3ff980dfd3 /tests | |
| parent | 032ab665299d75bffc25260e8fa477ace19db06a (diff) | |
| download | dexon-fed3e6a808921fb8274b50043c5c39a24a1bbccf.tar dexon-fed3e6a808921fb8274b50043c5c39a24a1bbccf.tar.gz dexon-fed3e6a808921fb8274b50043c5c39a24a1bbccf.tar.bz2 dexon-fed3e6a808921fb8274b50043c5c39a24a1bbccf.tar.lz dexon-fed3e6a808921fb8274b50043c5c39a24a1bbccf.tar.xz dexon-fed3e6a808921fb8274b50043c5c39a24a1bbccf.tar.zst dexon-fed3e6a808921fb8274b50043c5c39a24a1bbccf.zip | |
Refactored ethutil.Config.Db out
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/helper/init.go | 1 | ||||
| -rw-r--r-- | tests/vm/gh_test.go | 10 |
2 files changed, 6 insertions, 5 deletions
diff --git a/tests/helper/init.go b/tests/helper/init.go index 578314e20..df98b9e42 100644 --- a/tests/helper/init.go +++ b/tests/helper/init.go @@ -16,5 +16,4 @@ func init() { logpkg.AddLogSystem(Logger) ethutil.ReadConfig(".ethtest", "/tmp/ethtest", "") - ethutil.Config.Db, _ = NewMemDatabase() } diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 698b0aefc..2aece215e 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -7,6 +7,7 @@ import ( "testing" "github.com/ethereum/go-ethereum/core/types" + "github.com/ethereum/go-ethereum/ethdb" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/logger" "github.com/ethereum/go-ethereum/state" @@ -38,8 +39,8 @@ func (self Log) Topics() [][]byte { return t } -func StateObjectFromAccount(addr string, account Account) *state.StateObject { - obj := state.NewStateObject(ethutil.Hex2Bytes(addr)) +func StateObjectFromAccount(db ethutil.Database, addr string, account Account) *state.StateObject { + obj := state.NewStateObject(ethutil.Hex2Bytes(addr), db) obj.SetBalance(ethutil.Big(account.Balance)) if ethutil.IsHex(account.Code) { @@ -84,9 +85,10 @@ func RunVmTest(p string, t *testing.T) { continue } */ - statedb := state.New(helper.NewTrie()) + db, _ := ethdb.NewMemDatabase() + statedb := state.New(nil, db) for addr, account := range test.Pre { - obj := StateObjectFromAccount(addr, account) + obj := StateObjectFromAccount(db, addr, account) statedb.SetStateObject(obj) for a, v := range account.Storage { obj.SetState(helper.FromHex(a), ethutil.NewValue(helper.FromHex(v))) |