diff options
Diffstat (limited to 'cmd/geth')
| -rw-r--r-- | cmd/geth/admin.go | 5 | ||||
| -rw-r--r-- | cmd/geth/js.go | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go index 139395dad..3a58b8881 100644 --- a/cmd/geth/admin.go +++ b/cmd/geth/admin.go @@ -9,10 +9,10 @@ import ( "github.com/ethereum/go-ethereum/cmd/utils" "github.com/ethereum/go-ethereum/common" + "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/core/types" "github.com/ethereum/go-ethereum/rlp" "github.com/ethereum/go-ethereum/rpc" - "github.com/ethereum/go-ethereum/core/state" "github.com/ethereum/go-ethereum/xeth" "github.com/robertkrimen/otto" ) @@ -69,14 +69,13 @@ func (js *jsre) startRPC(call otto.FunctionCall) otto.Value { fmt.Println(err) return otto.FalseValue() } - dataDir := js.ethereum.DataDir l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", addr, port)) if err != nil { fmt.Printf("Can't listen on %s:%d: %v", addr, port, err) return otto.FalseValue() } - go http.Serve(l, rpc.JSONRPC(xeth.New(js.ethereum, nil), dataDir)) + go http.Serve(l, rpc.JSONRPC(xeth.New(js.ethereum, nil))) return otto.TrueValue() } diff --git a/cmd/geth/js.go b/cmd/geth/js.go index 8e88a1c54..59a8469fa 100644 --- a/cmd/geth/js.go +++ b/cmd/geth/js.go @@ -91,8 +91,7 @@ func newJSRE(ethereum *eth.Ethereum, libPath string, interactive bool) *jsre { func (js *jsre) apiBindings() { - ethApi := rpc.NewEthereumApi(js.xeth, js.ethereum.DataDir) - ethApi.Close() + ethApi := rpc.NewEthereumApi(js.xeth) //js.re.Bind("jeth", rpc.NewJeth(ethApi, js.re.ToVal)) jeth := rpc.NewJeth(ethApi, js.re.ToVal, js.re) |