fixup! lntest: add new utilities to wait for mempool/block inclusion, then trigger sweep if failed

Author: Roasbeef

itest/lnd_multi-hop_force_close_test.go

@@ -478,7 +478,10 @@ func runLocalClaimOutgoingHTLC(ht *lntest.HarnessTest,
 		// We now mine enough blocks so the CLTV lock expires, which
 		// will trigger the sweep of the to_local and outgoing HTLC
 		// outputs.
-		ht.MineEmptyBlocks(int(resp.BlocksTilMaturity))
+		blocks := int(resp.BlocksTilMaturity)
+		if blocks > 0 {
+			ht.MineEmptyBlocks(blocks)
+		}
 
 		// Check that Bob has a pending sweeping tx which sweeps his
 		// to_local and outgoing HTLC outputs.
@@ -491,7 +494,10 @@ func runLocalClaimOutgoingHTLC(ht *lntest.HarnessTest,
 		// will incur the usual CSV delay on any outputs that he can
 		// sweep back to his wallet. We'll subtract one block from our
 		// current maturity period to assert on the mempool.
-		ht.MineEmptyBlocks(int(resp.BlocksTilMaturity - 1))
+		blocks := int(resp.BlocksTilMaturity - 1)
+		if blocks > 0 {
+			ht.MineEmptyBlocks(blocks)
+		}
 
 		// Check that Bob has a pending sweeping tx which sweeps his
 		// to_local output. In addition, his immature outgoing HTLC
@@ -845,7 +851,9 @@ func runMultiHopReceiverPreimageClaim(ht *lntest.HarnessTest,
 
 	// If we mine 4 additional blocks, then Carol can sweep the second
 	// level HTLC output once the CSV expires.
-	ht.MineEmptyBlocks(defaultCSV - 1)
+	if blocks := defaultCSV - 1; blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// Assert Carol has the pending HTLC sweep.
 	ht.AssertNumPendingSweeps(carol, 1)
@@ -873,7 +881,9 @@ func runMultiHopReceiverPreimageClaim(ht *lntest.HarnessTest,
 
 		// Mine enough blocks for Bob's commit output's CLTV to expire
 		// and sweep it.
-		ht.MineEmptyBlocks(int(resp.BlocksTilMaturity))
+		if blocks := int(resp.BlocksTilMaturity); blocks > 0 {
+			ht.MineEmptyBlocks(blocks)
+		}
 
 		// Bob should have two pending inputs to be swept, the commit
 		// output and the anchor output.
@@ -1512,7 +1522,9 @@ func runRemoteForceCloseBeforeHtlcTimeout(ht *lntest.HarnessTest,
 	if params.CommitmentType == leasedType {
 		// Get the remaining blocks to mine.
 		resp = ht.AssertNumPendingForceClose(bob, 1)[0]
-		ht.MineEmptyBlocks(int(resp.BlocksTilMaturity))
+		if blocks := int(resp.BlocksTilMaturity); blocks > 0 {
+			ht.MineEmptyBlocks(blocks)
+		}
 
 		// Assert the commit output has been offered to the sweeper.
 		// Bob should have two pending sweep requests - one for the
@@ -1827,7 +1839,9 @@ func runLocalClaimIncomingHTLC(ht *lntest.HarnessTest,
 		"stage htlc=%v", resp.BlocksTilMaturity,
 		resp.PendingHtlcs[0].BlocksTilMaturity)
 
-	ht.MineEmptyBlocks(int(resp.PendingHtlcs[0].BlocksTilMaturity))
+	if blocks := int(resp.PendingHtlcs[0].BlocksTilMaturity); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// Carol should have one a sweep request for her second level tx.
 	ht.AssertNumPendingSweeps(carol, 1)
@@ -1845,7 +1859,9 @@ func runLocalClaimIncomingHTLC(ht *lntest.HarnessTest,
 		"htlc=%v", resp.BlocksTilMaturity,
 		resp.PendingHtlcs[0].BlocksTilMaturity)
 
-	ht.MineEmptyBlocks(int(resp.PendingHtlcs[0].BlocksTilMaturity))
+	if blocks := int(resp.PendingHtlcs[0].BlocksTilMaturity); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// Bob should have three requests in his sweeper.
 	// - the second level HTLC tx.
@@ -2105,7 +2121,9 @@ func runLocalClaimIncomingHTLCLeased(ht *lntest.HarnessTest,
 		"stage htlc=%v", resp.BlocksTilMaturity,
 		resp.PendingHtlcs[0].BlocksTilMaturity)
 
-	ht.MineEmptyBlocks(int(resp.PendingHtlcs[0].BlocksTilMaturity))
+	if blocks := int(resp.PendingHtlcs[0].BlocksTilMaturity); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// Carol should have one a sweep request for her second level tx.
 	ht.AssertNumPendingSweeps(carol, 1)
@@ -2122,7 +2140,9 @@ func runLocalClaimIncomingHTLCLeased(ht *lntest.HarnessTest,
 
 	ht.Logf("Bob's timelock to_local output=%v, timelock on second stage "+
 		"htlc=%v", resp.BlocksTilMaturity, htlcExpiry)
-	ht.MineEmptyBlocks(int(htlcExpiry))
+	if blocks := int(htlcExpiry); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// When we mine one additional block, that will confirm Bob's second
 	// level HTLC sweep on channel Alice=>Bob.
@@ -2136,7 +2156,9 @@ func runLocalClaimIncomingHTLCLeased(ht *lntest.HarnessTest,
 
 	ht.Logf("Bob's timelock to_local output=%v, timelock on second stage "+
 		"htlc=%v", resp.BlocksTilMaturity, htlcExpiry)
-	ht.MineEmptyBlocks(int(resp.BlocksTilMaturity))
+	if blocks := int(resp.BlocksTilMaturity); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// Bob should have three requests in his sweeper.
 	// - to_local output from channel Bob=>Carol.
@@ -2443,7 +2465,9 @@ func runLocalPreimageClaim(ht *lntest.HarnessTest,
 		"stage htlc=%v", resp.BlocksTilMaturity,
 		resp.PendingHtlcs[0].BlocksTilMaturity)
 
-	ht.MineEmptyBlocks(int(resp.PendingHtlcs[0].BlocksTilMaturity))
+	if blocks := int(resp.PendingHtlcs[0].BlocksTilMaturity); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// Carol should offer the htlc output to her sweeper.
 	ht.AssertNumPendingSweeps(carol, 1)
@@ -2683,7 +2707,9 @@ func runLocalPreimageClaimLeased(ht *lntest.HarnessTest,
 		"stage htlc=%v", resp.BlocksTilMaturity,
 		resp.PendingHtlcs[0].BlocksTilMaturity)
 
-	ht.MineEmptyBlocks(int(resp.PendingHtlcs[0].BlocksTilMaturity))
+	if blocks := int(resp.PendingHtlcs[0].BlocksTilMaturity); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// Carol should offer the htlc output to her sweeper.
 	ht.AssertNumPendingSweeps(carol, 1)
@@ -2715,7 +2741,9 @@ func runLocalPreimageClaimLeased(ht *lntest.HarnessTest,
 		"stage htlc=%v", resp.BlocksTilMaturity,
 		resp.PendingHtlcs[0].BlocksTilMaturity)
 
-	ht.MineEmptyBlocks(int(resp.BlocksTilMaturity))
+	if blocks := int(resp.BlocksTilMaturity); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// Alice should two sweeping requests,
 	// - the anchor output from channel Alice=>Bob, uneconomical.
@@ -3111,7 +3139,9 @@ func runHtlcAggregation(ht *lntest.HarnessTest,
 		"htlc=%v", resp.BlocksTilMaturity,
 		resp.PendingHtlcs[0].BlocksTilMaturity)
 
-	ht.MineEmptyBlocks(int(resp.PendingHtlcs[0].BlocksTilMaturity))
+	if blocks := int(resp.PendingHtlcs[0].BlocksTilMaturity); blocks > 0 {
+		ht.MineEmptyBlocks(blocks)
+	}
 
 	// With the above mined block, Bob's HTLCs should now all be offered to
 	// his sweeper since the CSV lock is now expired. In addition he should

lntest/harness_miner.go

@@ -133,7 +133,7 @@ func (h *HarnessTest) MineBlocksAndAssertNumTxesWithSweep(num uint32,
 	defer h.updateCurrentHeight()
 
 	// Wait for transactions with sweep triggering support.
-	txids := h.AssertNumTxsInMempoolWithSweepTrigger(numTxs, nodes...)
+	txids := h.AssertMinNumTxsInMempoolWithSweepTrigger(numTxs, nodes...)
 
 	// Mine blocks.
 	blocks := h.miner.MineBlocks(num)