gaspersic/go-ethereum
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed mem error in vm. Fixed logs tests

Browse Source
This commit is contained in:
obscuren
2014-12-03 12:21:12 +01:00
parent f778922086
commit 3d9a4e7084
8 changed files with 59 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
tests/helper/vm.go
View File

@ -20,6 +20,8 @@ type Env struct {
time int64
difficulty *big.Int
gasLimit *big.Int
logs state.Logs
}
func NewEnv(state *state.State) *Env {
@ -51,24 +53,27 @@ func (self *Env) Difficulty() *big.Int { return self.difficulty }
func (self *Env) BlockHash() []byte { return nil }
func (self *Env) State() *state.State { return self.state }
func (self *Env) GasLimit() *big.Int { return self.gasLimit }
func (self *Env) AddLog(*state.Log) {}
func (self *Env) AddLog(log *state.Log) {
self.logs = append(self.logs, log)
}
func (self *Env) Transfer(from, to vm.Account, amount *big.Int) error {
return vm.Transfer(from, to, amount)
}
func RunVm(state *state.State, env, exec map[string]string) ([]byte, *big.Int, error) {
func RunVm(state *state.State, env, exec map[string]string) ([]byte, state.Logs, *big.Int, error) {
address := FromHex(exec["address"])
caller := state.GetOrNewStateObject(FromHex(exec["caller"]))
evm := vm.New(NewEnvFromMap(state, env, exec), vm.DebugVmTy)
vmenv := NewEnvFromMap(state, env, exec)
evm := vm.New(vmenv, vm.DebugVmTy)
execution := vm.NewExecution(evm, address, FromHex(exec["data"]), ethutil.Big(exec["gas"]), ethutil.Big(exec["gasPrice"]), ethutil.Big(exec["value"]))
execution.SkipTransfer = true
ret, err := execution.Exec(address, caller)
return ret, execution.Gas, err
return ret, vmenv.logs, execution.Gas, err
}
func RunState(state *state.State, env, tx map[string]string) ([]byte, *big.Int, error) {
func RunState(state *state.State, env, tx map[string]string) ([]byte, state.Logs, *big.Int, error) {
address := FromHex(tx["to"])
keyPair, _ := crypto.NewKeyPairFromSec([]byte(ethutil.Hex2Bytes(tx["secretKey"])))
caller := state.GetOrNewStateObject(keyPair.Address())
@ -79,5 +84,5 @@ func RunState(state *state.State, env, tx map[string]string) ([]byte, *big.Int,
execution := vm.NewExecution(evm, address, FromHex(tx["data"]), ethutil.Big(tx["gasLimit"]), ethutil.Big(tx["gasPrice"]), ethutil.Big(tx["value"]))
ret, err := execution.Exec(address, caller)
return ret, execution.Gas, err
return ret, vmenv.logs, execution.Gas, err
}