itest: fix misuse of MineBlocks and replace it with

`MineBlocksAndAssertNumTxes`

Author: yyforyongyu

itest/lnd_channel_backup_test.go

@@ -94,7 +94,7 @@ func newChanRestoreScenario(ht *lntest.HarnessTest, ct lnrpc.CommitmentType,
 	ht.FundCoinsUnconfirmed(btcutil.SatoshiPerBitcoin, dave)
 
 	// Mine a block to confirm the funds.
-	ht.MineBlocks(1)
+	ht.MineBlocksAndAssertNumTxes(1, 2)
 
 	// For the anchor output case we need two UTXOs for Carol so she can
 	// sweep both the local and remote anchor.

itest/lnd_estimate_route_fee_test.go

@@ -359,6 +359,8 @@ func testEstimateRouteFee(ht *lntest.HarnessTest) {
 
 	mts.ht.CloseChannelAssertPending(mts.bob, channelPointBobPaula, false)
 	mts.ht.CloseChannelAssertPending(mts.eve, channelPointEvePaula, false)
+	ht.MineBlocksAndAssertNumTxes(1, 2)
+
 	mts.closeChannels()
 }
 

itest/lnd_mpp_test.go

@@ -208,7 +208,13 @@ func newMppTestScenario(ht *lntest.HarnessTest) *mppTestScenario {
 		ht.FundCoinsUnconfirmed(btcutil.SatoshiPerBitcoin, carol)
 		ht.FundCoinsUnconfirmed(btcutil.SatoshiPerBitcoin, dave)
 		ht.FundCoinsUnconfirmed(btcutil.SatoshiPerBitcoin, eve)
-		ht.MineBlocks(1)
+
+		// Mine 1 block to get the above coins confirmed.
+		if ht.IsNeutrinoBackend() {
+			ht.MineBlocks(1)
+		} else {
+			ht.MineBlocksAndAssertNumTxes(1, 3)
+		}
 	}
 
 	mts := &mppTestScenario{
@@ -318,7 +324,7 @@ func (m *mppTestScenario) closeChannels() {
 	m.ht.CloseChannelAssertPending(m.eve, m.channelPoints[5], false)
 
 	// Now mine a block to include all the closing transactions.
-	m.ht.MineBlocks(1)
+	m.ht.MineBlocksAndAssertNumTxes(1, 6)
 
 	// Assert that the channels are closed.
 	for _, hn := range m.nodes {

itest/lnd_multi-hop_test.go

@@ -2223,7 +2223,11 @@ func createThreeHopNetwork(ht *lntest.HarnessTest,
 		ht.FundCoinsUnconfirmed(btcutil.SatoshiPerBitcoin, carol)
 
 		// Mine 1 block to get the above coins confirmed.
-		ht.MineBlocks(1)
+		if ht.IsNeutrinoBackend() {
+			ht.MineBlocks(1)
+		} else {
+			ht.MineBlocksAndAssertNumTxes(1, 3)
+		}
 	}
 
 	// We'll start the test by creating a channel between Alice and Bob,
@@ -2704,7 +2708,7 @@ func runExtraPreimageFromLocalCommit(ht *lntest.HarnessTest,
 		ht.AssertOutpointInMempool(htlcOutpoint)
 
 		// Mine a block to confirm Carol's direct spend tx.
-		ht.MineBlocks(1)
+		ht.MineBlocksAndAssertNumTxes(1, 1)
 	}
 
 	// Finally, check that the Alice's payment is marked as succeeded as

itest/lnd_onchain_test.go

@@ -601,7 +601,7 @@ func testAnchorThirdPartySpend(ht *lntest.HarnessTest) {
 		Index: 1,
 	}
 	ht.AssertOutpointInMempool(commitSweepOp)
-	ht.MineBlocks(1)
+	ht.MineBlocksAndAssertNumTxes(1, 1)
 
 	ht.AssertNumWaitingClose(alice, 0)
 }

itest/lnd_recovery_test.go

@@ -428,8 +428,7 @@ func testRescanAddressDetection(ht *lntest.HarnessTest) {
 	})
 
 	// Wait until the spending tx is found and mine a block to confirm it.
-	ht.AssertNumTxsInMempool(1)
-	ht.MineBlocks(1)
+	ht.MineBlocksAndAssertNumTxes(1, 1)
 
 	// The wallet should still just see a single UTXO of the change output
 	// created earlier.

itest/lnd_res_handoff_test.go

@@ -66,7 +66,7 @@ func testResHandoff(ht *lntest.HarnessTest) {
 	ht.AssertNumWaitingClose(bob, 1)
 
 	// Mine a block to confirm the closing tx.
-	ht.MineBlocks(1)
+	ht.MineBlocksAndAssertNumTxes(1, 1)
 
 	// We sleep here so we can be sure that the hand-off has occurred from
 	// Bob's contractcourt to Bob's htlcswitch. This sleep could be removed

lntest/harness_miner.go

@@ -99,12 +99,19 @@ func (h *HarnessTest) MineBlocksAndAssertNumTxes(num uint32,
 	// Update the harness's current height.
 	defer h.updateCurrentHeight()
 
+	// Neutrino nodes have trouble accessing the mempool so we skip it.
+	//
+	// TODO(yy): figure out the details.
+	if h.IsNeutrinoBackend() {
+		return h.miner.MineBlocks(num)
+	}
+
 	// If we expect transactions to be included in the blocks we'll mine,
 	// we wait here until they are seen in the miner's mempool.
 	txids := h.AssertNumTxsInMempool(numTxs)
 
 	// Mine blocks.
-	blocks := h.miner.MineBlocksSlow(num)
+	blocks := h.miner.MineBlocks(num)
 
 	// Assert that all the transactions were included in the first block.
 	for _, txid := range txids {