rpcutils: move universe gRPC marshal functionality from taprpc

Move universe related gRPC marshalling functionality from the taprpc
package to the rpcutils package as preparation for future
modularization.

Author: ffranr

itest/universe_test.go

@@ -17,6 +17,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/fn"
 	"github.com/lightninglabs/taproot-assets/internal/test"
 	"github.com/lightninglabs/taproot-assets/mssmt"
+	"github.com/lightninglabs/taproot-assets/rpcutils"
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
 	unirpc "github.com/lightninglabs/taproot-assets/taprpc/universerpc"
@@ -760,7 +761,7 @@ func testFederationSyncConfig(t *harnessTest) {
 		AssetID:   assetID1,
 		ProofType: universe.ProofTypeIssuance,
 	}
-	uniIdRpc1 := unirpc.MarshalUniverseID(assetIDBytes1, nil)
+	uniIdRpc1 := rpcutils.MarshalUniverseID(assetIDBytes1, nil)
 	uniIdRpc1.ProofType = unirpc.ProofType_PROOF_TYPE_ISSUANCE
 
 	// Generate universe ID #2.
@@ -771,7 +772,7 @@ func testFederationSyncConfig(t *harnessTest) {
 		GroupKey:  groupKey2,
 		ProofType: universe.ProofTypeTransfer,
 	}
-	uniIdRpc2 := unirpc.MarshalUniverseID(nil, groupKeyBytes2)
+	uniIdRpc2 := rpcutils.MarshalUniverseID(nil, groupKeyBytes2)
 	uniIdRpc2.ProofType = unirpc.ProofType_PROOF_TYPE_TRANSFER
 
 	// Set both the global and a universe specific federation sync configs.

proof/courier.go

@@ -1328,7 +1328,7 @@ func (c *UniverseRpcCourier) DeliverProof(ctx context.Context,
 
 		// Construct universe key.
 		outPoint := transitionProof.OutPoint()
-		assetKey := unirpc.MarshalAssetKey(
+		assetKey := rpcutils.MarshalAssetKey(
 			outPoint, proofAsset.ScriptKey.PubKey,
 		)
 		assetID := proofAsset.ID()
@@ -1342,7 +1342,7 @@ func (c *UniverseRpcCourier) DeliverProof(ctx context.Context,
 			groupPubKeyBytes = groupPubKey.SerializeCompressed()
 		}
 
-		universeID := unirpc.MarshalUniverseID(
+		universeID := rpcutils.MarshalUniverseID(
 			assetID[:], groupPubKeyBytes,
 		)
 		universeKey := unirpc.UniverseKey{
@@ -1424,10 +1424,10 @@ func (c *UniverseRpcCourier) ReceiveProof(ctx context.Context,
 		}
 
 		universeKey := unirpc.UniverseKey{
-			Id: unirpc.MarshalUniverseID(
+			Id: rpcutils.MarshalUniverseID(
 				loc.AssetID[:], groupKeyBytes,
 			),
-			LeafKey: unirpc.MarshalAssetKey(
+			LeafKey: rpcutils.MarshalAssetKey(
 				*loc.OutPoint, &loc.ScriptKey,
 			),
 		}

rpcserver.go

@@ -6563,7 +6563,7 @@ func MarshalAssetFedSyncCfg(
 	if uniID.GroupKey != nil {
 		groupKeyBytes = uniID.GroupKey.SerializeCompressed()
 	}
-	uniIdRPC := unirpc.MarshalUniverseID(assetIDBytes, groupKeyBytes)
+	uniIdRPC := rpcutils.MarshalUniverseID(assetIDBytes, groupKeyBytes)
 
 	// Marshal proof type.
 	proofTypeRpc, err := MarshalUniProofType(uniID.ProofType)

taprpc/universerpc/marshal.go renamed to rpcutils/universe_marshal.go

@@ -1,52 +1,52 @@
-package universerpc
+package rpcutils
 
 import (
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/wire"
+	"github.com/lightninglabs/taproot-assets/taprpc/universerpc"
 )
 
 // MarshalOutpoint marshals a wire.OutPoint into an RPC ready Outpoint.
-//
-// TODO(ffranr): Move this package's Outpoint type and this marshal function to
-// somewhere more general.
-func MarshalOutpoint(outPoint wire.OutPoint) *Outpoint {
-	return &Outpoint{
+func MarshalOutpoint(outPoint wire.OutPoint) *universerpc.Outpoint {
+	return &universerpc.Outpoint{
 		HashStr: outPoint.Hash.String(),
 		Index:   int32(outPoint.Index),
 	}
 }
 
 // MarshalAssetKey returns an RPC ready AssetKey.
 func MarshalAssetKey(outPoint wire.OutPoint,
-	scriptKeyPubKey *btcec.PublicKey) *AssetKey {
+	scriptKeyPubKey *btcec.PublicKey) *universerpc.AssetKey {
 
 	scriptKeyBytes := scriptKeyPubKey.SerializeCompressed()
 
-	return &AssetKey{
-		Outpoint: &AssetKey_Op{
+	return &universerpc.AssetKey{
+		Outpoint: &universerpc.AssetKey_Op{
 			Op: MarshalOutpoint(outPoint),
 		},
-		ScriptKey: &AssetKey_ScriptKeyBytes{
+		ScriptKey: &universerpc.AssetKey_ScriptKeyBytes{
 			ScriptKeyBytes: scriptKeyBytes,
 		},
 	}
 }
 
 // MarshalUniverseID returns an RPC ready universe ID.
-func MarshalUniverseID(assetIDBytes []byte, groupKeyBytes []byte) *ID {
+func MarshalUniverseID(assetIDBytes []byte,
+	groupKeyBytes []byte) *universerpc.ID {
+
 	// We will marshal either a group key ID or an asset ID. If group key
 	// bytes are given, we marshal a group key ID, otherwise we marshal an
 	// asset ID.
 	if groupKeyBytes != nil {
-		return &ID{
-			Id: &ID_GroupKey{
+		return &universerpc.ID{
+			Id: &universerpc.ID_GroupKey{
 				GroupKey: groupKeyBytes,
 			},
 		}
 	}
 
-	return &ID{
-		Id: &ID_AssetId{
+	return &universerpc.ID{
+		Id: &universerpc.ID_AssetId{
 			AssetId: assetIDBytes,
 		},
 	}