aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-30 03:26:47 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-30 03:26:47 +0800
commit04a7c4ae1e7fe9683854fd759cad0e5e04a2f2c0 (patch)
tree8065b02924ccbacb192ce33b74ea45a387819528
parent24fc1f073dd5ec0302937fb51729991dd9a40ba3 (diff)
downloaddexon-04a7c4ae1e7fe9683854fd759cad0e5e04a2f2c0.tar
dexon-04a7c4ae1e7fe9683854fd759cad0e5e04a2f2c0.tar.gz
dexon-04a7c4ae1e7fe9683854fd759cad0e5e04a2f2c0.tar.bz2
dexon-04a7c4ae1e7fe9683854fd759cad0e5e04a2f2c0.tar.lz
dexon-04a7c4ae1e7fe9683854fd759cad0e5e04a2f2c0.tar.xz
dexon-04a7c4ae1e7fe9683854fd759cad0e5e04a2f2c0.tar.zst
dexon-04a7c4ae1e7fe9683854fd759cad0e5e04a2f2c0.zip
Abstract http into rpc package
New RpcConfig object to pass growing config
-rw-r--r--cmd/geth/admin.go16
-rw-r--r--cmd/utils/flags.go17
-rw-r--r--rpc/http.go12
-rw-r--r--rpc/messages.go6
4 files changed, 36 insertions, 15 deletions
diff --git a/cmd/geth/admin.go b/cmd/geth/admin.go
index 3a58b8881..b217e88b5 100644
--- a/cmd/geth/admin.go
+++ b/cmd/geth/admin.go
@@ -2,8 +2,6 @@ package main
import (
"fmt"
- "net"
- "net/http"
"os"
"time"
@@ -70,12 +68,20 @@ func (js *jsre) startRPC(call otto.FunctionCall) otto.Value {
return otto.FalseValue()
}
- l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", addr, port))
+ config := rpc.RpcConfig{
+ ListenAddress: addr,
+ ListenPort: uint(port),
+ // CorsDomain: ctx.GlobalString(RPCCORSDomainFlag.Name),
+ }
+
+ xeth := xeth.New(js.ethereum, nil)
+ err = rpc.Start(xeth, config)
+
if err != nil {
- fmt.Printf("Can't listen on %s:%d: %v", addr, port, err)
+ fmt.Printf(err.Error())
return otto.FalseValue()
}
- go http.Serve(l, rpc.JSONRPC(xeth.New(js.ethereum, nil)))
+
return otto.TrueValue()
}
diff --git a/cmd/utils/flags.go b/cmd/utils/flags.go
index 131f8a5c0..e82fd9c28 100644
--- a/cmd/utils/flags.go
+++ b/cmd/utils/flags.go
@@ -2,9 +2,6 @@ package utils
import (
"crypto/ecdsa"
- "fmt"
- "net"
- "net/http"
"os"
"path"
"runtime"
@@ -259,12 +256,12 @@ 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)
- 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)
+ config := rpc.RpcConfig{
+ ListenAddress: ctx.GlobalString(RPCListenAddrFlag.Name),
+ ListenPort: uint(ctx.GlobalInt(RPCPortFlag.Name)),
+ CorsDomain: ctx.GlobalString(RPCCORSDomainFlag.Name),
}
- go http.Serve(l, rpc.JSONRPC(xeth.New(eth, nil)))
+
+ xeth := xeth.New(eth, nil)
+ _ = rpc.Start(xeth, config)
}
diff --git a/rpc/http.go b/rpc/http.go
index 919c567bd..d146f28a6 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -2,8 +2,10 @@ package rpc
import (
"encoding/json"
+ "fmt"
"io"
"io/ioutil"
+ "net"
"net/http"
"github.com/ethereum/go-ethereum/logger"
@@ -17,6 +19,16 @@ const (
maxSizeReqLength = 1024 * 1024 // 1MB
)
+func Start(pipe *xeth.XEth, config RpcConfig) error {
+ l, err := net.Listen("tcp", fmt.Sprintf("%s:%d", config.ListenAddress, config.ListenPort))
+ if err != nil {
+ rpclogger.Errorf("Can't listen on %s:%d: %v", config.ListenAddress, config.ListenPort, err)
+ return err
+ }
+ go http.Serve(l, JSONRPC(pipe))
+ return nil
+}
+
// JSONRPC returns a handler that implements the Ethereum JSON-RPC API.
func JSONRPC(pipe *xeth.XEth) http.Handler {
api := NewEthereumApi(pipe)
diff --git a/rpc/messages.go b/rpc/messages.go
index 5c498234f..43c4d5e0d 100644
--- a/rpc/messages.go
+++ b/rpc/messages.go
@@ -21,6 +21,12 @@ import (
"fmt"
)
+type RpcConfig struct {
+ ListenAddress string
+ ListenPort uint
+ CorsDomain string
+}
+
type InvalidTypeError struct {
method string
msg string