itest: add coop close assertion for grouped channels

Makes sure we properly assert the final closing balances of coop closed
grouped asset channels.

Author: guggero

itest/assets_test.go

@@ -1844,6 +1844,10 @@ func defaultCoOpCloseBalanceCheck(t *testing.T, local, remote *HarnessNode,
 	assetIDs [][]byte, groupKey []byte, universeTap *tapClient,
 	remoteBtcBalance, remoteAssetBalance bool) {
 
+	ctxb := context.Background()
+	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
+	defer cancel()
+
 	// With the channel closed, we'll now assert that the co-op close
 	// transaction was inserted into the local universe.
 	//
@@ -1941,10 +1945,34 @@ func defaultCoOpCloseBalanceCheck(t *testing.T, local, remote *HarnessNode,
 		closeTx.TxOut[localAssetIndex].PkScript,
 	)
 
+	// Because we don't exactly know what asset IDs made it into the close
+	// transaction, we need to fetch the closed channel to find that out.
+	closedChans, err := local.ClosedChannels(
+		ctxt, &lnrpc.ClosedChannelsRequest{
+			Cooperative: true,
+		},
+	)
+	require.NoError(t, err)
+	require.NotEmpty(t, closedChans.Channels)
+
+	var closedJsonChannel *rfqmsg.JsonAssetChannel
+	for _, closedChan := range closedChans.Channels {
+		if closedChan.ClosingTxHash == closeTx.TxHash().String() {
+			closedJsonChannel = &rfqmsg.JsonAssetChannel{}
+			err = json.Unmarshal(
+				closedChan.CustomChannelData, closedJsonChannel,
+			)
+			require.NoError(t, err)
+
+			break
+		}
+	}
+	require.NotNil(t, closedJsonChannel)
+
 	// We now verify the arrival of the local balance asset proof at the
 	// universe server.
 	var localAssetCloseOut rfqmsg.JsonCloseOutput
-	err := json.Unmarshal(
+	err = json.Unmarshal(
 		localCloseOut.CustomChannelData, &localAssetCloseOut,
 	)
 	require.NoError(t, err)
@@ -1956,6 +1984,19 @@ func defaultCoOpCloseBalanceCheck(t *testing.T, local, remote *HarnessNode,
 
 		require.Contains(t, assetIDStrings, assetIDStr)
 
+		// We only check for a proof if an asset of that asset ID was
+		// actually in the close output, which might not always be the
+		// case in grouped asset channels.
+		localAssetIDs := fn.NewSet[string](fn.Map(
+			func(t rfqmsg.JsonAssetTranche) string {
+				return t.AssetID
+			},
+			closedJsonChannel.LocalAssets,
+		)...)
+		if !localAssetIDs.Contains(assetIDStr) {
+			continue
+		}
+
 		assetID, err := hex.DecodeString(assetIDStr)
 		require.NoError(t, err)
 
@@ -1995,6 +2036,19 @@ func defaultCoOpCloseBalanceCheck(t *testing.T, local, remote *HarnessNode,
 
 		require.Contains(t, assetIDStrings, assetIDStr)
 
+		// We only check for a proof if an asset of that asset ID was
+		// actually in the close output, which might not always be the
+		// case in grouped asset channels.
+		remoteAssetIDs := fn.NewSet[string](fn.Map(
+			func(t rfqmsg.JsonAssetTranche) string {
+				return t.AssetID
+			},
+			closedJsonChannel.RemoteAssets,
+		)...)
+		if !remoteAssetIDs.Contains(assetIDStr) {
+			continue
+		}
+
 		assetID, err := hex.DecodeString(assetIDStr)
 		require.NoError(t, err)
 

itest/litd_custom_channels_test.go

@@ -1308,10 +1308,7 @@ func testCustomChannelsGroupTranchesForceClose(ctx context.Context,
 	closeAssetChannelAndAssert(
 		t, net, charlie, dave, chanPointCD,
 		[][]byte{assetID1, assetID2}, groupKey, universeTap,
-		// TODO(guggero): replace this with
-		// assertDefaultCoOpCloseBalance(true, true) once we have the
-		// ability to check the custom data in the closed channel list.
-		noOpCoOpCloseBalanceCheck,
+		assertDefaultCoOpCloseBalance(true, true),
 	)
 
 	assertSpendableBalance(