itest: add proper assertions for asset UTXOs

Author: guggero

itest/assets_test.go

@@ -20,6 +20,7 @@ import (
 	"github.com/lightninglabs/taproot-assets/proof"
 	"github.com/lightninglabs/taproot-assets/rfqmsg"
 	"github.com/lightninglabs/taproot-assets/tapchannel"
+	"github.com/lightninglabs/taproot-assets/tapfreighter"
 	"github.com/lightninglabs/taproot-assets/taprpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/assetwalletrpc"
 	"github.com/lightninglabs/taproot-assets/taprpc/mintrpc"
@@ -890,16 +891,41 @@ func createAssetInvoice(t *testing.T, dstRfqPeer, dst *HarnessNode,
 	return invoiceResp
 }
 
+func waitForSendEvent(t *testing.T,
+	sendEvents taprpc.TaprootAssets_SubscribeSendEventsClient,
+	expectedState tapfreighter.SendState) {
+
+	for {
+		sendEvent, err := sendEvents.Recv()
+		require.NoError(t, err)
+
+		t.Logf("Received send event: %v", sendEvent.SendState)
+		if sendEvent.SendState == expectedState.String() {
+			return
+		}
+	}
+}
+
 func closeAssetChannelAndAssert(t *harnessTest, net *NetworkHarness,
 	local, remote *HarnessNode, chanPoint *lnrpc.ChannelPoint,
 	assetID, groupKey []byte, universeTap *tapClient, remoteBtcBalance,
 	remoteAssetBalance bool) {
 
+	ctxb := context.Background()
+	ctxt, cancel := context.WithTimeout(ctxb, defaultTimeout)
+	defer cancel()
+
 	closeStream, _, err := t.lndHarness.CloseChannel(
 		local, chanPoint, false,
 	)
 	require.NoError(t.t, err)
 
+	localTapd := newTapClient(t.t, local)
+	sendEvents, err := localTapd.SubscribeSendEvents(
+		ctxt, &taprpc.SubscribeSendEventsRequest{},
+	)
+	require.NoError(t.t, err)
+
 	mineBlocks(t, net, 1, 1)
 
 	closeUpdate, err := t.lndHarness.WaitForChannelClose(closeStream)
@@ -913,6 +939,14 @@ func closeAssetChannelAndAssert(t *harnessTest, net *NetworkHarness,
 	t.Logf("Channel closed with txid: %v", closeTxid)
 	t.Logf("Close transaction: %v", spew.Sdump(closeTx))
 
+	// TODO(guggero): Remove this if once the receiver of a channel imports
+	// the proofs correctly as well.
+	if localTapd.node.Name() != "Yara" {
+		waitForSendEvent(
+			t.t, sendEvents, tapfreighter.SendStateComplete,
+		)
+	}
+
 	// With the channel closed, we'll now assert that the co-op close
 	// transaction was inserted into the local universe.
 	//
@@ -1028,8 +1062,6 @@ func closeAssetChannelAndAssert(t *harnessTest, net *NetworkHarness,
 			fmt.Sprintf("%v:%v", closeTxid, localAssetIndex),
 		)
 
-		localTapd := newTapClient(t.t, local)
-
 		scriptKey, err := btcec.ParsePubKey(scriptKeyBytes)
 		require.NoError(t.t, err)
 		assertAssetExists(

itest/litd_custom_channels_test.go

@@ -447,6 +447,7 @@ func testCustomChannels(_ context.Context, net *NetworkHarness,
 	)
 
 	// Charlie should still have four asset pieces, two with the same size.
+	assertNumAssetOutputs(t.t, charlieTap, assetID, 2)
 	assertAssetExists(
 		t.t, charlieTap, assetID, charlieAssetBalance-fundingAmount,
 		nil, true, false, false,
@@ -456,14 +457,44 @@ func testCustomChannels(_ context.Context, net *NetworkHarness,
 		false,
 	)
 
-	// For some reason, the channel funding output of the immediately closed
-	// channel is still present in the asset DB, even after we import the
-	// co-op close transaction proof.
-	// TODO(guggero): Investigate this. The actual number of outputs should
-	// be two here, and we shouldn't have the extra fundingAmount in the
-	// balance.
-	charlieAssetBalance += fundingAmount
-	assertNumAssetOutputs(t.t, charlieTap, assetID, 3)
+	// Dave should have two outputs, one from the initial channel with Yara
+	// and one from the remaining amount of the channel with Charlie.
+	assertNumAssetOutputs(t.t, daveTap, assetID, 2)
+	daveFirstChannelRemainder := daveFundingAmount - yaraInvoiceAssetAmount1
+	assertAssetExists(
+		t.t, daveTap, assetID, daveFirstChannelRemainder, nil, true,
+		true, false,
+	)
+	assertAssetExists(
+		t.t, daveTap, assetID,
+		daveAssetBalance-daveFirstChannelRemainder, nil, true, true,
+		false,
+	)
+
+	// Fabia and Yara should all have a single output each, just what was
+	// left over from the initial channel.
+	assertNumAssetOutputs(t.t, fabiaTap, assetID, 1)
+	assertAssetExists(
+		t.t, fabiaTap, assetID, fabiaAssetBalance, nil, true, true,
+		false,
+	)
+	assertNumAssetOutputs(t.t, yaraTap, assetID, 1)
+	assertAssetExists(
+		t.t, yaraTap, assetID, yaraAssetBalance, nil, true, true, false,
+	)
+
+	// Erin didn't use all of his assets when opening the channel, so he
+	// should have two outputs, the change from the channel opening and the
+	// remaining amount after closing the channel.
+	assertNumAssetOutputs(t.t, erinTap, assetID, 2)
+	erinChange := startAmount - erinFundingAmount
+	assertAssetExists(
+		t.t, erinTap, assetID, erinAssetBalance-erinChange, nil, true,
+		true, false,
+	)
+	assertAssetExists(
+		t.t, erinTap, assetID, erinChange, nil, true, false, false,
+	)
 
 	// The asset balances should still remain unchanged.
 	assertAssetBalance(t.t, charlieTap, assetID, charlieAssetBalance)