diff options
author | obscuren <geffobscura@gmail.com> | 2014-12-03 19:21:12 +0800 |
---|---|---|
committer | obscuren <geffobscura@gmail.com> | 2014-12-03 19:21:12 +0800 |
commit | 3d9a4e7084c33cb28a2265c0dd232a0ea3871c92 (patch) | |
tree | 84b7ccf6ea1ccc4eca0b8ded0a382c1bfe98e190 /tests/vm/gh_test.go | |
parent | f7789220862f67c2aadaf7b6a44fcd54152dd234 (diff) | |
download | dexon-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar dexon-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.gz dexon-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.bz2 dexon-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.lz dexon-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.xz dexon-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.tar.zst dexon-3d9a4e7084c33cb28a2265c0dd232a0ea3871c92.zip |
Fixed mem error in vm. Fixed logs tests
Diffstat (limited to 'tests/vm/gh_test.go')
-rw-r--r-- | tests/vm/gh_test.go | 40 |
1 files changed, 32 insertions, 8 deletions
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go index 5391e0500..523ff46ac 100644 --- a/tests/vm/gh_test.go +++ b/tests/vm/gh_test.go @@ -6,6 +6,7 @@ import ( "strconv" "testing" + "github.com/ethereum/go-ethereum/chain" "github.com/ethereum/go-ethereum/ethutil" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/tests/helper" @@ -18,6 +19,12 @@ type Account struct { Storage map[string]string } +type Log struct { + Address string + Data string + Topics []string +} + func StateObjectFromAccount(addr string, account Account) *state.StateObject { obj := state.NewStateObject(ethutil.Hex2Bytes(addr)) obj.SetBalance(ethutil.Big(account.Balance)) @@ -46,6 +53,7 @@ type VmTest struct { Env Env Exec map[string]string Transaction map[string]string + Logs map[string]Log Gas string Out string Post map[string]Account @@ -57,10 +65,10 @@ func RunVmTest(p string, t *testing.T) { helper.CreateFileTests(t, p, &tests) for name, test := range tests { - state := state.New(helper.NewTrie()) + statedb := state.New(helper.NewTrie()) for addr, account := range test.Pre { obj := StateObjectFromAccount(addr, account) - state.SetStateObject(obj) + statedb.SetStateObject(obj) } // XXX Yeah, yeah... @@ -77,15 +85,16 @@ func RunVmTest(p string, t *testing.T) { } var ( - ret []byte - gas *big.Int - err error + ret []byte + gas *big.Int + err error + logs state.Logs ) if len(test.Exec) > 0 { - ret, gas, err = helper.RunVm(state, env, test.Exec) + ret, logs, gas, err = helper.RunVm(statedb, env, test.Exec) } else { - ret, gas, err = helper.RunState(state, env, test.Transaction) + ret, logs, gas, err = helper.RunState(statedb, env, test.Transaction) } // When an error is returned it doesn't always mean the tests fails. @@ -107,7 +116,7 @@ func RunVmTest(p string, t *testing.T) { } for addr, account := range test.Post { - obj := state.GetStateObject(helper.FromHex(addr)) + obj := statedb.GetStateObject(helper.FromHex(addr)) for addr, value := range account.Storage { v := obj.GetState(helper.FromHex(addr)).Bytes() vexp := helper.FromHex(value) @@ -117,6 +126,16 @@ func RunVmTest(p string, t *testing.T) { } } } + + if len(test.Logs) > 0 { + genBloom := ethutil.LeftPadBytes(chain.LogsBloom(logs).Bytes(), 64) + // Logs within the test itself aren't correct, missing empty fields (32 0s) + for bloom /*logs*/, _ := range test.Logs { + if !bytes.Equal(genBloom, ethutil.Hex2Bytes(bloom)) { + t.Errorf("bloom mismatch") + } + } + } } } @@ -161,6 +180,11 @@ func TestVm(t *testing.T) { RunVmTest(fn, t) } +func TestVmLog(t *testing.T) { + const fn = "../files/vmtests/vmLogTest.json" + RunVmTest(fn, t) +} + func TestStateSystemOperations(t *testing.T) { const fn = "../files/StateTests/stSystemOperationsTest.json" RunVmTest(fn, t) |