aboutsummaryrefslogtreecommitdiffstats
path: root/tests/vm/gh_test.go
diff options
context:
space:
mode:
authorobscuren <geffobscura@gmail.com>2015-03-17 19:56:29 +0800
committerobscuren <geffobscura@gmail.com>2015-03-17 19:56:29 +0800
commitb0ebccb31e944e7cb7fabbbecf279a5507e513ab (patch)
treeff71c67411c6c0f6370bfb0bcd924c03e6565b4e /tests/vm/gh_test.go
parent17c5ba2b6bfaaeab423f96523b9da13a8fb3febd (diff)
downloaddexon-b0ebccb31e944e7cb7fabbbecf279a5507e513ab.tar
dexon-b0ebccb31e944e7cb7fabbbecf279a5507e513ab.tar.gz
dexon-b0ebccb31e944e7cb7fabbbecf279a5507e513ab.tar.bz2
dexon-b0ebccb31e944e7cb7fabbbecf279a5507e513ab.tar.lz
dexon-b0ebccb31e944e7cb7fabbbecf279a5507e513ab.tar.xz
dexon-b0ebccb31e944e7cb7fabbbecf279a5507e513ab.tar.zst
dexon-b0ebccb31e944e7cb7fabbbecf279a5507e513ab.zip
fixed to
Diffstat (limited to 'tests/vm/gh_test.go')
-rw-r--r--tests/vm/gh_test.go25
1 files changed, 16 insertions, 9 deletions
diff --git a/tests/vm/gh_test.go b/tests/vm/gh_test.go
index 24718de7b..159561c62 100644
--- a/tests/vm/gh_test.go
+++ b/tests/vm/gh_test.go
@@ -6,11 +6,12 @@ import (
"strconv"
"testing"
- "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/common"
+ "github.com/ethereum/go-ethereum/ethdb"
"github.com/ethereum/go-ethereum/logger"
"github.com/ethereum/go-ethereum/state"
"github.com/ethereum/go-ethereum/tests/helper"
+ "github.com/ethereum/go-ethereum/vm"
)
type Account struct {
@@ -39,7 +40,7 @@ func (self Log) Topics() [][]byte {
}
func StateObjectFromAccount(db common.Database, addr string, account Account) *state.StateObject {
- obj := state.NewStateObject(common.Hex2Bytes(addr), db)
+ obj := state.NewStateObject(common.HexToAddress(addr), db)
obj.SetBalance(common.Big(account.Balance))
if common.IsHex(account.Code) {
@@ -80,13 +81,18 @@ func RunVmTest(p string, t *testing.T) {
helper.CreateFileTests(t, p, &tests)
for name, test := range tests {
+ helper.Logger.SetLogLevel(5)
+ vm.Debug = true
+ if name != "TransactionCreateSuicideContract" {
+ continue
+ }
db, _ := ethdb.NewMemDatabase()
- statedb := state.New(nil, db)
+ statedb := state.New(common.Hash{}, db)
for addr, account := range test.Pre {
obj := StateObjectFromAccount(db, addr, account)
statedb.SetStateObject(obj)
for a, v := range account.Storage {
- obj.SetState(helper.FromHex(a), common.NewValue(helper.FromHex(v)))
+ obj.SetState(common.HexToHash(a), common.NewValue(helper.FromHex(v)))
}
}
@@ -134,30 +140,31 @@ func RunVmTest(p string, t *testing.T) {
}
for addr, account := range test.Post {
- obj := statedb.GetStateObject(helper.FromHex(addr))
+ obj := statedb.GetStateObject(common.HexToAddress(addr))
if obj == nil {
continue
}
if len(test.Exec) == 0 {
if obj.Balance().Cmp(common.Big(account.Balance)) != 0 {
- t.Errorf("%s's : (%x) balance failed. Expected %v, got %v => %v\n", name, obj.Address()[:4], account.Balance, obj.Balance(), new(big.Int).Sub(common.Big(account.Balance), obj.Balance()))
+ t.Errorf("%s's : (%x) balance failed. Expected %v, got %v => %v\n", name, obj.Address().Bytes()[:4], account.Balance, obj.Balance(), new(big.Int).Sub(common.Big(account.Balance), obj.Balance()))
}
}
for addr, value := range account.Storage {
- v := obj.GetState(helper.FromHex(addr)).Bytes()
+ v := obj.GetState(common.HexToHash(addr)).Bytes()
vexp := helper.FromHex(value)
if bytes.Compare(v, vexp) != 0 {
- t.Errorf("%s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address()[0:4], addr, vexp, v, common.BigD(vexp), common.BigD(v))
+ t.Errorf("%s's : (%x: %s) storage failed. Expected %x, got %x (%v %v)\n", name, obj.Address().Bytes()[0:4], addr, vexp, v, common.BigD(vexp), common.BigD(v))
}
}
}
if !isVmTest {
statedb.Sync()
- if !bytes.Equal(common.Hex2Bytes(test.PostStateRoot), statedb.Root()) {
+ //if !bytes.Equal(common.Hex2Bytes(test.PostStateRoot), statedb.Root()) {
+ if common.HexToHash(test.PostStateRoot) != statedb.Root() {
t.Errorf("%s's : Post state root error. Expected %s, got %x", name, test.PostStateRoot, statedb.Root())
}
}