aboutsummaryrefslogtreecommitdiffstats
path: root/rpc
diff options
context:
space:
mode:
authorTaylor Gerring <taylor.gerring@gmail.com>2015-02-11 18:56:29 +0800
committerTaylor Gerring <taylor.gerring@gmail.com>2015-02-11 18:56:29 +0800
commitd613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9 (patch)
treee7d6589314ec1490c45adb2ac5b94423a250eb06 /rpc
parentcfddb7f3cd3b8cecb1e59412ce4db5769f6c8007 (diff)
downloaddexon-d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9.tar
dexon-d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9.tar.gz
dexon-d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9.tar.bz2
dexon-d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9.tar.lz
dexon-d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9.tar.xz
dexon-d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9.tar.zst
dexon-d613bf69bf3fd0cfbe28a2f68c87421f7d5bccf9.zip
#295 Allow RPC ID to be string
Diffstat (limited to 'rpc')
-rw-r--r--rpc/http/server.go2
-rw-r--r--rpc/message.go6
-rw-r--r--rpc/util.go2
-rw-r--r--rpc/ws/server.go2
4 files changed, 6 insertions, 6 deletions
diff --git a/rpc/http/server.go b/rpc/http/server.go
index a34400a77..10c8fa813 100644
--- a/rpc/http/server.go
+++ b/rpc/http/server.go
@@ -102,7 +102,7 @@ func (s *RpcHttpServer) apiHandler(api *rpc.EthereumApi) http.Handler {
if reserr != nil {
rpchttplogger.Warnln(reserr)
jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()}
- JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr})
+ JSON.Send(w, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
return
}
diff --git a/rpc/message.go b/rpc/message.go
index 78dc6e2ff..7983e003d 100644
--- a/rpc/message.go
+++ b/rpc/message.go
@@ -34,20 +34,20 @@ const (
)
type RpcRequest struct {
+ ID interface{} `json:"id"`
JsonRpc string `json:"jsonrpc"`
- ID int `json:"id"`
Method string `json:"method"`
Params []json.RawMessage `json:"params"`
}
type RpcSuccessResponse struct {
- ID int `json:"id"`
+ ID interface{} `json:"id"`
JsonRpc string `json:"jsonrpc"`
Result interface{} `json:"result"`
}
type RpcErrorResponse struct {
- ID *int `json:"id"`
+ ID interface{} `json:"id"`
JsonRpc string `json:"jsonrpc"`
Error *RpcErrorObject `json:"error"`
}
diff --git a/rpc/util.go b/rpc/util.go
index 509d9a17d..679d83754 100644
--- a/rpc/util.go
+++ b/rpc/util.go
@@ -47,7 +47,6 @@ func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error)
// Convert JSON to native types
d := json.NewDecoder(req.Body)
- // d.UseNumber()
defer req.Body.Close()
err := d.Decode(&reqParsed)
@@ -55,6 +54,7 @@ func (self JsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error)
rpclogger.Errorln("Error decoding JSON: ", err)
return reqParsed, err
}
+
rpclogger.DebugDetailf("Parsed request: %s", reqParsed)
return reqParsed, nil
diff --git a/rpc/ws/server.go b/rpc/ws/server.go
index fe6af042f..100713c10 100644
--- a/rpc/ws/server.go
+++ b/rpc/ws/server.go
@@ -109,7 +109,7 @@ func sockHandler(api *rpc.EthereumApi) websocket.Handler {
if reserr != nil {
wslogger.Warnln(reserr)
jsonerr := &rpc.RpcErrorObject{-32603, reserr.Error()}
- JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: &reqParsed.ID, Error: jsonerr})
+ JSON.Send(conn, &rpc.RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
continue
}