diff options
author | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-13 23:37:08 +0800 |
---|---|---|
committer | Taylor Gerring <taylor.gerring@gmail.com> | 2015-01-13 23:37:08 +0800 |
commit | a81d835e4d27f600fac31f74d938d0b6502c3072 (patch) | |
tree | 1b7a4a4e5f6da29e03f248acef8679847c00ed9b /rpc | |
parent | 961e4da7d885a6d5d00fc7c3ab2e11c80c9eeecc (diff) | |
download | dexon-a81d835e4d27f600fac31f74d938d0b6502c3072.tar.gz dexon-a81d835e4d27f600fac31f74d938d0b6502c3072.tar.zst dexon-a81d835e4d27f600fac31f74d938d0b6502c3072.zip |
cleanup
Diffstat (limited to 'rpc')
-rw-r--r-- | rpc/json.go | 2 | ||||
-rw-r--r-- | rpc/message.go | 12 | ||||
-rw-r--r-- | rpc/packages.go | 5 | ||||
-rw-r--r-- | rpc/server.go | 2 |
4 files changed, 5 insertions, 16 deletions
diff --git a/rpc/json.go b/rpc/json.go index 2e6ef2c2b..dc37a7cb7 100644 --- a/rpc/json.go +++ b/rpc/json.go @@ -55,7 +55,7 @@ func (self jsonWrapper) ParseRequestBody(req *http.Request) (RpcRequest, error) } func (self jsonWrapper) GetRequestReply(xeth *EthereumApi, req *RpcRequest, reply *interface{}) error { - // call function for request method + // Spec at https://github.com/ethereum/wiki/wiki/Generic-JSON-RPC jsonlogger.DebugDetailf("%T %s", req.Params, req.Params) switch req.Method { case "eth_coinbase": diff --git a/rpc/message.go b/rpc/message.go index 91fbde99b..63de734b8 100644 --- a/rpc/message.go +++ b/rpc/message.go @@ -162,18 +162,6 @@ func (req *RpcRequest) ToGetCodeAtArgs() (*GetCodeAtArgs, error) { return args, nil } -// func NewSuccessRes(object JsonResponse) string { -// e := SuccessRes{Error: false, Result: object} -// res, err := json.Marshal(e) -// if err != nil { -// // This should never happen -// panic("Creating json error response failed, help") -// } -// success := string(res) -// return success -// // return res -// } - func NewErrorResponse(msg string) error { return errors.New(msg) } diff --git a/rpc/packages.go b/rpc/packages.go index 4e6016b9e..e5ed995e7 100644 --- a/rpc/packages.go +++ b/rpc/packages.go @@ -20,7 +20,7 @@ For each request type, define the following: 1. RpcRequest "To" method [message.go], which does basic validation and conversion to "Args" type via json.Decoder() 2. json.Decoder() calls "UnmarshalJSON" defined on each "Args" struct -3. EthereumApi "Get" method, taking the "Args" type and replying with an interface to be marshalled to JSON +3. EthereumApi method, taking the "Args" type and replying with an interface to be marshalled to JSON */ package rpc @@ -173,7 +173,7 @@ func (obj *GetBlockArgs) UnmarshalJSON(b []byte) (err error) { obj.Hash = argstr return } - return NewErrorResponse("Could not determine JSON parameters") + return NewErrorResponse(ErrorDecodeArgs) } func (obj *GetBlockArgs) requirements() error { @@ -334,6 +334,7 @@ type BalanceRes struct { Balance string `json:"balance"` Address string `json:"address"` } + type GetCodeAtArgs struct { Address string } diff --git a/rpc/server.go b/rpc/server.go index 56b16b649..d14f50f24 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -58,7 +58,7 @@ func (s *JsonRpcServer) Start() { http.Handle("/", h) err := http.Serve(s.listener, nil) - // TODO Complains on shutdown due to listner already being closed + // FIX Complains on shutdown due to listner already being closed if err != nil { jsonlogger.Errorln("Error on JSON-RPC interface:", err) } |