roysc/plugeth
1
0
Fork 0
forked from cerc-io/plugeth
Code Pull Requests Activity

Merge pull request #1186 from obscuren/log_fixes

Browse Source 
tests: log coalescing fixes
This commit is contained in:
Jeffrey Wilcke 2015-06-04 10:49:00 -07:00
commit 8b4605c336
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tests/helper/vm.go
View File

@ -67,7 +67,7 @@ func (self *Env) GetHash(n uint64) common.Hash {
return common.BytesToHash(crypto.Sha3([]byte(big.NewInt(int64(n)).String()))) return common.BytesToHash(crypto.Sha3([]byte(big.NewInt(int64(n)).String())))
} }
func (self *Env) AddLog(log *state.Log) { func (self *Env) AddLog(log *state.Log) {
self.logs = append(self.logs, log) self.state.AddLog(log)
} }
func (self *Env) Depth() int { return self.depth } func (self *Env) Depth() int { return self.depth }
func (self *Env) SetDepth(i int) { self.depth = i } func (self *Env) SetDepth(i int) { self.depth = i }
@ -153,7 +153,7 @@ func RunVm(state *state.StateDB, env, exec map[string]string) ([]byte, state.Log
vmenv.initial = true vmenv.initial = true
ret, err := vmenv.Call(caller, to, data, gas, price, value) ret, err := vmenv.Call(caller, to, data, gas, price, value)
return ret, vmenv.logs, vmenv.Gas, err return ret, vmenv.state.Logs(), vmenv.Gas, err
} }
func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state.Logs, *big.Int, error) { func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state.Logs, *big.Int, error) {
@ -188,7 +188,7 @@ func RunState(statedb *state.StateDB, env, tx map[string]string) ([]byte, state.
} }
statedb.Update() statedb.Update()
return ret, vmenv.logs, vmenv.Gas, err return ret, vmenv.state.Logs(), vmenv.Gas, err
} }
type Message struct { type Message struct {