diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-29 02:01:15 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-29 02:01:15 +0800 |
| commit | 21fd31dad8bc6e0291ca405314b516670333c707 (patch) | |
| tree | 34aa6f6d0e1f5c7316f0220f6e0569f916307fa3 /javascript/javascript_runtime.go | |
| parent | a88f609b8ab1e20eb2564d47605985d6b8f593e8 (diff) | |
| parent | 872b2497114209119becf2e8a4d4a5818e2084ee (diff) | |
| download | dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.gz dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.bz2 dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.lz dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.xz dexon-21fd31dad8bc6e0291ca405314b516670333c707.tar.zst dexon-21fd31dad8bc6e0291ca405314b516670333c707.zip | |
Merge branch 'jsonrpc' of github.com:ethereum/go-ethereum into jsonrpc
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), } |