aboutsummaryrefslogtreecommitdiffstats
path: root/cmd/evm/main.go
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2014-12-22 01:42:32 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2014-12-22 01:42:32 +0800
commit1360f027d9e365242466ca346b2b56f421729d91 (patch)
treea30ff7292e87583781b682b47d851d0f6e1925fc /cmd/evm/main.go
parentb3629c6f62bd3774eb8858819a8ee07dfb775b73 (diff)
parent795b14330ad4399ef292835eac452d258dcd7464 (diff)
downloaddexon-1360f027d9e365242466ca346b2b56f421729d91.tar
dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.gz
dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.bz2
dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.lz
dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.xz
dexon-1360f027d9e365242466ca346b2b56f421729d91.tar.zst
dexon-1360f027d9e365242466ca346b2b56f421729d91.zip
Merge pull request #216 from ethereum/develop
Update tests branch from develop
Diffstat (limited to 'cmd/evm/main.go')
-rw-r--r--cmd/evm/main.go6
1 files changed, 2 insertions, 4 deletions
diff --git a/cmd/evm/main.go b/cmd/evm/main.go
index 1e6c807b1..2bdfdfa9f 100644
--- a/cmd/evm/main.go
+++ b/cmd/evm/main.go
@@ -133,7 +133,7 @@ func (self *VMEnv) Value() *big.Int { return self.value }
func (self *VMEnv) GasLimit() *big.Int { return big.NewInt(1000000000) }
func (self *VMEnv) Depth() int { return 0 }
func (self *VMEnv) SetDepth(i int) { self.depth = i }
-func (self *VMEnv) AddLog(log *state.Log) {
+func (self *VMEnv) AddLog(log state.Log) {
self.state.AddLog(log)
}
func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
@@ -141,9 +141,7 @@ func (self *VMEnv) Transfer(from, to vm.Account, amount *big.Int) error {
}
func (self *VMEnv) vm(addr, data []byte, gas, price, value *big.Int) *core.Execution {
- evm := vm.New(self, vm.DebugVmTy)
-
- return core.NewExecution(evm, addr, data, gas, price, value)
+ return core.NewExecution(self, addr, data, gas, price, value)
}
func (self *VMEnv) Call(caller vm.ClosureRef, addr, data []byte, gas, price, value *big.Int) ([]byte, error) {