diff options
| author | obscuren <geffobscura@gmail.com> | 2014-11-01 08:18:13 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-11-01 08:18:13 +0800 |
| commit | c8438979a9c5c73bf68a132d5fd0325863ab454b (patch) | |
| tree | 1792da4ffa92e3a225bd37079c0458ea4b101d23 /tests/vm | |
| parent | 141d3caabbfbebbbecac455462a40b6056aa3821 (diff) | |
| parent | 394e0f60c20206c7f7c4c76551d11a2b14b23a4d (diff) | |
| download | dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.gz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.bz2 dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.lz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.xz dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.tar.zst dexon-c8438979a9c5c73bf68a132d5fd0325863ab454b.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Diffstat (limited to 'tests/vm')
| -rw-r--r-- | tests/vm/gh_test.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 0d3c2f93d..da9de6db5 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -4,8 +4,8 @@ import ( "bytes" "testing" - "github.com/ethereum/go-ethereum/ethstate" "github.com/ethereum/go-ethereum/ethutil" + "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/tests/helper" ) @@ -16,8 +16,8 @@ type Account struct { Storage map[string]string } -func StateObjectFromAccount(addr string, account Account) *ethstate.StateObject { - obj := ethstate.NewStateObject(ethutil.Hex2Bytes(addr)) +func StateObjectFromAccount(addr string, account Account) *state.StateObject { + obj := state.NewStateObject(ethutil.Hex2Bytes(addr)) obj.SetBalance(ethutil.Big(account.Balance)) if ethutil.IsHex(account.Code) { @@ -44,7 +44,7 @@ func RunVmTest(p string, t *testing.T) { helper.CreateFileTests(t, p, &tests) for name, test := range tests { - state := ethstate.New(helper.NewTrie()) + state := state.New(helper.NewTrie()) for addr, account := range test.Pre { obj := StateObjectFromAccount(addr, account) state.SetStateObject(obj) |