rpclib: Id -> ID, fix TestCtx

rpclib/rpc_client.go

@@ -16,7 +16,7 @@ var (
 	contextType = reflect.TypeOf(new(context.Context)).Elem()
 )
 
-// ErrClient is an error which occured on the client side the library
+// ErrClient is an error which occurred on the client side the library
 type ErrClient struct {
 	err error
 }
@@ -39,7 +39,7 @@ func (r *result) UnmarshalJSON(raw []byte) error {
 type clientResponse struct {
 	Jsonrpc string     `json:"jsonrpc"`
 	Result  result     `json:"result"`
-	Id      int64      `json:"id"`
+	ID      int64      `json:"id"`
 	Error   *respError `json:"error,omitempty"`
 }
 
@@ -117,7 +117,7 @@ func NewClient(addr string, namespace string, handler interface{}) {
 
 			req := request{
 				Jsonrpc: "2.0",
-				Id:      &id,
+				ID:      &id,
 				Method:  namespace + "." + f.Name,
 				Params:  params,
 			}
@@ -142,7 +142,6 @@ func NewClient(addr string, namespace string, handler interface{}) {
 			if err != nil {
 				return processError(err)
 			}
-			defer httpResp.Body.Close()
 
 			// process response
 
@@ -155,7 +154,11 @@ func NewClient(addr string, namespace string, handler interface{}) {
 				return processError(err)
 			}
 
-			if resp.Id != *req.Id {
+			if err := httpResp.Body.Close(); err != nil {
+				return processError(err)
+			}
+
+			if resp.ID != *req.ID {
 				return processError(errors.New("request and response id didn't match"))
 			}
 

rpclib/rpc_server.go

@@ -10,10 +10,8 @@ import (
 
 const (
 	rpcParseError     = -32700
-//	rpcInvalidRequest = -32600
 	rpcMethodNotFound = -32601
 	rpcInvalidParams  = -32602
-//	rpcInternalError  = -32603
 )
 
 type rpcHandler struct {
@@ -59,7 +57,7 @@ func (p *param) MarshalJSON() ([]byte, error) {
 
 type request struct {
 	Jsonrpc string  `json:"jsonrpc"`
-	Id      *int64  `json:"id,omitempty"`
+	ID      *int64  `json:"id,omitempty"`
 	Method  string  `json:"method"`
 	Params  []param `json:"params"`
 }
@@ -79,7 +77,7 @@ func (e *respError) Error() string {
 type response struct {
 	Jsonrpc string      `json:"jsonrpc"`
 	Result  interface{} `json:"result,omitempty"`
-	Id      int64       `json:"id"`
+	ID      int64       `json:"id"`
 	Error   *respError  `json:"error,omitempty"`
 }
 
@@ -119,13 +117,13 @@ func (s *RPCServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 	}
 
 	callResult := handler.handlerFunc.Call(callParams)
-	if req.Id == nil {
+	if req.ID == nil {
 		return // notification
 	}
 
 	resp := response{
 		Jsonrpc: "2.0",
-		Id:      *req.Id,
+		ID:      *req.ID,
 	}
 
 	if handler.errOut != -1 {
@@ -149,13 +147,13 @@ func (s *RPCServer) ServeHTTP(w http.ResponseWriter, r *http.Request) {
 
 func (s *RPCServer) rpcError(w http.ResponseWriter, req *request, code int, err error) {
 	w.WriteHeader(500)
-	if req.Id == nil { // notification
+	if req.ID == nil { // notification
 		return
 	}
 
 	resp := response{
 		Jsonrpc: "2.0",
-		Id:      *req.Id,
+		ID:      *req.ID,
 		Error: &respError{
 			Code:    code,
 			Message: err.Error(),

rpclib/rpc_test.go

@@ -5,7 +5,7 @@ import (
 	"errors"
 	"net/http/httptest"
 	"strconv"
-	"sync/atomic"
+	"sync"
 	"testing"
 	"time"
 )
@@ -177,13 +177,17 @@ func TestRPC(t *testing.T) {
 }
 
 type CtxHandler struct {
+	lk sync.Mutex
+
 	cancelled bool
-	i         int32
+	i         int
 }
 
 func (h *CtxHandler) Test(ctx context.Context) {
+	h.lk.Lock()
+	defer h.lk.Unlock()
 	timeout := time.After(300 * time.Millisecond)
-	atomic.AddInt32(&h.i, 1)
+	h.i++
 
 	select {
 	case <-timeout:
@@ -215,19 +219,28 @@ func TestCtx(t *testing.T) {
 	defer cancel()
 
 	client.Test(ctx)
+	serverHandler.lk.Lock()
+
 	if !serverHandler.cancelled {
 		t.Error("expected cancellation on the server side")
 	}
 
 	serverHandler.cancelled = false
 
+	serverHandler.lk.Unlock()
+
 	var noCtxClient struct {
 		Test func()
 	}
 	NewClient(testServ.URL, "CtxHandler", &noCtxClient)
 
 	noCtxClient.Test()
-	if serverHandler.cancelled || atomic.LoadInt32(&serverHandler.i) != 2 {
+
+	serverHandler.lk.Lock()
+
+	if serverHandler.cancelled || serverHandler.i != 2 {
 		t.Error("wrong serverHandler state")
 	}
+
+	serverHandler.lk.Unlock()
 }