jsonrpc2,types: rename request and Response to add wire prefix

Author: zchee

jsonrpc2.go

@@ -67,7 +67,7 @@ type Conn struct {
 	RejectIfOverloaded bool
 	stream             Stream
 	err                error
-	pending            map[ID]chan *Response
+	pending            map[ID]chan *wireResponse
 	pendingMu          sync.Mutex // protects the pending map
 	handling           map[ID]*Request
 	handlingMu         sync.Mutex // protects the handling map
@@ -157,7 +157,7 @@ func NewConn(s Stream, options ...Options) *Conn {
 	conn := &Conn{
 		seq:      new(atomic.Int64),
 		stream:   s,
-		pending:  make(map[ID]chan *Response),
+		pending:  make(map[ID]chan *wireResponse),
 		handling: make(map[ID]*Request),
 	}
 
@@ -233,7 +233,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 	}
 
 	id := ID{Number: c.seq.Add(1)}
-	req := &request{
+	req := &wireRequest{
 		JSONRPC: Version,
 		ID:      &id,
 		Method:  method,
@@ -246,7 +246,7 @@ func (c *Conn) Call(ctx context.Context, method string, params, result interface
 		return Errorf(ParseError, "failed to marshaling call request: %v", err)
 	}
 
-	rchan := make(chan *Response)
+	rchan := make(chan *wireResponse)
 
 	c.pendingMu.Lock()
 	c.pending[id] = rchan
@@ -352,7 +352,7 @@ func (r *Request) Reply(ctx context.Context, result interface{}, err error) erro
 		raw, err = marshalInterface(result)
 	}
 
-	resp := &Response{
+	resp := &wireResponse{
 		JSONRPC: Version,
 		Result:  raw,
 		ID:      r.ID,
@@ -482,7 +482,7 @@ func (c *Conn) Run(ctx context.Context) (err error) {
 			c.pendingMu.Unlock()
 
 			// send the reply to the channel
-			resp := &Response{
+			resp := &wireResponse{
 				JSONRPC: Version,
 				Result:  msg.Result,
 				Error:   msg.Error,

types.go

@@ -58,11 +58,11 @@ func (id *ID) UnmarshalJSON(data []byte) error {
 var _ json.Marshaler = (*ID)(nil)
 var _ json.Unmarshaler = (*ID)(nil)
 
-// request represents a rpc call by sending a request object to a Server.
+// wireRequest represents a rpc call by sending a request object to a Server.
 // This is a request message to describe a request between the client and the server.
 //
 // Every processed request must send a response back to the sender of the request.
-type request struct {
+type wireRequest struct {
 	// JSONRPC is a string specifying the version of the JSON-RPC protocol.
 	//
 	// MUST be exactly "2.0".
@@ -88,18 +88,13 @@ type request struct {
 	ID *ID `json:"id"`
 }
 
-// IsNotify returns true if this request is a notification.
-func (r *request) IsNotify() bool {
-	return r.ID == nil
-}
-
-// Response is a response ressage sent as a result of a request.
+// wireResponse is a response ressage sent as a result of a request.
 // When a rpc call is made, the Server MUST reply with a Response, except for in the case of Notifications.
 //
 // If a request doesn't provide a result value the receiver of a request still needs to return a response message to
 // conform to the JSON RPC specification.
 // The result property of the ResponseMessage should be set to null in this case to signal a successful request.
-type Response struct {
+type wireResponse struct {
 	// JSONRPC is a string specifying the version of the JSON-RPC protocol.
 	//
 	// MUST be exactly "2.0".

types_gojay.go

@@ -57,7 +57,7 @@ var _ json.Marshaler = (*RawMessage)(nil)
 var _ json.Unmarshaler = (*RawMessage)(nil)
 
 // UnmarshalJSONObject implements gojay's UnmarshalerJSONObject
-func (v *request) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
+func (v *wireRequest) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
 	switch k {
 	case keyJSONRPC:
 		return dec.String(&v.JSONRPC)
@@ -76,21 +76,21 @@ func (v *request) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
 }
 
 // NKeys returns the number of keys to unmarshal
-func (v *request) NKeys() int { return 4 }
+func (v *wireRequest) NKeys() int { return 4 }
 
 // MarshalJSONObject implements gojay's MarshalerJSONObject
-func (v *request) MarshalJSONObject(enc *gojay.Encoder) {
+func (v *wireRequest) MarshalJSONObject(enc *gojay.Encoder) {
 	enc.StringKey(keyJSONRPC, v.JSONRPC)
 	enc.StringKey(keyID, v.ID.String())
 	enc.StringKey(keyMethod, v.Method)
 	enc.AddEmbeddedJSONKeyOmitEmpty(keyParams, (*gojay.EmbeddedJSON)(v.Params))
 }
 
 // IsNil returns wether the structure is nil value or not
-func (v *request) IsNil() bool { return v == nil }
+func (v *wireRequest) IsNil() bool { return v == nil }
 
 // UnmarshalJSONObject implements gojay's UnmarshalerJSONObject
-func (v *Response) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
+func (v *wireResponse) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
 	switch k {
 	case keyJSONRPC:
 		return dec.String(&v.JSONRPC)
@@ -112,18 +112,18 @@ func (v *Response) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {
 }
 
 // NKeys returns the number of keys to unmarshal
-func (v *Response) NKeys() int { return 4 }
+func (v *wireResponse) NKeys() int { return 4 }
 
 // MarshalJSONObject implements gojay's MarshalerJSONObject
-func (v *Response) MarshalJSONObject(enc *gojay.Encoder) {
+func (v *wireResponse) MarshalJSONObject(enc *gojay.Encoder) {
 	enc.StringKey(keyJSONRPC, v.JSONRPC)
 	enc.StringKey(keyID, v.ID.String())
 	enc.ObjectKeyOmitEmpty(keyError, v.Error)
 	enc.AddEmbeddedJSONKeyOmitEmpty(keyResult, (*gojay.EmbeddedJSON)(v.Result))
 }
 
 // IsNil returns wether the structure is nil value or not
-func (v *Response) IsNil() bool { return v == nil }
+func (v *wireResponse) IsNil() bool { return v == nil }
 
 // UnmarshalJSONObject implements gojay's UnmarshalerJSONObject
 func (v *Combined) UnmarshalJSONObject(dec *gojay.Decoder, k string) error {