forks/go-ethereum
1
0
Fork 1
mirror of https://github.com/ethereum/go-ethereum.git synced 2026-08-19 02:12:23 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge daec37505c into 7b5c375825

Browse source
This commit is contained in:
LinGuanHong 2018-08-09 10:03:44 +00:00 committed by GitHub
commit 3be5bf3dee
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
rpc/json.go
View file

@ -46,6 +46,7 @@ type jsonRequest struct {
type jsonSuccessResponse struct { type jsonSuccessResponse struct {
Version string `json:"jsonrpc"` Version string `json:"jsonrpc"`
Status string `json:"status"`
Id interface{} `json:"id,omitempty"` Id interface{} `json:"id,omitempty"`
Result interface{} `json:"result"` Result interface{} `json:"result"`
} }
@ -58,6 +59,7 @@ type jsonError struct {
type jsonErrResponse struct { type jsonErrResponse struct {
Version string `json:"jsonrpc"` Version string `json:"jsonrpc"`
Status string `json:"status"`
Id interface{} `json:"id,omitempty"` Id interface{} `json:"id,omitempty"`
Error jsonError `json:"error"` Error jsonError `json:"error"`
} }
@ -320,12 +322,12 @@ func parsePositionalArguments(rawArgs json.RawMessage, types []reflect.Type) ([]
// CreateResponse will create a JSON-RPC success response with the given id and reply as result. // CreateResponse will create a JSON-RPC success response with the given id and reply as result.
func (c *jsonCodec) CreateResponse(id interface{}, reply interface{}) interface{} { func (c *jsonCodec) CreateResponse(id interface{}, reply interface{}) interface{} {
return &jsonSuccessResponse{Version: jsonrpcVersion, Id: id, Result: reply} return &jsonSuccessResponse{Version: jsonrpcVersion,Status:"success", Id: id, Result: reply}
} }
// CreateErrorResponse will create a JSON-RPC error response with the given id and error. // CreateErrorResponse will create a JSON-RPC error response with the given id and error.
func (c *jsonCodec) CreateErrorResponse(id interface{}, err Error) interface{} { func (c *jsonCodec) CreateErrorResponse(id interface{}, err Error) interface{} {
return &jsonErrResponse{Version: jsonrpcVersion, Id: id, Error: jsonError{Code: err.ErrorCode(), Message: err.Error()}} return &jsonErrResponse{Version: jsonrpcVersion,Status:"failed", Id: id, Error: jsonError{Code: err.ErrorCode(), Message: err.Error()}}
} }
// CreateErrorResponseWithInfo will create a JSON-RPC error response with the given id and error. // CreateErrorResponseWithInfo will create a JSON-RPC error response with the given id and error.