certusone
/
tendermint
mirror of https://github.com/certusone/tendermint.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

better error message for unknown RPC method calls

This commit is contained in:
Jae Kwon 2015-04-01 17:12:17 -07:00
parent c74b5522a1
commit d8766e1d37
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rpc/core/blocks.go
View File

@ -32,7 +32,7 @@ func BlockchainInfo(minHeight, maxHeight uint) (*ResponseBlockchainInfo, error)
func GetBlock(height uint) (*ResponseGetBlock, error) { func GetBlock(height uint) (*ResponseGetBlock, error) {
if height == 0 { if height == 0 {
return nil, fmt.Errorf("height must be greater than 1") return nil, fmt.Errorf("height must be greater than 0")
} }
if height > blockStore.Height() { if height > blockStore.Height() {
return nil, fmt.Errorf("height must be less than the current blockchain height") return nil, fmt.Errorf("height must be less than the current blockchain height")

8
rpc/handlers.go
View File

@ -35,7 +35,7 @@ var funcMap = map[string]*FuncWrapper{
func initHandlers() { func initHandlers() {
// HTTP endpoints // HTTP endpoints
for funcName, funcInfo := range funcMap { for funcName, funcInfo := range funcMap {
http.HandleFunc("/"+funcName, toHttpHandler(funcInfo)) http.HandleFunc("/"+funcName, toHTTPHandler(funcInfo))
} }
// JSONRPC endpoints // JSONRPC endpoints
@ -95,6 +95,10 @@ func JSONRPCHandler(w http.ResponseWriter, r *http.Request) {
} }
funcInfo := funcMap[request.Method] funcInfo := funcMap[request.Method]
if funcInfo == nil {
WriteRPCResponse(w, NewRPCResponse(nil, "RPC method unknown: "+request.Method))
return
}
args, err := jsonParamsToArgs(funcInfo, request.Params) args, err := jsonParamsToArgs(funcInfo, request.Params)
if err != nil { if err != nil {
WriteRPCResponse(w, NewRPCResponse(nil, err.Error())) WriteRPCResponse(w, NewRPCResponse(nil, err.Error()))
@ -139,7 +143,7 @@ func _jsonObjectToArg(ty reflect.Type, object interface{}) (reflect.Value, error
// rpc.http // rpc.http
// convert from a function name to the http handler // convert from a function name to the http handler
func toHttpHandler(funcInfo *FuncWrapper) func(http.ResponseWriter, *http.Request) { func toHTTPHandler(funcInfo *FuncWrapper) func(http.ResponseWriter, *http.Request) {
return func(w http.ResponseWriter, r *http.Request) { return func(w http.ResponseWriter, r *http.Request) {
args, err := httpParamsToArgs(funcInfo, r) args, err := httpParamsToArgs(funcInfo, r)
if err != nil { if err != nil {