diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 23:03:49 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 23:03:49 +0800 |
| commit | 0ac346f7078dba597d60f991c32ddbfd7be167ba (patch) | |
| tree | 33a690fa6ef7cbc8584ff2a1f40f85b28b42ac7f /cmd/geth/admin.go | |
| parent | 9f84c78eb5cceb5f413fbdeafe63786f1b958e83 (diff) | |
| parent | eb102bf4bb0bff773824ff467fbb2e49c1f6939b (diff) | |
| download | go-tangerine-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar go-tangerine-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.gz go-tangerine-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.bz2 go-tangerine-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.lz go-tangerine-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.xz go-tangerine-0ac346f7078dba597d60f991c32ddbfd7be167ba.tar.zst go-tangerine-0ac346f7078dba597d60f991c32ddbfd7be167ba.zip | |
Merge branch 'develop' into rpcargs
Diffstat (limited to 'cmd/geth/admin.go')
| -rw-r--r-- | cmd/geth/admin.go | 5 |
1 files changed, 2 insertions, 3 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() } |