unittests+mock: add missing args to NewGroupKeyRequestNoErr

Add externalKey and customTapscriptRoot arguments to the mock function
NewGroupKeyRequestNoErr, enabling them to be specified during testing.

Author: ffranr

asset/asset_test.go

@@ -10,6 +10,7 @@ import (
 	"github.com/btcsuite/btcd/blockchain"
 	"github.com/btcsuite/btcd/btcec/v2"
 	"github.com/btcsuite/btcd/btcec/v2/schnorr"
+	"github.com/btcsuite/btcd/chaincfg/chainhash"
 	"github.com/btcsuite/btcd/txscript"
 	"github.com/btcsuite/btcd/wire"
 	"github.com/lightninglabs/taproot-assets/fn"
@@ -887,7 +888,10 @@ func TestAssetGroupKey(t *testing.T) {
 	// TweakTaprootPrivKey modifies the private key that is passed in! We
 	// need to provide a copy to arrive at the same result.
 	protoAsset := NewAssetNoErr(t, g, 1, 0, 0, fakeScriptKey, nil)
-	groupReq := NewGroupKeyRequestNoErr(t, fakeKeyDesc, g, protoAsset, nil)
+	groupReq := NewGroupKeyRequestNoErr(
+		t, fakeKeyDesc, fn.None[ExternalKey](), g, protoAsset, nil,
+		fn.None[chainhash.Hash](),
+	)
 	genTx, err := groupReq.BuildGroupVirtualTx(&genBuilder)
 	require.NoError(t, err)
 
@@ -905,7 +909,8 @@ func TestAssetGroupKey(t *testing.T) {
 	tweakedKey = txscript.TweakTaprootPrivKey(*internalKey, tapTweak)
 
 	groupReq = NewGroupKeyRequestNoErr(
-		t, test.PubToKeyDesc(privKey.PubKey()), g, protoAsset, tapTweak,
+		t, test.PubToKeyDesc(privKey.PubKey()), fn.None[ExternalKey](),
+		g, protoAsset, tapTweak, fn.None[chainhash.Hash](),
 	)
 	genTx, err = groupReq.BuildGroupVirtualTx(&genBuilder)
 	require.NoError(t, err)

asset/mock.go

@@ -617,11 +617,13 @@ func NewAssetNoErr(t testing.TB, gen Genesis, amt, locktime, relocktime uint64,
 }
 
 func NewGroupKeyRequestNoErr(t testing.TB, internalKey keychain.KeyDescriptor,
-	gen Genesis, newAsset *Asset, scriptRoot []byte) *GroupKeyRequest {
+	externalKey fn.Option[ExternalKey], gen Genesis, newAsset *Asset,
+	scriptRoot []byte,
+	customTapscriptRoot fn.Option[chainhash.Hash]) *GroupKeyRequest {
 
 	req, err := NewGroupKeyRequest(
-		internalKey, fn.None[ExternalKey](), gen, newAsset, scriptRoot,
-		fn.None[chainhash.Hash](),
+		internalKey, externalKey, gen, newAsset, scriptRoot,
+		customTapscriptRoot,
 	)
 	require.NoError(t, err)
 

commitment/commitment_test.go

@@ -149,8 +149,8 @@ func TestNewAssetCommitment(t *testing.T) {
 	genTxBuilder := asset.MockGroupTxBuilder{}
 	group1Priv, group1Pub := btcec.PrivKeyFromBytes(group1PrivBytes)
 	group1ReissuedGroupReq := asset.NewGroupKeyRequestNoErr(
-		t, test.PubToKeyDesc(group1Pub), genesis1, genesis2ProtoAsset,
-		nil,
+		t, test.PubToKeyDesc(group1Pub), fn.None[asset.ExternalKey](),
+		genesis1, genesis2ProtoAsset, nil, fn.None[chainhash.Hash](),
 	)
 	group1ReissuedGenTx, err := group1ReissuedGroupReq.BuildGroupVirtualTx(
 		&genTxBuilder,
@@ -1021,7 +1021,8 @@ func TestUpdateAssetCommitment(t *testing.T) {
 	genTxBuilder := asset.MockGroupTxBuilder{}
 	group1Priv, group1Pub := btcec.PrivKeyFromBytes(group1PrivBytes)
 	group1ReissuedGroupReq := asset.NewGroupKeyRequestNoErr(
-		t, test.PubToKeyDesc(group1Pub), genesis1, group1Reissued, nil,
+		t, test.PubToKeyDesc(group1Pub), fn.None[asset.ExternalKey](),
+		genesis1, group1Reissued, nil, fn.None[chainhash.Hash](),
 	)
 	group1ReissuedGenTx, err := group1ReissuedGroupReq.BuildGroupVirtualTx(
 		&genTxBuilder,

tapdb/asset_minting_test.go

@@ -132,7 +132,8 @@ func storeGroupGenesis(t *testing.T, ctx context.Context, initGen asset.Genesis,
 		t, assetGen, nil, asset.RandScriptKey(t),
 	)
 	groupReq := asset.NewGroupKeyRequestNoErr(
-		t, privDesc, initGen, genProtoAsset, nil,
+		t, privDesc, fn.None[asset.ExternalKey](), initGen,
+		genProtoAsset, nil, fn.None[chainhash.Hash](),
 	)
 	genTx, err := groupReq.BuildGroupVirtualTx(&genTxBuilder)
 	require.NoError(t, err)
@@ -671,8 +672,10 @@ func seedlingsToAssetRoot(t *testing.T, genesisPoint wire.OutPoint,
 		if groupInfo != nil {
 			groupReq := asset.NewGroupKeyRequestNoErr(
 				t, groupInfo.GroupKey.RawKey,
+				fn.None[asset.ExternalKey](),
 				*groupInfo.Genesis, protoAsset,
 				groupInfo.GroupKey.TapscriptRoot,
+				fn.None[chainhash.Hash](),
 			)
 			genTx, err := groupReq.BuildGroupVirtualTx(
 				&genTxBuilder,
@@ -690,8 +693,10 @@ func seedlingsToAssetRoot(t *testing.T, genesisPoint wire.OutPoint,
 			groupKeyRaw, newGroupPriv := test.RandKeyDesc(t)
 			genSigner := asset.NewMockGenesisSigner(newGroupPriv)
 			groupReq := asset.NewGroupKeyRequestNoErr(
-				t, groupKeyRaw, assetGen, protoAsset,
+				t, groupKeyRaw, fn.None[asset.ExternalKey](),
+				assetGen, protoAsset,
 				seedling.GroupTapscriptRoot,
+				fn.None[chainhash.Hash](),
 			)
 			genTx, err := groupReq.BuildGroupVirtualTx(
 				&genTxBuilder,

tapdb/assets_store_test.go

@@ -167,7 +167,8 @@ func randAsset(t *testing.T, genOpts ...assetGenOpt) *asset.Asset {
 	}
 
 	groupReq := asset.NewGroupKeyRequestNoErr(
-		t, groupKeyDesc, initialGen, protoAsset, nil,
+		t, groupKeyDesc, fn.None[asset.ExternalKey](), initialGen,
+		protoAsset, nil, fn.None[chainhash.Hash](),
 	)
 	genTx, err := groupReq.BuildGroupVirtualTx(&genTxBuilder)
 	require.NoError(t, err)