internal/ethapi: Fix bug in opCodeWrapper usage

This commit is contained in:
Nick Johnson 2016-08-24 15:50:38 +01:00
parent a2b2c8adc9
commit 8923325d5c
2 changed files with 23 additions and 6 deletions

View File

@ -284,8 +284,10 @@ func (jst *JavascriptTracer) CaptureState(env vm.Environment, pc uint64, op vm.O
jst.stack.stack = stack
jst.db.db = env.Db()
ocw := &opCodeWrapper{op}
jst.log["pc"] = pc
jst.log["op"] = &opCodeWrapper{op}
jst.log["op"] = ocw.toValue(jst.vm)
jst.log["gas"] = gas.Int64()
jst.log["gasPrice"] = cost.Int64()
jst.log["memory"] = jst.memvalue

View File

@ -19,6 +19,7 @@ package ethapi
import (
"errors"
"math/big"
"reflect"
"testing"
"time"
@ -140,12 +141,26 @@ func TestStack(t *testing.T) {
t.Fatal(err)
}
value, ok := ret.([]int)
if !ok {
t.Errorf("Expected return value to be []int, was %T", ret)
expected := []int{0, 1, 2}
if !reflect.DeepEqual(ret, expected) {
t.Errorf("Expected return value to be %#v, got %#v", expected, ret)
}
if len(value) != 3 || value[0] != 0 || value[1] != 1 || value[2] != 2 {
t.Errorf("Expected return value to be [0 1 2], got %v", value)
}
func TestOpcodes(t *testing.T) {
tracer, err := NewJavascriptTracer("{opcodes: [], step: function(log) { this.opcodes.push(log.op.toString()); }, result: function() { return this.opcodes; }}")
if err != nil {
t.Fatal(err)
}
ret, err := runTrace(tracer)
if err != nil {
t.Fatal(err)
}
expected := []string{"PUSH1", "PUSH1", "STOP"}
if !reflect.DeepEqual(ret, expected) {
t.Errorf("Expected return value to be %#v, got %#v", expected, ret)
}
}