core/vm, eth/tracers: update tests to be nicer

This commit is contained in:
Martin Holst Swende 2018-10-17 15:24:51 +02:00
parent 16065d6800
commit 42f00e390e
No known key found for this signature in database
GPG key ID: 683B438C05A5DDF0
2 changed files with 9 additions and 61 deletions

View file

@ -21,7 +21,7 @@ import (
"testing" "testing"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
) )
@ -43,39 +43,14 @@ func (d *dummyContractRef) SetNonce(uint64) {}
func (d *dummyContractRef) Balance() *big.Int { return new(big.Int) } func (d *dummyContractRef) Balance() *big.Int { return new(big.Int) }
type dummyStatedb struct { type dummyStatedb struct {
state.StateDB
} }
func (dummyStatedb) CreateAccount(common.Address) { panic("implement me") } func (dummyStatedb) GetRefund() uint64 { return 1337 }
func (dummyStatedb) SubBalance(common.Address, *big.Int) { panic("implement me") }
func (dummyStatedb) AddBalance(common.Address, *big.Int) { panic("implement me") }
func (dummyStatedb) GetBalance(common.Address) *big.Int { panic("implement me") }
func (dummyStatedb) GetNonce(common.Address) uint64 { panic("implement me") }
func (dummyStatedb) SetNonce(common.Address, uint64) { panic("implement me") }
func (dummyStatedb) GetCodeHash(common.Address) common.Hash { panic("implement me") }
func (dummyStatedb) GetCode(common.Address) []byte { panic("implement me") }
func (dummyStatedb) SetCode(common.Address, []byte) { panic("implement me") }
func (dummyStatedb) GetCodeSize(common.Address) int { panic("implement me") }
func (dummyStatedb) AddRefund(uint64) { panic("implement me") }
func (dummyStatedb) SubRefund(uint64) { panic("implement me") }
func (dummyStatedb) GetRefund() uint64 { return 1337 }
func (dummyStatedb) GetCommittedState(common.Address, common.Hash) common.Hash { panic("implement me") }
func (dummyStatedb) GetState(common.Address, common.Hash) common.Hash { panic("implement me") }
func (dummyStatedb) SetState(common.Address, common.Hash, common.Hash) { panic("implement me") }
func (dummyStatedb) Suicide(common.Address) bool { panic("implement me") }
func (dummyStatedb) HasSuicided(common.Address) bool { panic("implement me") }
func (dummyStatedb) Exist(common.Address) bool { panic("implement me") }
func (dummyStatedb) Empty(common.Address) bool { panic("implement me") }
func (dummyStatedb) RevertToSnapshot(int) { panic("implement me") }
func (dummyStatedb) Snapshot() int { panic("implement me") }
func (dummyStatedb) AddLog(*types.Log) { panic("implement me") }
func (dummyStatedb) AddPreimage(common.Hash, []byte) { panic("implement me") }
func (dummyStatedb) ForEachStorage(common.Address, func(common.Hash, common.Hash) bool) {
panic("implement me")
}
func TestStoreCapture(t *testing.T) { func TestStoreCapture(t *testing.T) {
var ( var (
env = NewEVM(Context{}, dummyStatedb{}, params.TestChainConfig, Config{}) env = NewEVM(Context{}, &dummyStatedb{}, params.TestChainConfig, Config{})
logger = NewStructLogger(nil) logger = NewStructLogger(nil)
mem = NewMemory() mem = NewMemory()
stack = newstack() stack = newstack()
@ -83,9 +58,7 @@ func TestStoreCapture(t *testing.T) {
) )
stack.push(big.NewInt(1)) stack.push(big.NewInt(1))
stack.push(big.NewInt(0)) stack.push(big.NewInt(0))
var index common.Hash var index common.Hash
logger.CaptureState(env, 0, SSTORE, 0, 0, mem, stack, contract, 0, nil) logger.CaptureState(env, 0, SSTORE, 0, 0, mem, stack, contract, 0, nil)
if len(logger.changedValues[contract.Address()]) == 0 { if len(logger.changedValues[contract.Address()]) == 0 {
t.Fatalf("expected exactly 1 changed value on address %x, got %d", contract.Address(), len(logger.changedValues[contract.Address()])) t.Fatalf("expected exactly 1 changed value on address %x, got %d", contract.Address(), len(logger.changedValues[contract.Address()]))

View file

@ -25,7 +25,7 @@ import (
"time" "time"
"github.com/ethereum/go-ethereum/common" "github.com/ethereum/go-ethereum/common"
"github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/core/state"
"github.com/ethereum/go-ethereum/core/vm" "github.com/ethereum/go-ethereum/core/vm"
"github.com/ethereum/go-ethereum/params" "github.com/ethereum/go-ethereum/params"
) )
@ -45,38 +45,13 @@ func (account) SetCode(common.Hash, []byte) {}
func (account) ForEachStorage(cb func(key, value common.Hash) bool) {} func (account) ForEachStorage(cb func(key, value common.Hash) bool) {}
type dummyStatedb struct { type dummyStatedb struct {
state.StateDB
} }
func (dummyStatedb) CreateAccount(common.Address) { panic("implement me") } func (dummyStatedb) GetRefund() uint64 { return 1337 }
func (dummyStatedb) SubBalance(common.Address, *big.Int) { panic("implement me") }
func (dummyStatedb) AddBalance(common.Address, *big.Int) { panic("implement me") }
func (dummyStatedb) GetBalance(common.Address) *big.Int { panic("implement me") }
func (dummyStatedb) GetNonce(common.Address) uint64 { panic("implement me") }
func (dummyStatedb) SetNonce(common.Address, uint64) { panic("implement me") }
func (dummyStatedb) GetCodeHash(common.Address) common.Hash { panic("implement me") }
func (dummyStatedb) GetCode(common.Address) []byte { panic("implement me") }
func (dummyStatedb) SetCode(common.Address, []byte) { panic("implement me") }
func (dummyStatedb) GetCodeSize(common.Address) int { panic("implement me") }
func (dummyStatedb) AddRefund(uint64) { panic("implement me") }
func (dummyStatedb) SubRefund(uint64) { panic("implement me") }
func (dummyStatedb) GetRefund() uint64 { return 1337 }
func (dummyStatedb) GetCommittedState(common.Address, common.Hash) common.Hash { panic("implement me") }
func (dummyStatedb) GetState(common.Address, common.Hash) common.Hash { panic("implement me") }
func (dummyStatedb) SetState(common.Address, common.Hash, common.Hash) { panic("implement me") }
func (dummyStatedb) Suicide(common.Address) bool { panic("implement me") }
func (dummyStatedb) HasSuicided(common.Address) bool { panic("implement me") }
func (dummyStatedb) Exist(common.Address) bool { panic("implement me") }
func (dummyStatedb) Empty(common.Address) bool { panic("implement me") }
func (dummyStatedb) RevertToSnapshot(int) { panic("implement me") }
func (dummyStatedb) Snapshot() int { panic("implement me") }
func (dummyStatedb) AddLog(*types.Log) { panic("implement me") }
func (dummyStatedb) AddPreimage(common.Hash, []byte) { panic("implement me") }
func (dummyStatedb) ForEachStorage(common.Address, func(common.Hash, common.Hash) bool) {
panic("implement me")
}
func runTrace(tracer *Tracer) (json.RawMessage, error) { func runTrace(tracer *Tracer) (json.RawMessage, error) {
env := vm.NewEVM(vm.Context{BlockNumber: big.NewInt(1)}, dummyStatedb{}, params.TestChainConfig, vm.Config{Debug: true, Tracer: tracer}) env := vm.NewEVM(vm.Context{BlockNumber: big.NewInt(1)}, &dummyStatedb{}, params.TestChainConfig, vm.Config{Debug: true, Tracer: tracer})
contract := vm.NewContract(account{}, account{}, big.NewInt(0), 10000) contract := vm.NewContract(account{}, account{}, big.NewInt(0), 10000)
contract.Code = []byte{byte(vm.PUSH1), 0x1, byte(vm.PUSH1), 0x1, 0x0} contract.Code = []byte{byte(vm.PUSH1), 0x1, byte(vm.PUSH1), 0x1, 0x0}
@ -158,7 +133,7 @@ func TestHaltBetweenSteps(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
env := vm.NewEVM(vm.Context{BlockNumber: big.NewInt(1)}, dummyStatedb{}, params.TestChainConfig, vm.Config{Debug: true, Tracer: tracer}) env := vm.NewEVM(vm.Context{BlockNumber: big.NewInt(1)}, &dummyStatedb{}, params.TestChainConfig, vm.Config{Debug: true, Tracer: tracer})
contract := vm.NewContract(&account{}, &account{}, big.NewInt(0), 0) contract := vm.NewContract(&account{}, &account{}, big.NewInt(0), 0)
tracer.CaptureState(env, 0, 0, 0, 0, nil, nil, contract, 0, nil) tracer.CaptureState(env, 0, 0, 0, 0, nil, nil, contract, 0, nil)