diff options
| author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 16:36:18 +0800 |
|---|---|---|
| committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-03-27 16:36:18 +0800 |
| commit | e29396b6915a27d3e44be45fe9e540c6ef39f1dd (patch) | |
| tree | 079f5dc51816ae63ea2e7b5547d5b24e798aaf04 /cmd | |
| parent | b0b0939879b9fb8453ec1c8fa2ceb522e56df3bc (diff) | |
| download | go-tangerine-e29396b6915a27d3e44be45fe9e540c6ef39f1dd.tar.gz go-tangerine-e29396b6915a27d3e44be45fe9e540c6ef39f1dd.tar.zst go-tangerine-e29396b6915a27d3e44be45fe9e540c6ef39f1dd.zip | |
Use ExtraDB for storage. Fixes #577
Diffstat (limited to 'cmd')
| -rw-r--r-- | cmd/geth/admin.go | 5 | ||||
| -rw-r--r-- | cmd/geth/js.go | 3 | ||||
| -rw-r--r-- | cmd/utils/flags.go | 3 |
3 files changed, 4 insertions, 7 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) diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go index f948cdb06..ea11cb158 100644 --- a/cmd/utils/flags.go +++ b/cmd/utils/flags.go @@ -251,11 +251,10 @@ func GetAccountManager(ctx *cli.Context) *accounts.Manager { func StartRPC(eth *eth.Ethereum, ctx *cli.Context) { addr := ctx.GlobalString(RPCListenAddrFlag.Name) port := ctx.GlobalInt(RPCPortFlag.Name) - dataDir := ctx.GlobalString(DataDirFlag.Name) fmt.Println("Starting RPC on port: ", port) l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", addr, port)) if err != nil { Fatalf("Can't listen on %s:%d: %v", addr, port, err) } - go http.Serve(l, rpc.JSONRPC(xeth.New(eth, nil), dataDir)) + go http.Serve(l, rpc.JSONRPC(xeth.New(eth, nil))) } |