diff options
| author | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
|---|---|---|
| committer | Ethan Buchman <ethan@coinculture.info> | 2015-02-18 08:25:18 +0800 |
| commit | 2ba65f4fbaea49c1e0d99959b0331e09b153f931 (patch) | |
| tree | add8cabb05cd7fbf0ba4b4bbaf9460dacfc2082d /javascript/javascript_runtime.go | |
| parent | 2da367a2bee84d74d1bb0ea1b42d4c22fae486dd (diff) | |
| parent | 60318c96d03bcaaf731802b1080a3d87cb482124 (diff) | |
| download | dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.gz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.bz2 dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.lz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.xz dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.tar.zst dexon-2ba65f4fbaea49c1e0d99959b0331e09b153f931.zip | |
Merge branch 'develop' of https://github.com/ethereum/go-ethereum into develop
Diffstat (limited to 'javascript/javascript_runtime.go')
| -rw-r--r-- | javascript/javascript_runtime.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go index adc9022b7..0aa0f73e2 100644 --- a/javascript/javascript_runtime.go +++ b/javascript/javascript_runtime.go @@ -24,7 +24,7 @@ var jsrelogger = logger.NewLogger("JSRE") type JSRE struct { ethereum *eth.Ethereum Vm *otto.Otto - pipe *xeth.JSXEth + pipe *xeth.XEth events event.Subscription @@ -49,7 +49,7 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE { re := &JSRE{ ethereum, otto.New(), - xeth.NewJSXEth(ethereum), + xeth.New(ethereum), nil, make(map[string][]otto.Value), } @@ -58,8 +58,7 @@ func NewJSRE(ethereum *eth.Ethereum) *JSRE { re.Vm.Run(jsLib) // Load extra javascript files - re.LoadIntFile("string.js") - re.LoadIntFile("big.js") + re.LoadIntFile("bignumber.min.js") // Subscribe to events mux := ethereum.EventMux() @@ -198,12 +197,13 @@ func (self *JSRE) watch(call otto.FunctionCall) otto.Value { } func (self *JSRE) addPeer(call otto.FunctionCall) otto.Value { - host, err := call.Argument(0).ToString() + nodeURL, err := call.Argument(0).ToString() if err != nil { return otto.FalseValue() } - self.ethereum.SuggestPeer(host) - + if err := self.ethereum.SuggestPeer(nodeURL); err != nil { + return otto.FalseValue() + } return otto.TrueValue() } |