JSON-RPC 2.0 compliance (#310)

Signed-off-by: David Chung <[email protected]>

Author: David Chung

pkg/rpc/client/client.go

@@ -3,7 +3,7 @@ package client
 import (
 	"bytes"
 	log "github.com/Sirupsen/logrus"
-	"github.com/gorilla/rpc/v2/json"
+	"github.com/gorilla/rpc/v2/json2"
 	"net"
 	"net/http"
 	"net/http/httputil"
@@ -25,7 +25,7 @@ func New(socketPath string) Client {
 
 // Call sends an RPC with a method and argument.  The result must be a pointer to the response object.
 func (c Client) Call(method string, arg interface{}, result interface{}) error {
-	message, err := json.EncodeClientRequest(method, arg)
+	message, err := json2.EncodeClientRequest(method, arg)
 	if err != nil {
 		return err
 	}
@@ -57,5 +57,5 @@ func (c Client) Call(method string, arg interface{}, result interface{}) error {
 		log.Error(err)
 	}
 
-	return json.DecodeClientResponse(resp.Body, result)
+	return json2.DecodeClientResponse(resp.Body, result)
 }

pkg/rpc/server/server.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/gorilla/rpc/v2"
-	"github.com/gorilla/rpc/v2/json"
+	"github.com/gorilla/rpc/v2/json2"
 	"net/http/httptest"
 	"net/http/httputil"
 )
@@ -63,7 +63,7 @@ func (h loggingHandler) ServeHTTP(w http.ResponseWriter, req *http.Request) {
 // Returns a Stoppable that can be used to stop or block on the server.
 func StartPluginAtPath(socketPath string, receiver interface{}) (Stoppable, error) {
 	server := rpc.NewServer()
-	server.RegisterCodec(json.NewCodec(), "application/json")
+	server.RegisterCodec(json2.NewCodec(), "application/json")
 
 	if err := server.RegisterService(receiver, ""); err != nil {
 		return nil, err