itest: update ListBatches calls

Author: jharveyb

itest/assertions.go

@@ -331,9 +331,9 @@ func WaitForBatchState(t *testing.T, ctx context.Context,
 				len(batchResp.Batches))
 		}
 
-		if batchResp.Batches[0].State != targetState {
+		if batchResp.Batches[0].Batch.State != targetState {
 			return fmt.Errorf("expected batch state %v, got %v",
-				targetState, batchResp.Batches[0].State)
+				targetState, batchResp.Batches[0].Batch.State)
 		}
 
 		return nil

itest/assets_test.go

@@ -290,18 +290,20 @@ func testMintAssetNameCollisionError(t *harnessTest) {
 	allBatches := rpcBatches.Batches
 	require.Len(t.t, allBatches, 2)
 
-	isCollidingBatch := func(batch *mintrpc.MintingBatch) bool {
-		if len(batch.Assets) == 0 {
+	isCollidingBatch := func(batch *mintrpc.VerboseBatch) bool {
+		if len(batch.Batch.Assets) == 0 {
 			return false
 		}
 
-		return batch.Assets[0].AssetType == taprpc.AssetType_COLLECTIBLE
+		assetType := batch.Batch.Assets[0].AssetType
+
+		return assetType == taprpc.AssetType_COLLECTIBLE
 	}
 	batchCollide, err := fn.First(allBatches, isCollidingBatch)
 	require.NoError(t.t, err)
 
-	require.Len(t.t, batchCollide.Assets, 1)
-	equalityCheck(assetCollide.Asset, batchCollide.Assets[0])
+	require.Len(t.t, batchCollide.Batch.Assets, 1)
+	equalityCheck(assetCollide.Asset, batchCollide.Batch.Assets[0])
 
 	cancelBatchKey, err := t.tapd.CancelBatch(
 		ctxt, &mintrpc.CancelBatchRequest{},
@@ -323,11 +325,12 @@ func testMintAssetNameCollisionError(t *harnessTest) {
 
 	require.Len(t.t, cancelBatch.Batches, 1)
 	cancelBatchCollide := cancelBatch.Batches[0]
-	require.Len(t.t, cancelBatchCollide.Assets, 1)
+	require.Len(t.t, cancelBatchCollide.Batch.Assets, 1)
 	equalityCheckSeedlings(
-		batchCollide.Assets[0], cancelBatchCollide.Assets[0],
+		batchCollide.Batch.Assets[0],
+		cancelBatchCollide.Batch.Assets[0],
 	)
-	cancelBatchState := cancelBatchCollide.State
+	cancelBatchState := cancelBatchCollide.Batch.State
 	require.Equal(
 		t.t, cancelBatchState,
 		mintrpc.BatchState_BATCH_STATE_SEEDLING_CANCELLED,

itest/multisig.go

@@ -17,7 +17,6 @@ import (
 	"github.com/davecgh/go-spew/spew"
 	"github.com/decred/dcrd/dcrec/secp256k1/v4"
 	"github.com/lightninglabs/lndclient"
-	tap "github.com/lightninglabs/taproot-assets"
 	"github.com/lightninglabs/taproot-assets/asset"
 	"github.com/lightninglabs/taproot-assets/commitment"
 	"github.com/lightninglabs/taproot-assets/fn"
@@ -171,7 +170,7 @@ func MultiSigTest(t *testing.T, ctx context.Context, aliceTapd,
 	muSig2Addr, err := bobTapd.NewAddr(ctxt, &taprpc.NewAddrRequest{
 		AssetId:   firstBatchGenesis.AssetId,
 		Amt:       assetsToSend,
-		ScriptKey: tap.MarshalScriptKey(tapScriptKey),
+		ScriptKey: taprpc.MarshalScriptKey(tapScriptKey),
 		InternalKey: &taprpc.KeyDescriptor{
 			RawKeyBytes: pubKeyBytes(btcInternalKey),
 		},
@@ -372,7 +371,7 @@ func DeriveKeys(t *testing.T, tapd TapdClient) (asset.ScriptKey,
 		},
 	)
 	require.NoError(t, err)
-	scriptKey, err := tap.UnmarshalScriptKey(scriptKeyDesc.ScriptKey)
+	scriptKey, err := taprpc.UnmarshalScriptKey(scriptKeyDesc.ScriptKey)
 	require.NoError(t, err)
 
 	internalKeyDesc, err := tapd.NextInternalKey(
@@ -381,7 +380,7 @@ func DeriveKeys(t *testing.T, tapd TapdClient) (asset.ScriptKey,
 		},
 	)
 	require.NoError(t, err)
-	internalKeyLnd, err := tap.UnmarshalKeyDescriptor(
+	internalKeyLnd, err := taprpc.UnmarshalKeyDescriptor(
 		internalKeyDesc.InternalKey,
 	)
 	require.NoError(t, err)

itest/utils.go

@@ -421,7 +421,7 @@ func MintAssetsConfirmBatch(t *testing.T, minerClient *rpcclient.Client,
 	require.Len(t, batchResp.Batches, 1)
 
 	batch := batchResp.Batches[0]
-	require.NotEmpty(t, batch.BatchTxid)
+	require.NotEmpty(t, batch.Batch.BatchTxid)
 
 	return AssertAssetsMinted(
 		t, tapClient, assetRequests, mintTXID, blockHash,