diff options
| author | obscuren <geffobscura@gmail.com> | 2014-10-18 19:31:20 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2014-10-18 19:31:20 +0800 |
| commit | 20c742e47406c13ebc6427951f6fcf1b0056ea26 (patch) | |
| tree | e8112a93626c0f20ca5aa9ac91ea2d1be07150d9 /ethpipe | |
| parent | a02dc4ccc321bdee2a670eecdf5c3bac01fc290b (diff) | |
| download | go-tangerine-20c742e47406c13ebc6427951f6fcf1b0056ea26.tar.gz go-tangerine-20c742e47406c13ebc6427951f6fcf1b0056ea26.tar.zst go-tangerine-20c742e47406c13ebc6427951f6fcf1b0056ea26.zip | |
Moved ethvm => vm
Diffstat (limited to 'ethpipe')
| -rw-r--r-- | ethpipe/pipe.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ethpipe/pipe.go b/ethpipe/pipe.go index 39ee0ef07..5e5ff7000 100644 --- a/ethpipe/pipe.go +++ b/ethpipe/pipe.go @@ -9,7 +9,7 @@ import ( "github.com/ethereum/eth-go/ethlog" "github.com/ethereum/eth-go/ethstate" "github.com/ethereum/eth-go/ethutil" - "github.com/ethereum/eth-go/ethvm" + "github.com/ethereum/eth-go/vm" ) var logger = ethlog.NewLogger("PIPE") @@ -58,9 +58,9 @@ func (self *Pipe) ExecuteObject(object *Object, data []byte, value, gas, price * self.Vm.State = self.World().State().Copy() - vm := ethvm.New(NewEnv(self.Vm.State, block, value.BigInt(), initiator.Address()), ethvm.Type(ethutil.Config.VmType)) + evm := vm.New(NewEnv(self.Vm.State, block, value.BigInt(), initiator.Address()), vm.Type(ethutil.Config.VmType)) - msg := ethvm.NewExecution(vm, object.Address(), data, gas.BigInt(), price.BigInt(), value.BigInt()) + msg := vm.NewExecution(evm, object.Address(), data, gas.BigInt(), price.BigInt(), value.BigInt()) ret, err := msg.Exec(object.Address(), initiator) fmt.Println("returned from call", ret, err) |