itest: update itests to use new *WithSweep helper assertions

This change is due to the fact that blockbeat handling is now more async
in the cnct.

Author: Roasbeef

itest/lnd_channel_backup_test.go

@@ -1630,7 +1630,7 @@ func assertDLPExecuted(ht *lntest.HarnessTest,
 		// Expect one tx - the commitment sweep from Dave. For anchor
 		// channels, we expect the two anchor sweeping txns to be
 		// failed due they are uneconomical.
-		ht.MineBlocksAndAssertNumTxes(1, 1)
+		ht.MineBlocksAndAssertNumTxesWithSweep(1, 1, dave)
 		blocksMined++
 
 		// Now Dave should consider the channel fully closed.

itest/lnd_channel_force_close_test.go

@@ -184,7 +184,7 @@ func runChannelForceClosureTest(ht *lntest.HarnessTest,
 	)
 
 	// We expect to see Alice's force close tx in the mempool.
-	ht.AssertNumTxsInMempool(1)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(1, alice)
 
 	// Mine a block which should confirm the commitment transaction
 	// broadcast as a result of the force closure. Once mined, we also
@@ -233,7 +233,7 @@ func runChannelForceClosureTest(ht *lntest.HarnessTest,
 	// Carol's sweep tx should be in the mempool already, as her output is
 	// not timelocked. This sweep tx should spend her to_local output as
 	// the anchor output is not economical to spend.
-	carolTx := ht.GetNumTxsFromMempool(1)[0]
+	carolTx := ht.GetNumTxsFromMempoolWithSweep(1, carol)[0]
 
 	// Carol's sweeping tx should have 1-input-1-output shape.
 	require.Len(ht, carolTx.TxIn, 1)
@@ -792,7 +792,7 @@ func runChannelForceClosureTestRestart(ht *lntest.HarnessTest,
 	ht.RestartNode(alice)
 
 	// We expect to see Alice's force close tx in the mempool.
-	ht.AssertNumTxsInMempool(1)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(1, alice)
 
 	// Mine a block which should confirm the commitment transaction
 	// broadcast as a result of the force closure. Once mined, we also
@@ -847,7 +847,7 @@ func runChannelForceClosureTestRestart(ht *lntest.HarnessTest,
 	// Carol's sweep tx should be in the mempool already, as her output is
 	// not timelocked. This sweep tx should spend her to_local output as
 	// the anchor output is not economical to spend.
-	carolTx := ht.GetNumTxsFromMempool(1)[0]
+	carolTx := ht.GetNumTxsFromMempoolWithSweep(1, carol)[0]
 
 	// Carol's sweeping tx should have 1-input-1-output shape.
 	require.Len(ht, carolTx.TxIn, 1)

itest/lnd_funding_test.go

@@ -1272,11 +1272,10 @@ func testChannelFundingWithUnstableUtxos(ht *lntest.HarnessTest) {
 	// Make sure Carol sees her to_remote output from the force close tx.
 	ht.AssertNumPendingSweeps(carol, 1)
 
-	// Wait for Carol's sweep transaction to appear in the mempool. Due to
-	// async confirmation notifications, there's a race between when the
-	// sweep is registered and when the sweeper processes the next block.
-	// The sweeper uses immediate=false, so it broadcasts on the next block
-	// after registration. Mine an empty block to trigger the broadcast.
+	// Mine an empty block to trigger the sweep. Due to async confirmation
+	// notifications, the sweep registration might happen after the force
+	// close block is processed by the sweeper. Mining another block gives
+	// time for registration and triggers the broadcast.
 	ht.MineEmptyBlocks(1)
 
 	// Now the sweep should be in the mempool.
@@ -1338,9 +1337,10 @@ func testChannelFundingWithUnstableUtxos(ht *lntest.HarnessTest) {
 	// Make sure Carol sees her to_remote output from the force close tx.
 	ht.AssertNumPendingSweeps(carol, 1)
 
-	// Mine an empty block to trigger the sweep broadcast (same fix as
-	// above).
+	// Mine an empty block to trigger the sweep (same as above).
 	ht.MineEmptyBlocks(1)
+
+	// Sweep should be in mempool.
 	ht.AssertNumTxsInMempool(1)
 
 	// Wait for the to_remote sweep tx to show up in carol's wallet.

itest/lnd_htlc_timeout_resolver_test.go

@@ -348,7 +348,7 @@ func testHtlcTimeoutResolverExtractPreimageLocal(ht *lntest.HarnessTest) {
 	// Check the current mempool state and we should see,
 	// - Carol's direct spend tx, which contains the preimage.
 	// - Carol's anchor sweep tx cannot be broadcast as it's uneconomical.
-	ht.AssertNumTxsInMempool(1)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(1, carol)
 
 	// We'll now mine enough blocks to trigger Bob's htlc timeout resolver
 	// to act. Once his timeout resolver starts, it will extract the

itest/lnd_multi-hop_force_close_test.go

@@ -428,7 +428,7 @@ func runLocalClaimOutgoingHTLC(ht *lntest.HarnessTest,
 	// We expect to see tow txns in the mempool,
 	// 1. Bob's force close tx.
 	// 2. Bob's anchor sweep tx.
-	ht.AssertNumTxsInMempool(2)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(2, bob)
 
 	// Mine a block to confirm the closing tx and the anchor sweeping tx.
 	ht.MineBlocksAndAssertNumTxes(1, 2)
@@ -447,7 +447,7 @@ func runLocalClaimOutgoingHTLC(ht *lntest.HarnessTest,
 	// Bob's sweeper should sweep his outgoing HTLC immediately since it's
 	// expired. His to_local output cannot be swept due to the CSV lock.
 	// Carol's anchor sweep should be failed due to output being dust.
-	ht.AssertNumTxsInMempool(1)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(1, bob)
 
 	// Mine a block to confirm Bob's outgoing HTLC sweeping tx.
 	ht.MineBlocksAndAssertNumTxes(1, 1)
@@ -788,7 +788,7 @@ func runMultiHopReceiverPreimageClaim(ht *lntest.HarnessTest,
 	// We expect to see tow txns in the mempool,
 	// 1. Carol's force close tx.
 	// 2. Carol's anchor sweep tx.
-	ht.AssertNumTxsInMempool(2)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(2, carol)
 
 	// Mine a block to confirm the closing tx and the anchor sweeping tx.
 	ht.MineBlocksAndAssertNumTxes(1, 2)
@@ -1133,7 +1133,7 @@ func runLocalForceCloseBeforeHtlcTimeout(ht *lntest.HarnessTest,
 		ht.MineBlocks(int(defaultCSV - 1))
 
 		// Mine a block to confirm Bob's to_local sweep.
-		ht.MineBlocksAndAssertNumTxes(1, 1)
+		ht.MineBlocksAndAssertNumTxesWithSweep(1, 1, bob)
 	}
 
 	// We'll now mine enough blocks for the HTLC to expire. After this, Bob
@@ -1457,7 +1457,7 @@ func runRemoteForceCloseBeforeHtlcTimeout(ht *lntest.HarnessTest,
 		// won't be swept due it being uneconomical. For Carol, since
 		// her anchor is not used for CPFP, it'd be also uneconomical
 		// to sweep so it will fail.
-		ht.MineBlocksAndAssertNumTxes(1, 1)
+		ht.MineBlocksAndAssertNumTxesWithSweep(1, 1, bob)
 	}
 
 	// Next, we'll mine enough blocks for the HTLC to expire. At this
@@ -1711,7 +1711,7 @@ func runLocalClaimIncomingHTLC(ht *lntest.HarnessTest,
 	// commit tx). Her anchor output won't be swept as it's uneconomical.
 	// For Bob, since his anchor is not used for CPFP, it'd be uneconomical
 	// to sweep so it will fail.
-	ht.AssertNumTxsInMempool(1)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(1, alice)
 
 	// Mine a block to confirm Alice's sweeping tx.
 	ht.MineBlocksAndAssertNumTxes(1, 1)
@@ -1771,7 +1771,7 @@ func runLocalClaimIncomingHTLC(ht *lntest.HarnessTest,
 	// commitment anchor output, we'd expect to see two txns,
 	// - Carol's second level HTLC tx.
 	// - Bob's commitment output sweeping tx.
-	ht.AssertNumTxsInMempool(2)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(2, bob)
 
 	// At this point we suspend Alice to make sure she'll handle the
 	// on-chain settle after a restart.
@@ -2045,7 +2045,7 @@ func runLocalClaimIncomingHTLCLeased(ht *lntest.HarnessTest,
 	//
 	// Carol will broadcast her second-level HTLC sweeping txns. Bob canoot
 	// sweep his commitment anchor output yet due to it being CLTV locked.
-	ht.AssertNumTxsInMempool(1)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(1, carol)
 
 	// At this point we suspend Alice to make sure she'll handle the
 	// on-chain settle after a restart.
@@ -2401,7 +2401,7 @@ func runLocalPreimageClaim(ht *lntest.HarnessTest,
 	// We mine one block to confirm,
 	// - Carol's sweeping tx of the incoming HTLC.
 	// - Bob's sweeping tx of his commit output.
-	ht.MineBlocksAndAssertNumTxes(1, 2)
+	ht.MineBlocksAndAssertNumTxesWithSweep(1, 2, carol)
 
 	// When Bob notices Carol's second level tx in the block, he will
 	// extract the preimage and offer the HTLC to his sweeper. So he has,
@@ -2641,7 +2641,7 @@ func runLocalPreimageClaimLeased(ht *lntest.HarnessTest,
 
 	// We mine one block to confirm,
 	// - Carol's sweeping tx of the incoming HTLC.
-	ht.MineBlocksAndAssertNumTxes(1, 1)
+	ht.MineBlocksAndAssertNumTxesWithSweep(1, 1, carol)
 
 	// When Bob notices Carol's second level tx in the block, he will
 	// extract the preimage and offer the HTLC to his sweeper. So he has,
@@ -3030,7 +3030,7 @@ func runHtlcAggregation(ht *lntest.HarnessTest,
 
 	// Bob's force close tx and anchor sweeping tx should now be found in
 	// the mempool.
-	ht.AssertNumTxsInMempool(2)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(2, bob)
 
 	// Mine a block to confirm Bob's force close tx and anchor sweeping tx.
 	ht.MineBlocksAndAssertNumTxes(1, 2)
@@ -3062,7 +3062,7 @@ func runHtlcAggregation(ht *lntest.HarnessTest,
 	// 2. Bob's sweeping tx for all success HTLCs.
 	// 3. Carol's sweeping tx for her commit output.
 	// Mine a block to confirm them.
-	ht.MineBlocksAndAssertNumTxes(1, 3)
+	ht.MineBlocksAndAssertNumTxesWithSweep(1, 3, carol)
 
 	// For this channel, we also check the number of HTLCs and the stage
 	// are correct.

itest/lnd_psbt_test.go

@@ -19,6 +19,7 @@ import (
 	"github.com/lightningnetwork/lnd/input"
 	"github.com/lightningnetwork/lnd/keychain"
 	"github.com/lightningnetwork/lnd/lnrpc"
+	"github.com/lightningnetwork/lnd/lnrpc/devrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/signrpc"
 	"github.com/lightningnetwork/lnd/lnrpc/walletrpc"
 	"github.com/lightningnetwork/lnd/lntest"
@@ -1677,7 +1678,9 @@ func testPsbtChanFundingWithUnstableUtxos(ht *lntest.HarnessTest) {
 	// Make sure Carol sees her to_remote output from the force close tx.
 	ht.AssertNumPendingSweeps(carol, 1)
 
-	// We wait for the to_remote sweep tx.
+	// We wait for the to_remote sweep tx. Trigger sweep to handle async
+	// blockbeat notification races.
+	carol.RPC.TriggerSweeper(&devrpc.TriggerSweeperRequest{})
 	ht.AssertNumUTXOsUnconfirmed(carol, 1)
 
 	// We need the maximum funding amount to ensure we are opening the next
@@ -1799,7 +1802,9 @@ func testPsbtChanFundingWithUnstableUtxos(ht *lntest.HarnessTest) {
 	// Make sure Carol sees her to_remote output from the force close tx.
 	ht.AssertNumPendingSweeps(carol, 1)
 
-	// We wait for the to_remote sweep tx of channelPoint2.
+	// We wait for the to_remote sweep tx of channelPoint2. Trigger sweep
+	// to handle async blockbeat notification races.
+	carol.RPC.TriggerSweeper(&devrpc.TriggerSweeperRequest{})
 	utxos := ht.AssertNumUTXOsUnconfirmed(carol, 1)
 
 	// We need the maximum funding amount to ensure we are opening the next

itest/lnd_sweep_test.go

@@ -916,7 +916,7 @@ func testSweepHTLCs(ht *lntest.HarnessTest) {
 	ht.AssertNumPendingSweeps(bob, 2)
 
 	// Bob should have one sweeping tx in the mempool.
-	outgoingSweep := ht.GetNumTxsFromMempool(1)[0]
+	outgoingSweep := ht.GetNumTxsFromMempoolWithSweep(1, bob)[0]
 
 	// Check the shape of the sweeping tx - we expect it to be
 	// 2-input-2-output as a wallet utxo is used and a required output is
@@ -1057,7 +1057,7 @@ func testSweepHTLCs(ht *lntest.HarnessTest) {
 	// 1. the outgoing HTLC sweeping tx.
 	// 2. the incoming HTLC sweeping tx.
 	// 3. the anchor sweeping tx.
-	txns = ht.GetNumTxsFromMempool(3)
+	txns = ht.GetNumTxsFromMempoolWithSweep(3, bob)
 
 	abCloseTxid := closeTx.TxHash()
 
@@ -1389,7 +1389,7 @@ func testSweepCommitOutputAndAnchor(ht *lntest.HarnessTest) {
 	// requests will be sent to the sweeper. Finally, when the sweeper
 	// receives this blockbeat, it will create the sweeping tx and publish
 	// it.
-	ht.AssertNumTxsInMempool(1)
+	ht.AssertNumTxsInMempoolWithSweepTrigger(1, bob)
 
 	// Mine one more empty block should trigger Bob's sweeping. Since we
 	// use a CSV of 2, this means Alice's to_local output is now mature.

itest/lnd_wipe_fwdpkgs_test.go

@@ -97,5 +97,5 @@ func testWipeForwardingPackages(ht *lntest.HarnessTest) {
 	ht.AssertNumPendingSweeps(alice, 1)
 
 	// Mine 1 block to get Alice's sweeping tx confirmed.
-	ht.MineBlocksAndAssertNumTxes(1, 1)
+	ht.MineBlocksAndAssertNumTxesWithSweep(1, 1, alice)
 }