error: remove Code prefix

Author: zchee

error.go

@@ -15,32 +15,32 @@ import (
 type Code int64
 
 const (
-	// CodeParseError is the invalid JSON was received by the server. An error occurred on the server while parsing the JSON text.
-	CodeParseError Code = -32700
-	// CodeInvalidRequest is the JSON sent is not a valid Request object.
-	CodeInvalidRequest Code = -32600
-	// CodeMethodNotFound is the method does not exist / is not available.
-	CodeMethodNotFound Code = -32601
-	// CodeInvalidParams is the invalid method parameter(s).
-	CodeInvalidParams Code = -32602
-	// CodeInternalError is the internal JSON-RPC error.
-	CodeInternalError Code = -32603
-
-	// CodeServerNotInitialized is the error of server not initialized.
-	CodeServerNotInitialized Code = -32002
-	// CodeUnknownError should be used for all non coded errors.
-	CodeUnknownError Code = -32001
-	// CodeRequestCancelled is the cancellation error.
-	CodeRequestCancelled Code = -32800
-	// CodeContentModified is the state change that invalidates the result of a request in execution.
-	CodeContentModified Code = -32801
-
-	// CodeServerOverloaded is returned when a message was refused due to a
+	// ParseError is the invalid JSON was received by the server. An error occurred on the server while parsing the JSON text.
+	ParseError = Code(-32700)
+	// InvalidRequest is the JSON sent is not a valid Request object.
+	InvalidRequest = Code(-32600)
+	// MethodNotFound is the method does not exist / is not available.
+	MethodNotFound = Code(-32601)
+	// InvalidParams is the invalid method parameter(s).
+	InvalidParams = Code(-32602)
+	// InternalError is the internal JSON-RPC error.
+	InternalError = Code(-32603)
+
+	// ServerNotInitialized is the error of server not initialized.
+	ServerNotInitialized = Code(-32002)
+	// UnknownError should be used for all non coded errors.
+	UnknownError = Code(-32001)
+	// RequestCancelled is the cancellation error.
+	RequestCancelled = Code(-32800)
+	// ContentModified is the state change that invalidates the result of a request in execution.
+	ContentModified = Code(-32801)
+
+	// ServerOverloaded is returned when a message was refused due to a
 	// server being temporarily unable to accept any new messages.
-	CodeServerOverloaded = -32000
+	ServerOverloaded = Code(-32000)
 
-	codeServerErrorStart Code = -32099 //nolint:deadcode,varcheck
-	codeServerErrorEnd   Code = -32000 //nolint:deadcode,varcheck
+	codeServerErrorStart = Code(-32099) //nolint:deadcode,varcheck
+	codeServerErrorEnd   = Code(-32000) //nolint:deadcode,varcheck
 )
 
 // Error represents a jsonrpc2 error.

jsonrpc2.go

@@ -115,7 +115,7 @@ func WithOverloaded(rejectIfOverloaded bool) Options {
 
 var defaultHandler = func(ctx context.Context, conn *Conn, req *Request) {
 	if req.IsNotify() {
-		conn.Reply(ctx, req, nil, Errorf(CodeMethodNotFound, "method %q not found", req.Method))
+		conn.Reply(ctx, req, nil, Errorf(MethodNotFound, "method %q not found", req.Method))
 	}
 }
 
@@ -170,7 +170,7 @@ func (c *Conn) Notify(ctx context.Context, method string, params interface{}) er
 	c.Logger.Debug("Notify", zap.String("method", method), zap.Any("params", params))
 	p, err := c.marshalInterface(params)
 	if err != nil {
-		return Errorf(CodeParseError, "failed to marshaling notify parameters: %v", err)
+		return Errorf(ParseError, "failed to marshaling notify parameters: %v", err)
 	}
 
 	req := &NotificationMessage{
@@ -180,7 +180,7 @@ func (c *Conn) Notify(ctx context.Context, method string, params interface{}) er
 	}
 	data, err := json.Marshal(req) // TODO(zchee): use gojay
 	if err != nil {
-		return Errorf(CodeParseError, "failed to marshaling notify request: %v", err)
+		return Errorf(ParseError, "failed to marshaling notify request: %v", err)
 	}
 
 	c.Logger.Debug(Send,
@@ -190,7 +190,7 @@ func (c *Conn) Notify(ctx context.Context, method string, params interface{}) er
 
 	err = c.stream.Write(ctx, data)
 	if err != nil {
-		return Errorf(CodeInternalError, "failed to write notify request data to steam: %v", err)
+		return Errorf(InternalError, "failed to write notify request data to steam: %v", err)
 	}
 
 	return nil
@@ -201,7 +201,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 	c.Logger.Debug("Call", zap.String("method", method), zap.Any("params", params))
 	p, err := c.marshalInterface(params)
 	if err != nil {
-		return Errorf(CodeParseError, "failed to marshaling call parameters: %v", err)
+		return Errorf(ParseError, "failed to marshaling call parameters: %v", err)
 	}
 
 	id := ID{Number: c.seq.Add(1)}
@@ -215,7 +215,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 	// marshal the request now it is complete
 	data, err := json.Marshal(req) // TODO(zchee): use gojay
 	if err != nil {
-		return Errorf(CodeParseError, "failed to marshaling call request: %v", err)
+		return Errorf(ParseError, "failed to marshaling call request: %v", err)
 	}
 
 	rchan := make(chan *Response)
@@ -237,7 +237,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 	)
 
 	if err := c.stream.Write(ctx, data); err != nil {
-		return Errorf(CodeInternalError, "failed to write call request data to steam: %v", err)
+		return Errorf(InternalError, "failed to write call request data to steam: %v", err)
 	}
 
 	// wait for the response
@@ -258,7 +258,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 
 		if err := json.Unmarshal(*resp.Result, result); err != nil {
 			// if err := gojay.Unsafe.Unmarshal(*resp.Result, result); err != nil {
-			return Errorf(CodeParseError, "failed to unmarshalling result: %v", err)
+			return Errorf(ParseError, "failed to unmarshalling result: %v", err)
 		}
 
 		return nil
@@ -275,7 +275,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 func (c *Conn) Reply(ctx context.Context, req *Request, result interface{}, err error) error {
 	c.Logger.Debug("Reply")
 	if req.IsNotify() {
-		return NewError(CodeInvalidRequest, "reply not invoked with a valid call")
+		return NewError(InvalidRequest, "reply not invoked with a valid call")
 	}
 
 	c.handlingMu.Lock()
@@ -285,7 +285,7 @@ func (c *Conn) Reply(ctx context.Context, req *Request, result interface{}, err
 	}
 	c.handlingMu.Unlock()
 	if !found {
-		return Errorf(CodeInternalError, "not a call in progress: %v", req.ID)
+		return Errorf(InternalError, "not a call in progress: %v", req.ID)
 	}
 
 	elapsed := time.Since(handling.start)
@@ -318,7 +318,7 @@ func (c *Conn) Reply(ctx context.Context, req *Request, result interface{}, err
 			zap.Any("resp.Result", resp.Result),
 			zap.Error(err),
 		)
-		return Errorf(CodeParseError, "failed to marshaling reply response: %v", err)
+		return Errorf(ParseError, "failed to marshaling reply response: %v", err)
 	}
 
 	c.Logger.Debug(Send,
@@ -330,7 +330,7 @@ func (c *Conn) Reply(ctx context.Context, req *Request, result interface{}, err
 	if err := c.stream.Write(ctx, data); err != nil {
 		// TODO(iancottrell): if a stream write fails, we really need to shut down
 		// the whole stream
-		return Errorf(CodeInternalError, "failed to write response data to steam: %v", err)
+		return Errorf(InternalError, "failed to write response data to steam: %v", err)
 	}
 
 	return nil
@@ -386,7 +386,7 @@ func (c *Conn) Run(ctx context.Context) (err error) {
 			// a badly formed message arrived, log it and continue
 			// we trust the stream to have isolated the error to just this message
 			c.Logger.Debug(Receive,
-				zap.Error(Errorf(CodeParseError, "unmarshal failed: %v", err)),
+				zap.Error(Errorf(ParseError, "unmarshal failed: %v", err)),
 			)
 			continue
 		}
@@ -429,7 +429,7 @@ func (c *Conn) Run(ctx context.Context) (err error) {
 
 				if !c.deliver(ctxReq, queuec, req) {
 					// queue is full, reject the message by directly replying
-					c.Reply(ctx, req, nil, Errorf(CodeServerOverloaded, "no room in queue"))
+					c.Reply(ctx, req, nil, Errorf(ServerOverloaded, "no room in queue"))
 				}
 			}
 
@@ -453,7 +453,7 @@ func (c *Conn) Run(ctx context.Context) (err error) {
 			close(rchan) // for the range channel loop
 
 		default:
-			c.Logger.Warn(Receive, zap.Error(NewError(CodeInvalidParams, "ignoring because message not a call, notify or response")))
+			c.Logger.Warn(Receive, zap.Error(NewError(InvalidParams, "ignoring because message not a call, notify or response")))
 		}
 	}
 }