aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-03-18 08:14:19 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-03-18 08:14:19 +0800
commit67c9d9c2fa6d1cb74188dccf7e25422db72983c8 (patch)
tree8955f32f124d475d844a497596f1c18260ea8f27
parentc6f84325b1c21c33ca6470da9020c327d207f80a (diff)
downloaddexon-67c9d9c2fa6d1cb74188dccf7e25422db72983c8.tar
dexon-67c9d9c2fa6d1cb74188dccf7e25422db72983c8.tar.gz
dexon-67c9d9c2fa6d1cb74188dccf7e25422db72983c8.tar.bz2
dexon-67c9d9c2fa6d1cb74188dccf7e25422db72983c8.tar.lz
dexon-67c9d9c2fa6d1cb74188dccf7e25422db72983c8.tar.xz
dexon-67c9d9c2fa6d1cb74188dccf7e25422db72983c8.tar.zst
dexon-67c9d9c2fa6d1cb74188dccf7e25422db72983c8.zip
Remove JsonWrapper
-rw-r--r--rpc/http.go25
-rw-r--r--rpc/util.go16
2 files changed, 19 insertions, 22 deletions
diff --git a/rpc/http.go b/rpc/http.go
index 0fe634dee..5f2445e6c 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -2,6 +2,7 @@ package rpc
import (
"encoding/json"
+ "io"
"io/ioutil"
"net/http"
@@ -18,7 +19,6 @@ const (
// JSONRPC returns a handler that implements the Ethereum JSON-RPC API.
func JSONRPC(pipe *xeth.XEth, dataDir string) http.Handler {
- var jsw JsonWrapper
api := NewEthereumApi(pipe, dataDir)
return http.HandlerFunc(func(w http.ResponseWriter, req *http.Request) {
@@ -28,22 +28,23 @@ func JSONRPC(pipe *xeth.XEth, dataDir string) http.Handler {
// Limit request size to resist DoS
if req.ContentLength > maxSizeReqLength {
jsonerr := &RpcErrorObject{-32700, "Request too large"}
- jsw.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
+ Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
return
}
+ // Read request body
defer req.Body.Close()
body, err := ioutil.ReadAll(req.Body)
if err != nil {
jsonerr := &RpcErrorObject{-32700, "Could not read request body"}
- jsw.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
+ Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
}
// Try to parse the request as a single
var reqSingle RpcRequest
if err := json.Unmarshal(body, &reqSingle); err == nil {
response := RpcResponse(api, &reqSingle)
- jsw.Send(w, &response)
+ Send(w, &response)
return
}
@@ -56,13 +57,13 @@ func JSONRPC(pipe *xeth.XEth, dataDir string) http.Handler {
response := RpcResponse(api, &request)
resBatch[i] = response
}
- jsw.Send(w, resBatch)
+ Send(w, resBatch)
return
}
// Not a batch or single request, error
jsonerr := &RpcErrorObject{-32600, "Could not decode request"}
- jsw.Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
+ Send(w, &RpcErrorResponse{Jsonrpc: jsonrpcver, Id: nil, Error: jsonerr})
})
}
@@ -86,3 +87,15 @@ func RpcResponse(api *EthereumApi, request *RpcRequest) *interface{} {
rpchttplogger.DebugDetailf("Generated response: %T %s", response, response)
return &response
}
+
+func Send(writer io.Writer, v interface{}) (n int, err error) {
+ var payload []byte
+ payload, err = json.MarshalIndent(v, "", "\t")
+ if err != nil {
+ rpclogger.Fatalln("Error marshalling JSON", err)
+ return 0, err
+ }
+ rpclogger.DebugDetailf("Sending payload: %s", payload)
+
+ return writer.Write(payload)
+}
diff --git a/rpc/util.go b/rpc/util.go
index 6eb1faefb..413ec4887 100644
--- a/rpc/util.go
+++ b/rpc/util.go
@@ -19,9 +19,7 @@ package rpc
import (
"encoding/json"
"fmt"
- "io"
"math/big"
- // "net/http"
"reflect"
"time"
@@ -33,8 +31,6 @@ import (
var rpclogger = logger.NewLogger("RPC")
-type JsonWrapper struct{}
-
// Unmarshal state is a helper method which has the ability to decode messsages
// that use the `defaultBlock` (https://github.com/ethereum/wiki/wiki/JSON-RPC#the-default-block-parameter)
// For example a `call`: [{to: "0x....", data:"0x..."}, "latest"]. The first argument is the transaction
@@ -94,18 +90,6 @@ func UnmarshalRawMessages(b []byte, iface interface{}, number *int64) (err error
return nil
}
-func (self JsonWrapper) Send(writer io.Writer, v interface{}) (n int, err error) {
- var payload []byte
- payload, err = json.MarshalIndent(v, "", "\t")
- if err != nil {
- rpclogger.Fatalln("Error marshalling JSON", err)
- return 0, err
- }
- rpclogger.DebugDetailf("Sending payload: %s", payload)
-
- return writer.Write(payload)
-}
-
func toHex(b []byte) string {
hex := common.Bytes2Hex(b)
// Prefer output of "0x0" instead of "0x"