diff options
| author | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-27 02:06:54 +0800 |
|---|---|---|
| committer | Jeffrey Wilcke <jeffrey@ethereum.org> | 2015-05-27 02:06:54 +0800 |
| commit | a55f408c10ea7ed40e2bd843668b6eb6c2dc038b (patch) | |
| tree | 7b18a025625747508fe1642c4dff645eb23c8aab /rpc | |
| parent | 39b1fe8e44d9a329ec076a6dd5af8312166096ba (diff) | |
| parent | e221a449e069783ca53fd02716066e66baeae1f0 (diff) | |
| download | dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.gz dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.bz2 dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.lz dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.xz dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.tar.zst dexon-a55f408c10ea7ed40e2bd843668b6eb6c2dc038b.zip | |
Merge pull request #1090 from fjl/jsre-fixes
jsre: fixes for concurrent use, improved timer handling
Diffstat (limited to 'rpc')
| -rw-r--r-- | rpc/jeth.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rpc/jeth.go b/rpc/jeth.go index 2097ac30d..61be60dc7 100644 --- a/rpc/jeth.go +++ b/rpc/jeth.go @@ -3,18 +3,18 @@ package rpc import ( "encoding/json" "fmt" + "github.com/ethereum/go-ethereum/jsre" "github.com/robertkrimen/otto" ) type Jeth struct { ethApi *EthereumApi - toVal func(interface{}) otto.Value re *jsre.JSRE } -func NewJeth(ethApi *EthereumApi, toVal func(interface{}) otto.Value, re *jsre.JSRE) *Jeth { - return &Jeth{ethApi, toVal, re} +func NewJeth(ethApi *EthereumApi, re *jsre.JSRE) *Jeth { + return &Jeth{ethApi, re} } func (self *Jeth) err(call otto.FunctionCall, code int, msg string, id interface{}) (response otto.Value) { |