tapdb+tapgarden: replace RandSeedlingMintingBatch with RandMintingBatch

RandSeedlingMintingBatch retires.

Author: ffranr

tapdb/asset_minting_test.go

@@ -504,7 +504,9 @@ func TestCommitMintingBatchSeedlings(t *testing.T) {
 	// First, we'll write a new minting batch to disk, including an
 	// internal key and a set of seedlings. One random seedling will
 	// be a reissuance into a specific group.
-	mintingBatch := tapgarden.RandSeedlingMintingBatch(t, numSeedlings)
+	mintingBatch := tapgarden.RandMintingBatch(
+		t, tapgarden.WithTotalSeedlings(numSeedlings),
+	)
 	_, randGroup, _ := addRandGroupToBatch(
 		t, assetStore, ctx, mintingBatch.Seedlings,
 	)
@@ -605,7 +607,9 @@ func TestCommitMintingBatchSeedlings(t *testing.T) {
 
 	// Insert another normal batch into the database. We should get this
 	// batch back if we query for the set of non-final batches.
-	mintingBatch = tapgarden.RandSeedlingMintingBatch(t, numSeedlings)
+	mintingBatch = tapgarden.RandMintingBatch(
+		t, tapgarden.WithTotalSeedlings(numSeedlings),
+	)
 	err = assetStore.CommitMintingBatch(ctx, mintingBatch)
 	require.NoError(t, err)
 	mintingBatches = noError1(t, assetStore.FetchNonFinalBatches, ctx)
@@ -852,7 +856,9 @@ func TestAddSproutsToBatch(t *testing.T) {
 
 	// First, we'll create a new batch, then add some sample seedlings.
 	// One random seedling will be a reissuance into a specific group.
-	mintingBatch := tapgarden.RandSeedlingMintingBatch(t, numSeedlings)
+	mintingBatch := tapgarden.RandMintingBatch(
+		t, tapgarden.WithTotalSeedlings(numSeedlings),
+	)
 	_, seedlingGroups, _ := addRandGroupToBatch(
 		t, assetStore, ctx, mintingBatch.Seedlings,
 	)
@@ -950,7 +956,9 @@ type randAssetCtx struct {
 func addRandAssets(t *testing.T, ctx context.Context,
 	assetStore *AssetMintingStore, numAssets int) randAssetCtx {
 
-	mintingBatch := tapgarden.RandSeedlingMintingBatch(t, numAssets)
+	mintingBatch := tapgarden.RandMintingBatch(
+		t, tapgarden.WithTotalSeedlings(numAssets),
+	)
 	genAmt, seedlingGroups, group := addRandGroupToBatch(
 		t, assetStore, ctx, mintingBatch.Seedlings,
 	)
@@ -1464,7 +1472,9 @@ func TestGroupAnchors(t *testing.T) {
 	// internal key and a set of seedlings. One random seedling will
 	// be a reissuance into a specific group. Two other seedlings will form
 	// a multi-asset group.
-	mintingBatch := tapgarden.RandSeedlingMintingBatch(t, numSeedlings)
+	mintingBatch := tapgarden.RandMintingBatch(
+		t, tapgarden.WithTotalSeedlings(numSeedlings),
+	)
 	_, seedlingGroups, _ := addRandGroupToBatch(
 		t, assetStore, ctx, mintingBatch.Seedlings,
 	)

tapgarden/mock.go

@@ -323,29 +323,6 @@ func RandSeedlings(t testing.TB, numSeedlings int) map[string]*Seedling {
 	return seedlings
 }
 
-// RandSeedlingMintingBatch creates a new minting batch with only random
-// seedlings populated for testing.
-//
-// TODO(ffranr): Replace this function with RandMintingBatch. Note also function
-// addRandGroupToBatch.
-func RandSeedlingMintingBatch(t testing.TB, numSeedlings int) *MintingBatch {
-	genesisTx := NewGenesisTx(t, chainfee.FeePerKwFloor)
-	BatchKey, _ := test.RandKeyDesc(t)
-	return &MintingBatch{
-		BatchKey:     BatchKey,
-		Seedlings:    RandSeedlings(t, numSeedlings),
-		HeightHint:   test.RandInt[uint32](),
-		CreationTime: time.Now(),
-		GenesisPacket: &FundedMintAnchorPsbt{
-			FundedPsbt: tapsend.FundedPsbt{
-				Pkt:               &genesisTx,
-				ChangeOutputIndex: 1,
-			},
-			AssetAnchorOutIdx: 0,
-		},
-	}
-}
-
 type MockWalletAnchor struct {
 	FundPsbtSignal     chan *tapsend.FundedPsbt
 	SignPsbtSignal     chan struct{}