diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-23 04:45:56 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-03-23 04:45:56 +0800 |
| commit | 3133372a6a81c91528afbde58e22b3f9df257d03 (patch) | |
| tree | 16778611a22c9fd249a94c88660cb0c6d297ce9b /cmd | |
| parent | 59eab49cb849ca93b9608763f4842654e8044d0f (diff) | |
| parent | 85acdadcfa99ea5c74907029cb63919cc0302c1a (diff) | |
| download | dexon-3133372a6a81c91528afbde58e22b3f9df257d03.tar dexon-3133372a6a81c91528afbde58e22b3f9df257d03.tar.gz dexon-3133372a6a81c91528afbde58e22b3f9df257d03.tar.bz2 dexon-3133372a6a81c91528afbde58e22b3f9df257d03.tar.lz dexon-3133372a6a81c91528afbde58e22b3f9df257d03.tar.xz dexon-3133372a6a81c91528afbde58e22b3f9df257d03.tar.zst dexon-3133372a6a81c91528afbde58e22b3f9df257d03.zip | |
Merge pull request #536 from zsfelfoldi/develop
using robertkrimen/otto, godeps updated
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/ethereum/admin.go | 2 | ||||
| -rw-r--r-- | cmd/ethereum/js.go | 9 | ||||
| -rw-r--r-- | cmd/ethereum/js_test.go | 2 |
3 files changed, 10 insertions, 3 deletions
diff --git a/cmd/ethereum/admin.go b/cmd/ethereum/admin.go index 41aaf46d8..65adb4086 100644 --- a/cmd/ethereum/admin.go +++ b/cmd/ethereum/admin.go @@ -14,7 +14,7 @@ import ( "github.com/ethereum/go-ethereum/rpc" "github.com/ethereum/go-ethereum/state" "github.com/ethereum/go-ethereum/xeth" - "github.com/obscuren/otto" + "github.com/robertkrimen/otto" ) /* diff --git a/cmd/ethereum/js.go b/cmd/ethereum/js.go index b4b54b7e6..88d16d6a8 100644 --- a/cmd/ethereum/js.go +++ b/cmd/ethereum/js.go @@ -91,7 +91,14 @@ func newJSRE(ethereum *eth.Ethereum, libPath string) *jsre { func (js *jsre) apiBindings() { ethApi := rpc.NewEthereumApi(js.xeth, js.ethereum.DataDir) - js.re.Bind("jeth", rpc.NewJeth(ethApi, js.re.ToVal)) + //js.re.Bind("jeth", rpc.NewJeth(ethApi, js.re.ToVal)) + + jeth := rpc.NewJeth(ethApi, js.re.ToVal, js.re) + //js.re.Bind("jeth", jeth) + js.re.Set("jeth", struct{}{}) + t, _ := js.re.Get("jeth") + jethObj := t.Object() + jethObj.Set("send", jeth.Send) _, err := js.re.Eval(re.BigNumber_JS) diff --git a/cmd/ethereum/js_test.go b/cmd/ethereum/js_test.go index 0d3c22553..e3806d24d 100644 --- a/cmd/ethereum/js_test.go +++ b/cmd/ethereum/js_test.go @@ -2,7 +2,7 @@ package main import ( "fmt" - "github.com/obscuren/otto" + "github.com/robertkrimen/otto" "os" "path" "testing" |