diff options
| author | zelig <viktor.tron@gmail.com> | 2014-06-25 23:20:26 +0800 |
|---|---|---|
| committer | zelig <viktor.tron@gmail.com> | 2014-06-25 23:20:26 +0800 |
| commit | 08de13a57b4a59fc4a8ccf9e707ede57cc380a0c (patch) | |
| tree | 94bd0dc4887284c6e0ae57a7b40825dae52eee0e /ethereum/javascript_runtime.go | |
| parent | 6f09a3e8200ba2eeeeb296141d6644d04078a9c4 (diff) | |
| parent | 9654b809120d1cc3c53ffe268fe47869ef0dc0a8 (diff) | |
| download | go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.gz go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.bz2 go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.lz go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.xz go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.tar.zst go-tangerine-08de13a57b4a59fc4a8ccf9e707ede57cc380a0c.zip | |
merge upstream
Diffstat (limited to 'ethereum/javascript_runtime.go')
| -rw-r--r-- | ethereum/javascript_runtime.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ethereum/javascript_runtime.go b/ethereum/javascript_runtime.go index ac05be69b..0a9a882ad 100644 --- a/ethereum/javascript_runtime.go +++ b/ethereum/javascript_runtime.go @@ -144,7 +144,7 @@ func (self *JSRE) initStdFuncs() { eth.Set("require", self.require) eth.Set("stopMining", self.stopMining) eth.Set("startMining", self.startMining) - eth.Set("blockDo", self.execBlock) + eth.Set("execBlock", self.execBlock) } /* @@ -221,7 +221,7 @@ func (self *JSRE) execBlock(call otto.FunctionCall) otto.Value { return otto.UndefinedValue() } - err = self.ethereum.BlockDo(ethutil.FromHex(hash)) + err = utils.BlockDo(self.ethereum, ethutil.FromHex(hash)) if err != nil { fmt.Println(err) return otto.FalseValue() |