api: test and slightly improve protoFormat

api/chain.go

@@ -706,7 +706,7 @@ func (a *API) chainTxHandler(_ *apirest.APIdata, ctx *httprouter.HTTPContext) er
 		return ErrVochainGetTxFailed.WithErr(err)
 	}
 	tx := &GenericTransactionWithInfo{
-		TxContent: []byte(protoFormat(stx.Tx)),
+		TxContent: protoTxAsJSON(stx.Tx),
 		Signature: stx.Signature,
 		TxInfo:    *ref,
 	}

api/helpers.go

@@ -57,17 +57,21 @@ func (a *API) sendTx(tx []byte) (*cometcoretypes.ResultBroadcastTx, error) {
 	return resp, nil
 }
 
-func protoFormat(tx []byte) string {
+func protoTxAsJSON(tx []byte) []byte {
 	ptx := models.Tx{}
 	if err := proto.Unmarshal(tx, &ptx); err != nil {
-		return ""
+		panic(err)
 	}
 	pj := protojson.MarshalOptions{
 		Multiline:       false,
 		Indent:          "",
 		EmitUnpopulated: true,
 	}
-	return pj.Format(&ptx)
+	asJSON, err := pj.Marshal(&ptx)
+	if err != nil {
+		panic(err)
+	}
+	return asJSON
 }
 
 // isTransactionType checks if the given transaction is of the given type.

api/helpers_test.go

@@ -3,11 +3,16 @@ package api
 import (
 	"bytes"
 	"encoding/json"
+	"strings"
 	"testing"
 
 	"github.com/ethereum/go-ethereum/common"
+	qt "github.com/frankban/quicktest"
 	"github.com/google/go-cmp/cmp"
 	"go.vocdoni.io/dvote/types"
+	"go.vocdoni.io/proto/build/go/models"
+	"google.golang.org/protobuf/encoding/protojson"
+	"google.golang.org/protobuf/proto"
 )
 
 func TestAPIHelpers_encodeEVMResultsArgs(t *testing.T) {
@@ -149,3 +154,31 @@ func TestConvertKeysToCamel(t *testing.T) {
 		t.Fatal(diff)
 	}
 }
+
+func TestProtoTxAsJSON(t *testing.T) {
+	wantJSON := strings.TrimSpace(`
+{
+	"setProcess": {
+		"txtype": "SET_PROCESS_CENSUS",
+		"nonce": 1,
+		"processId": "sx3/YYFNq5DWw6m2XWyQgwSA5Lda0y50eUICAAAAAAA=",
+		"censusRoot": "zUU9BcTLBCnuXuGu/tAW9VO4AmtM7VsMNSkFv6U8foE=",
+		"censusURI": "ipfs://bafybeicyfukarcryrvy5oe37ligmxwf55sbfiojori4t25wencma4ymxfa",
+		"censusSize": "1000"
+	}
+}
+`)
+	var ptx models.Tx
+	err := protojson.Unmarshal([]byte(wantJSON), &ptx)
+	qt.Assert(t, err, qt.IsNil)
+
+	asProto, err := proto.Marshal(&ptx)
+	qt.Assert(t, err, qt.IsNil)
+
+	var dst bytes.Buffer
+	err = json.Indent(&dst, protoTxAsJSON(asProto), "", "\t")
+	qt.Assert(t, err, qt.IsNil)
+	gotJSON := dst.String()
+
+	qt.Assert(t, gotJSON, qt.Equals, wantJSON)
+}