From 094f921e5028fc215efbc86118e3d3e5b0663055 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Thu, 12 Mar 2015 19:07:03 -0500
Subject: Convert to proper errors

Allow returning different JSON RPC error codes depending on error type
---
 rpc/http.go | 39 ++++++++++++++++++++++++++++++++++-----
 1 file changed, 34 insertions(+), 5 deletions(-)

(limited to 'rpc/http.go')

diff --git a/rpc/http.go b/rpc/http.go
index 857cf3221..8b45319ff 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -25,22 +25,51 @@ func JSONRPC(pipe *xeth.XEth, dataDir string) http.Handler {
 		rpchttplogger.DebugDetailln("Handling request")
 
 		if req.ContentLength > maxSizeReqLength {
-			jsonerr := &RpcErrorObject{-32700, "Error: Request too large"}
+			jsonerr := &RpcErrorObject{-32700, "Request too large"}
 			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
 			return
 		}
 
 		reqParsed, reqerr := json.ParseRequestBody(req)
-		if reqerr != nil {
-			jsonerr := &RpcErrorObject{-32700, "Error: Could not parse request"}
+		switch reqerr.(type) {
+		case nil:
+			break
+		case *DecodeParamError:
+			jsonerr := &RpcErrorObject{-32602, reqerr.Error()}
+			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
+			return
+		case *InsufficientParamsError:
+			jsonerr := &RpcErrorObject{-32602, reqerr.Error()}
+			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
+			return
+		case *ValidationError:
+			jsonerr := &RpcErrorObject{-32602, reqerr.Error()}
+			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
+			return
+		default:
+			jsonerr := &RpcErrorObject{-32700, "Could not parse request"}
 			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
 			return
 		}
 
 		var response interface{}
 		reserr := api.GetRequestReply(&reqParsed, &response)
-		if reserr != nil {
-			rpchttplogger.Warnln(reserr)
+		switch reserr.(type) {
+		case nil:
+			break
+		case *NotImplementedError:
+			jsonerr := &RpcErrorObject{-32601, reserr.Error()}
+			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
+			return
+		case *InsufficientParamsError:
+			jsonerr := &RpcErrorObject{-32602, reserr.Error()}
+			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
+			return
+		case *ValidationError:
+			jsonerr := &RpcErrorObject{-32602, reserr.Error()}
+			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
+			return
+		default:
 			jsonerr := &RpcErrorObject{-32603, reserr.Error()}
 			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
 			return
-- 
cgit v1.2.3


From d3f96dc720bcda6a3db45c69f6ff4ff66cac5ec0 Mon Sep 17 00:00:00 2001
From: Taylor Gerring <taylor.gerring@gmail.com>
Date: Fri, 13 Mar 2015 10:03:48 -0400
Subject: Consolidate error type switch

---
 rpc/http.go | 16 ++--------------
 1 file changed, 2 insertions(+), 14 deletions(-)

(limited to 'rpc/http.go')

diff --git a/rpc/http.go b/rpc/http.go
index 8b45319ff..8dcd55ad1 100644
--- a/rpc/http.go
+++ b/rpc/http.go
@@ -34,15 +34,7 @@ func JSONRPC(pipe *xeth.XEth, dataDir string) http.Handler {
 		switch reqerr.(type) {
 		case nil:
 			break
-		case *DecodeParamError:
-			jsonerr := &RpcErrorObject{-32602, reqerr.Error()}
-			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
-			return
-		case *InsufficientParamsError:
-			jsonerr := &RpcErrorObject{-32602, reqerr.Error()}
-			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
-			return
-		case *ValidationError:
+		case *DecodeParamError, *InsufficientParamsError, *ValidationError:
 			jsonerr := &RpcErrorObject{-32602, reqerr.Error()}
 			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: nil, Error: jsonerr})
 			return
@@ -61,11 +53,7 @@ func JSONRPC(pipe *xeth.XEth, dataDir string) http.Handler {
 			jsonerr := &RpcErrorObject{-32601, reserr.Error()}
 			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
 			return
-		case *InsufficientParamsError:
-			jsonerr := &RpcErrorObject{-32602, reserr.Error()}
-			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
-			return
-		case *ValidationError:
+		case *DecodeParamError, *InsufficientParamsError, *ValidationError:
 			jsonerr := &RpcErrorObject{-32602, reserr.Error()}
 			json.Send(w, &RpcErrorResponse{JsonRpc: jsonrpcver, ID: reqParsed.ID, Error: jsonerr})
 			return
-- 
cgit v1.2.3