Merge branch 'itest/logdir' into feat/zero-value-utxo-selection

Author: darioAnongba

itest/assertions.go

@@ -1275,11 +1275,6 @@ func AssertAssetOutboundTransferWithOutputs(t *testing.T,
 		outpoints[o.Anchor.Outpoint] = struct{}{}
 		scripts[string(o.ScriptKey)] = struct{}{}
 	}
-
-	sendRespJSON, err := formatProtoJSON(transfer)
-	require.NoError(t, err)
-	t.Logf("Got response from sending assets: %v", sendRespJSON)
-
 	// Mine a block to force the send event to complete (confirm on-chain).
 	var newBlock *wire.MsgBlock
 	if confirm {
@@ -1318,23 +1313,11 @@ func AssertAssetOutboundTransferWithOutputs(t *testing.T,
 			inputAssetIDs, hex.EncodeToString,
 		)
 
-		t.Logf("Want input asset IDs: %v, got: %v",
-			expectedInputAssetIDs, actualInputAssetIDs)
 		return fn.All(
 			expectedInputAssetIDs, func(id string) bool {
 				return slices.Contains(actualInputAssetIDs, id)
 			})
 	}, defaultTimeout, wait.PollInterval)
-	require.NoError(t, err)
-
-	transferResp, err := sender.ListTransfers(
-		ctxb, &taprpc.ListTransfersRequest{},
-	)
-	require.NoError(t, err)
-
-	transferRespJSON, err := formatProtoJSON(transferResp)
-	require.NoError(t, err)
-	t.Logf("Got response from list transfers: %v", transferRespJSON)
 
 	return newBlock
 }

itest/tapd_harness.go

@@ -190,7 +190,7 @@ func newTapdHarness(t *testing.T, ht *harnessTest, cfg tapdConfig,
 	}
 
 	tapCfg := tapcfg.DefaultConfig()
-	tapCfg.LogDir = "."
+	tapCfg.LogDir = *logDir
 	tapCfg.MaxLogFiles = 99
 	tapCfg.MaxLogFileSize = 999
 

itest/test_harness.go

