itest: query for all asset script types

To make sure our itests still work, we need to query assets with all
possible script key types.

Author: guggero

itest/assertions.go

@@ -46,6 +46,12 @@ var (
 
 	batchFrozen    = mintrpc.BatchState_BATCH_STATE_FROZEN
 	batchFinalized = mintrpc.BatchState_BATCH_STATE_FINALIZED
+
+	allScriptKeysQuery = &taprpc.ScriptKeyTypeQuery{
+		Type: &taprpc.ScriptKeyTypeQuery_AllTypes{
+			AllTypes: true,
+		},
+	}
 )
 
 // tapClient is an interface that covers all currently available RPC interfaces
@@ -1336,7 +1342,8 @@ func AssertBalanceByID(t *testing.T, client taprpc.TaprootAssetsClient,
 			GroupBy: &taprpc.ListBalancesRequest_AssetId{
 				AssetId: true,
 			},
-			AssetFilter: id,
+			AssetFilter:   id,
+			ScriptKeyType: allScriptKeysQuery,
 		},
 	)
 	require.NoError(t, err)
@@ -1902,7 +1909,9 @@ func AssertAssetsMinted(t *testing.T, tapClient commands.RpcClientsBundle,
 	)
 
 	listRespConfirmed, err := tapClient.ListAssets(
-		ctxt, &taprpc.ListAssetRequest{},
+		ctxt, &taprpc.ListAssetRequest{
+			ScriptKeyType: allScriptKeysQuery,
+		},
 	)
 	require.NoError(t, err)
 	confirmedAssets := GroupAssetsByName(listRespConfirmed.Assets)
@@ -2198,6 +2207,7 @@ func assertNumAssetOutputs(t *testing.T, client taprpc.TaprootAssetsClient,
 
 	resp, err := client.ListAssets(ctxt, &taprpc.ListAssetRequest{
 		IncludeLeased: true,
+		ScriptKeyType: allScriptKeysQuery,
 	})
 	require.NoError(t, err)
 

itest/assets_test.go

@@ -241,7 +241,9 @@ func transferAssetProofs(t *harnessTest, src, dst *tapdHarness,
 	}
 
 	listResp, err := dst.ListAssets(
-		ctxt, &taprpc.ListAssetRequest{},
+		ctxt, &taprpc.ListAssetRequest{
+			ScriptKeyType: allScriptKeysQuery,
+		},
 	)
 	require.NoError(t.t, err)
 

itest/burn_test.go

@@ -157,9 +157,10 @@ func testBurnAssets(t *harnessTest) {
 
 	// We'll now assert that the burned asset has the correct state.
 	burnedAsset := burnResp.BurnProof.Asset
-	allAssets, err := t.tapd.ListAssets(
-		ctxt, &taprpc.ListAssetRequest{IncludeSpent: true},
-	)
+	allAssets, err := t.tapd.ListAssets(ctxt, &taprpc.ListAssetRequest{
+		IncludeSpent:  true,
+		ScriptKeyType: allScriptKeysQuery,
+	})
 	require.NoError(t.t, err)
 	AssertAssetStateByScriptKey(
 		t.t, allAssets.Assets, burnedAsset.ScriptKey,
@@ -454,9 +455,10 @@ func testBurnGroupedAssets(t *harnessTest) {
 
 	// Ensure that the burnt asset has the correct state.
 	burnedAsset := burnResp.BurnProof.Asset
-	allAssets, err := t.tapd.ListAssets(
-		ctxb, &taprpc.ListAssetRequest{IncludeSpent: true},
-	)
+	allAssets, err := t.tapd.ListAssets(ctxb, &taprpc.ListAssetRequest{
+		IncludeSpent:  true,
+		ScriptKeyType: allScriptKeysQuery,
+	})
 	require.NoError(t.t, err)
 	AssertAssetStateByScriptKey(
 		t.t, allAssets.Assets, burnedAsset.ScriptKey,

itest/psbt_test.go

@@ -874,7 +874,9 @@ func runPsbtInteractiveSplitSendTest(ctxt context.Context, t *harnessTest,
 		)
 
 		senderAssets, err := sender.ListAssets(
-			ctxt, &taprpc.ListAssetRequest{},
+			ctxt, &taprpc.ListAssetRequest{
+				ScriptKeyType: allScriptKeysQuery,
+			},
 		)
 		require.NoError(t.t, err)
 
@@ -898,7 +900,9 @@ func runPsbtInteractiveSplitSendTest(ctxt context.Context, t *harnessTest,
 		require.Len(t.t, senderAssets.Assets, numSenderAssets)
 
 		receiverAssets, err := receiver.ListAssets(
-			ctxt, &taprpc.ListAssetRequest{},
+			ctxt, &taprpc.ListAssetRequest{
+				ScriptKeyType: allScriptKeysQuery,
+			},
 		)
 		require.NoError(t.t, err)
 		require.Len(t.t, receiverAssets.Assets, numReceiverAssets)
@@ -1226,13 +1230,17 @@ func testPsbtInteractiveTapscriptSibling(t *harnessTest) {
 	)
 
 	senderAssets, err := alice.ListAssets(
-		ctxt, &taprpc.ListAssetRequest{},
+		ctxt, &taprpc.ListAssetRequest{
+			ScriptKeyType: allScriptKeysQuery,
+		},
 	)
 	require.NoError(t.t, err)
 	require.Len(t.t, senderAssets.Assets, 1)
 
 	receiverAssets, err := bob.ListAssets(
-		ctxt, &taprpc.ListAssetRequest{},
+		ctxt, &taprpc.ListAssetRequest{
+			ScriptKeyType: allScriptKeysQuery,
+		},
 	)
 	require.NoError(t.t, err)
 	require.Len(t.t, receiverAssets.Assets, 1)
@@ -1402,13 +1410,17 @@ func testPsbtMultiSend(t *harnessTest) {
 	)
 
 	senderAssets, err := sender.ListAssets(
-		ctxt, &taprpc.ListAssetRequest{},
+		ctxt, &taprpc.ListAssetRequest{
+			ScriptKeyType: allScriptKeysQuery,
+		},
 	)
 	require.NoError(t.t, err)
 	require.Len(t.t, senderAssets.Assets, 4)
 
 	receiverAssets, err := receiver.ListAssets(
-		ctxt, &taprpc.ListAssetRequest{},
+		ctxt, &taprpc.ListAssetRequest{
+			ScriptKeyType: allScriptKeysQuery,
+		},
 	)
 	require.NoError(t.t, err)
 	require.Len(t.t, receiverAssets.Assets, 2)

itest/utils.go

@@ -449,6 +449,7 @@ func FinalizeBatchUnconfirmed(t *testing.T, minerClient *rpcclient.Client,
 	listRespUnconfirmed, err := tapClient.ListAssets(
 		ctxt, &taprpc.ListAssetRequest{
 			IncludeUnconfirmedMints: true,
+			ScriptKeyType:           allScriptKeysQuery,
 		},
 	)
 	require.NoError(t, err)