common: jsonrpc2.0 move into the comm module

Signed-off-by: Vincenzo Palazzo <[email protected]>

client/unix.go

@@ -6,21 +6,9 @@ import (
 	"fmt"
 	"log"
 	"net"
-)
-
-type Request struct {
-	Method  string         `json:"method"`
-	Params  map[string]any `json:"params"`
-	Jsonrpc string         `json:"jsonrpc"`
-	Id      int            `json:"id"`
-}
 
-type Response struct {
-	Result  map[string]any `json:"result"`
-	Error   map[string]any `json:"error"`
-	Jsonrpc string         `json:"jsonrpc"`
-	Id      int            `json:"id"`
-}
+	"github.com/vincenzopalazzo/cln4go/comm/jsonrpcv2"
+)
 
 type UnixRPC struct {
 	socket net.Conn
@@ -46,8 +34,8 @@ func encodeToBytes(p any) []byte {
 	return buf.Bytes()
 }
 
-func decodeToResponse(s []byte) *Response {
-	r := Response{}
+func decodeToResponse(s []byte) *jsonrpcv2.Response {
+	r := jsonrpcv2.Response{}
 	dec := json.NewDecoder(bytes.NewReader(s))
 	err := dec.Decode(&r)
 	if err != nil {
@@ -58,7 +46,7 @@ func decodeToResponse(s []byte) *Response {
 
 func (instance UnixRPC) Call(method string, data map[string]any) (map[string]any, error) {
 	//change request to bytes
-	request := Request{Method: method, Params: data, Jsonrpc: "2.0", Id: 0}
+	request := jsonrpcv2.Request{Method: method, Params: data, Jsonrpc: "2.0", Id: 0}
 	dataBytes := encodeToBytes(request)
 
 	//send data

comm/jsonrpcv2/jsonrpcv2.go

@@ -0,0 +1,15 @@
+package jsonrpcv2
+
+type Request struct {
+	Method  string         `json:"method"`
+	Params  map[string]any `json:"params"`
+	Jsonrpc string         `json:"jsonrpc"`
+	Id      *int           `json:"id"`
+}
+
+type Response struct {
+	Result  map[string]any `json:"result"`
+	Error   map[string]any `json:"error"`
+	Jsonrpc string         `json:"jsonrpc"`
+	Id      *int           `json:"id"`
+}

plugin/plugin.go

@@ -5,6 +5,8 @@ import (
 	"encoding/json"
 	"fmt"
 	"os"
+
+	"github.com/vincenzopalazzo/cln4go/comm/jsonrpcv2"
 )
 
 type Plugin[T any] struct {
@@ -96,13 +98,13 @@ func (instance *Plugin[T]) Start() {
 		if err != nil {
 			panic(err)
 		}
-		var request request
+		var request jsonrpcv2.Request
 		if err := json.Unmarshal(rawRequest, &request); err != nil {
 			panic(err)
 		}
 		if request.Id != nil {
 			result, _ := instance.callRPCMethod(request.Method, request.Params)
-			response := response{Id: request.Id, Error: nil, Result: result}
+			response := jsonrpcv2.Response{Id: request.Id, Error: nil, Result: result}
 			responseStr, err := json.Marshal(response)
 			if err != nil {
 				panic(err)

plugin/types.go

@@ -22,17 +22,3 @@ type rpcOption struct {
 	Deprecated  bool   `json:"deprecated"`
 	Value       any    `json:"-"`
 }
-
-type request struct {
-	Method  string         `json:"method"`
-	Params  map[string]any `json:"params"`
-	Jsonrpc string         `json:"jsonrpc"`
-	Id      *int           `json:"idm,omitempty"`
-}
-
-type response struct {
-	Result  map[string]any `json:"result,omitempty"`
-	Error   map[string]any `json:"error,omitempty"`
-	Jsonrpc string         `json:"jsonrpc"`
-	Id      *int           `json:"id,omitempty"`
-}