@@ -4,6 +4,7 @@ import (
 	"context"
 	"flag"
 	"fmt"
+	"path/filepath"
 	"testing"
 	"time"
 
@@ -45,8 +46,12 @@ var (
 
 	// logLevel is a command line flag for setting the log level of the
 	// integration test output.
-	logLevel = flag.String("loglevel", "info", "Set the log level of the "+
+	logLevel = flag.String("loglevel", "debug", "Set the log level of the "+
 		"integration test output")
+
+	// logDir is the directory for tapd and test logs.
+	// We hardcode this to match the Makefile's -logdir=regtest flag.
+	logDir = &[]string{"regtest"}[0]
 )
 
 const (
@@ -201,12 +206,18 @@ func (h *harnessTest) shutdown(_ *testing.T) error {
 func (h *harnessTest) setupLogging() {
 	h.logWriter = build.NewRotatingLogWriter()
 
+	// Initialize the log rotator with a file in the log directory.
 	logConfig := build.DefaultLogConfig()
+	// Disable console logging to avoid mixing with test output
+	logConfig.Console.Disable = true
+	logFile := filepath.Join(*logDir, "tapd.log")
+	err := h.logWriter.InitLogRotator(logConfig.File, logFile)
+	require.NoError(h.t, err)
+
 	h.logMgr = build.NewSubLoggerManager(
 		build.NewDefaultLogHandlers(logConfig, h.logWriter)...,
 	)
 
-	var err error
 	h.interceptor, err = signal.Intercept()
 	require.NoError(h.t, err)
 

itest/zero_value_anchor_test.go

@@ -50,66 +50,74 @@ func testZeroValueAnchorSweep(t *harnessTest) {
 	AssertNonInteractiveRecvComplete(t.t, secondTapd, 1)
 
 	// At this point, Alice should have a tombstone UTXO.
-	// Check Alice's UTXOs to see if there are any without assets (tombstones).
-	aliceUtxos, err := t.tapd.ListUtxos(ctxb, &taprpc.ListUtxosRequest{})
+	// Check Alice's UTXOs to see if there are any with tombstone script keys.
+	aliceUtxos, err := t.tapd.ListUtxos(ctxb, &taprpc.ListUtxosRequest{
+		ScriptKeyType: &taprpc.ScriptKeyTypeQuery{
+			Type: &taprpc.ScriptKeyTypeQuery_ExplicitType{
+				ExplicitType: taprpc.ScriptKeyType_SCRIPT_KEY_TOMBSTONE,
+			},
+		},
+	})
 	require.NoError(t.t, err)
 
+	// Filter out swept UTXOs
 	tombstoneCount := 0
 	for _, utxo := range aliceUtxos.ManagedUtxos {
-		if len(utxo.Assets) == 0 {
+		if !utxo.Swept {
 			tombstoneCount++
-			t.t.Logf("Found tombstone UTXO: %s, value=%d",
-				utxo.OutPoint, utxo.AmtSat)
 		}
 	}
 
-	t.t.Logf("Alice has %d tombstone UTXOs before sweep", tombstoneCount)
 	require.Greater(t.t, tombstoneCount, 0, "Should have at least one tombstone UTXO")
 
 	// Now mint more assets for Alice so she can create another transaction
 	// that should sweep the tombstones.
 	rpcAssets2 := MintAssetsConfirmBatch(
 		t.t, t.lndHarness.Miner().Client, t.tapd,
-		[]*mintrpc.MintAssetRequest{simpleAssets[1]},
+		[]*mintrpc.MintAssetRequest{simpleAssets[0]},
 	)
 
 	genInfo2 := rpcAssets2[0].AssetGenesis
-	assetAmount2 := simpleAssets[1].Asset.Amount
+	assetAmount2 := simpleAssets[0].Asset.Amount
 
-	// Create another address for Bob.
+	// Create another address for Bob (partial amount, not full).
+	partialAmount := assetAmount2 / 2
 	bobAddr2, err := secondTapd.NewAddr(ctxb, &taprpc.NewAddrRequest{
 		AssetId:      genInfo2.AssetId,
-		Amt:          assetAmount2,
+		Amt:          partialAmount,
 		AssetVersion: rpcAssets2[0].Version,
 	})
 	require.NoError(t.t, err)
 
-	// Send the new assets. This should sweep Alice's tombstone UTXOs.
+	// Send partial amount of the new assets. This should sweep Alice's tombstone UTXOs
+	// but not create a new tombstone since it's not a full send.
 	sendResp2, _ := sendAssetsToAddr(t, t.tapd, bobAddr2)
 
-	// Confirm the send.
 	ConfirmAndAssertOutboundTransfer(
 		t.t, t.lndHarness.Miner().Client, t.tapd, sendResp2,
 		genInfo2.AssetId,
-		[]uint64{0, assetAmount2}, 1, 2,
+		[]uint64{assetAmount2 - partialAmount, partialAmount}, 1, 2,
 	)
 	AssertNonInteractiveRecvComplete(t.t, secondTapd, 2)
 
 	// Check Alice's UTXOs again. The tombstones should have been swept.
-	finalAliceUtxos, err := t.tapd.ListUtxos(ctxb, &taprpc.ListUtxosRequest{})
+	finalAliceUtxos, err := t.tapd.ListUtxos(ctxb, &taprpc.ListUtxosRequest{
+		ScriptKeyType: &taprpc.ScriptKeyTypeQuery{
+			Type: &taprpc.ScriptKeyTypeQuery_ExplicitType{
+				ExplicitType: taprpc.ScriptKeyType_SCRIPT_KEY_TOMBSTONE,
+			},
+		},
+	})
 	require.NoError(t.t, err)
 
+	// Filter out swept UTXOs
 	finalTombstoneCount := 0
 	for _, utxo := range finalAliceUtxos.ManagedUtxos {
-		if len(utxo.Assets) == 0 {
+		if !utxo.Swept {
 			finalTombstoneCount++
-			t.t.Logf("Found tombstone UTXO after sweep: %s, value=%d",
-				utxo.OutPoint, utxo.AmtSat)
 		}
 	}
 
-	t.t.Logf("Alice has %d tombstone UTXOs after sweep", finalTombstoneCount)
-
 	// We expect no tombstones after the sweep transaction.
 	require.Equal(t.t, 0, finalTombstoneCount,
 		"All tombstones should be swept")

rpcserver.go

@@ -1403,6 +1403,7 @@ func (r *rpcServer) ListUtxos(ctx context.Context,
 			MerkleRoot:       u.MerkleRoot,
 			LeaseOwner:       u.LeaseOwner[:],
 			LeaseExpiryUnix:  u.LeaseExpiry.Unix(),
+			Swept:            u.Swept,
 		}
 	}
 
@@ -1419,6 +1420,14 @@ func (r *rpcServer) ListUtxos(ctx context.Context,
 		utxos[op] = utxo
 	}
 
+	// As a final pass, we'll prune out any UTXOs that don't have any
+	// assets, as these may be in the DB just for record keeping.
+	for _, utxo := range utxos {
+		if len(utxo.Assets) == 0 {
+			delete(utxos, utxo.OutPoint)
+		}
+	}
+
 	return &taprpc.ListUtxosResponse{
 		ManagedUtxos: utxos,
 	}, nil