lntest+itest: finalize moving miner methods

itest/lnd_route_blinding_test.go

@@ -1010,7 +1010,7 @@ func testErrorHandlingOnChainFailure(ht *lntest.HarnessTest) {
 	ht.MineBlocks(node.DefaultCSV - 1)
 	ht.AssertNumPendingSweeps(ht.Bob, 1)
 	ht.MineEmptyBlocks(1)
-	ht.Miner.MineBlocksAndAssertNumTxes(1, 1)
+	ht.MineBlocksAndAssertNumTxes(1, 1)
 
 	// Restart bob so that we can test that he's able to recover everything
 	// he needs to claim a blinded HTLC.
@@ -1026,8 +1026,8 @@ func testErrorHandlingOnChainFailure(ht *lntest.HarnessTest) {
 	// Wait for Bob's timeout transaction in the mempool, since we've
 	// suspended Carol we don't need to account for her commitment output
 	// claim.
-	ht.Miner.MineBlocksAndAssertNumTxes(1, 1)
 	ht.AssertNumPendingSweeps(ht.Bob, 0)
+	ht.MineBlocksAndAssertNumTxes(1, 1)
 
 	// Assert that the HTLC has cleared.
 	ht.WaitForBlockchainSync(ht.Bob)
@@ -1049,7 +1049,7 @@ func testErrorHandlingOnChainFailure(ht *lntest.HarnessTest) {
 	// Clean up the rest of our force close: mine blocks so that Bob's CSV
 	// expires plus one block to trigger his sweep and then mine it.
 	ht.MineBlocks(node.DefaultCSV + 1)
-	ht.Miner.MineBlocksAndAssertNumTxes(1, 1)
+	ht.MineBlocksAndAssertNumTxes(1, 1)
 
 	// Bring carol back up so that we can close out the rest of our
 	// channels cooperatively. She requires an interceptor to start up