diff options
| author | obscuren <geffobscura@gmail.com> | 2015-01-29 01:36:41 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-01-29 01:36:41 +0800 |
| commit | 1c51e12c181fb781cafaf34fc8dd2cb07fd85df7 (patch) | |
| tree | 38465edc586ae8080018f37efa8657c7dfeab6af /javascript/javascript_runtime.go | |
| parent | 45e15f62f594d6f5191e60a54aead33602838e98 (diff) | |
| parent | 872b2497114209119becf2e8a4d4a5818e2084ee (diff) | |
| download | go-tangerine-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar go-tangerine-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.gz go-tangerine-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.bz2 go-tangerine-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.lz go-tangerine-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.xz go-tangerine-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.tar.zst go-tangerine-1c51e12c181fb781cafaf34fc8dd2cb07fd85df7.zip | |
Merge branch 'jsonrpc' into qt5.4
Diffstat (limited to 'javascript/javascript_runtime.go')
| -rw-r--r-- | javascript/javascript_runtime.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/javascript/javascript_runtime.go b/javascript/javascript_runtime.go index adc9022b7..c780eb754 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), } |