lntest+itest: make Miner a private instance

Author: yyforyongyu

itest/lnd_channel_force_close_test.go

@@ -709,7 +709,7 @@ func channelForceClosureTest(ht *lntest.HarnessTest,
 		// NOTE: we don't check `len(mempool) == 1` because it will
 		// give us false positive.
 		err := wait.NoError(func() error {
-			mempool := ht.Miner.GetRawMempool()
+			mempool := ht.Miner().GetRawMempool()
 			if len(mempool) == 2 {
 				return nil
 			}

itest/lnd_nonstd_sweep_test.go

@@ -125,7 +125,7 @@ func testNonStdSweepInner(ht *lntest.HarnessTest, address string) {
 
 	// Fetch the vsize of the transaction so we can determine if the
 	// transaction pays >= 1 sat/vbyte.
-	rawTx := ht.Miner.GetRawTransactionVerbose(txid)
+	rawTx := ht.Miner().GetRawTransactionVerbose(txid)
 
 	// Require fee >= vbytes.
 	require.True(ht, fee >= int(rawTx.Vsize))

itest/lnd_open_channel_test.go

@@ -32,7 +32,7 @@ func testOpenChannelAfterReorg(ht *lntest.HarnessTest) {
 	// Create a temp miner.
 	tempMiner := ht.SpawnTempMiner()
 
-	miner := ht.Miner
+	miner := ht.Miner()
 	alice, bob := ht.Alice, ht.Bob
 
 	// Create a new channel that requires 1 confs before it's considered

itest/lnd_rest_api_test.go

@@ -296,7 +296,7 @@ func wsTestCaseSubscription(ht *lntest.HarnessTest) {
 	}()
 
 	// Mine a block and make sure we get a message for it.
-	blockHashes := ht.Miner.GenerateBlocks(1)
+	blockHashes := ht.Miner().GenerateBlocks(1)
 	select {
 	case msg := <-msgChan:
 		require.Equal(
@@ -388,7 +388,7 @@ func wsTestCaseSubscriptionMacaroon(ht *lntest.HarnessTest) {
 	}()
 
 	// Mine a block and make sure we get a message for it.
-	blockHashes := ht.Miner.GenerateBlocks(1)
+	blockHashes := ht.Miner().GenerateBlocks(1)
 	select {
 	case msg := <-msgChan:
 		require.Equal(

itest/lnd_revocation_test.go

@@ -579,7 +579,7 @@ func revokedCloseRetributionRemoteHodlCase(ht *lntest.HarnessTest,
 			// NOTE: We don't use `ht.GetRawTransaction`
 			// which asserts a txid must be found as the HTLC
 			// spending txes might be aggregated.
-			tx, err := ht.Miner.Client.GetRawTransaction(txid)
+			tx, err := ht.Miner().Client.GetRawTransaction(txid)
 			if err != nil {
 				return nil, err
 			}

itest/lnd_sweep_test.go

@@ -172,7 +172,7 @@ func testSweepCPFPAnchorOutgoingTimeout(ht *lntest.HarnessTest) {
 
 	// Remember the force close height so we can calculate the deadline
 	// height.
-	_, forceCloseHeight := ht.Miner.GetBestBlock()
+	_, forceCloseHeight := ht.GetBestBlock()
 
 	// Bob should have two pending sweeps,
 	// - anchor sweeping from his local commitment.
@@ -304,7 +304,7 @@ func testSweepCPFPAnchorOutgoingTimeout(ht *lntest.HarnessTest) {
 	//
 	// Once out of the above loop, we expect to be 2 blocks before the CPFP
 	// deadline.
-	_, currentHeight := ht.Miner.GetBestBlock()
+	_, currentHeight := ht.GetBestBlock()
 	require.Equal(ht, int(anchorDeadline-2), int(currentHeight))
 
 	// Mine one more block, we'd use up all the CPFP budget.
@@ -512,7 +512,7 @@ func testSweepCPFPAnchorIncomingTimeout(ht *lntest.HarnessTest) {
 	forceCloseHeight := htlc.ExpirationHeight - goToChainDelta
 
 	// Mine till the goToChainHeight is reached.
-	_, currentHeight := ht.Miner.GetBestBlock()
+	_, currentHeight := ht.GetBestBlock()
 	numBlocks := forceCloseHeight - uint32(currentHeight)
 	ht.MineEmptyBlocks(int(numBlocks))
 
@@ -641,7 +641,7 @@ func testSweepCPFPAnchorIncomingTimeout(ht *lntest.HarnessTest) {
 	//
 	// Once out of the above loop, we expect to be 2 blocks before the CPFP
 	// deadline.
-	_, currentHeight = ht.Miner.GetBestBlock()
+	_, currentHeight = ht.GetBestBlock()
 	require.Equal(ht, int(anchorDeadline-2), int(currentHeight))
 
 	// Mine one more block, we'd use up all the CPFP budget.
@@ -1380,7 +1380,7 @@ func testSweepCommitOutputAndAnchor(ht *lntest.HarnessTest) {
 	//
 	// TODO(yy): assert they are equal once blocks are synced via
 	// `blockbeat`.
-	_, currentHeight := ht.Miner.GetBestBlock()
+	_, currentHeight := ht.GetBestBlock()
 	actualDeadline := int32(pendingSweepBob.DeadlineHeight) - currentHeight
 	if actualDeadline != int32(deadlineB) {
 		ht.Logf("!!! Found unsynced block between sweeper and "+
@@ -1438,7 +1438,7 @@ func testSweepCommitOutputAndAnchor(ht *lntest.HarnessTest) {
 	//
 	// TODO(yy): assert they are equal once blocks are synced via
 	// `blockbeat`.
-	_, currentHeight = ht.Miner.GetBestBlock()
+	_, currentHeight = ht.GetBestBlock()
 	actualDeadline = int32(aliceCommit.DeadlineHeight) - currentHeight
 	if actualDeadline != int32(deadlineA) {
 		ht.Logf("!!! Found unsynced block between Alice's sweeper and "+

itest/lnd_taproot_test.go

@@ -96,7 +96,7 @@ func testTaprootSendCoinsKeySpendBip86(ht *lntest.HarnessTest,
 
 	// Assert this is a segwit v1 address that starts with bcrt1p.
 	require.Contains(
-		ht, p2trResp.Address, ht.Miner.ActiveNet.Bech32HRPSegwit+"1p",
+		ht, p2trResp.Address, ht.Miner().ActiveNet.Bech32HRPSegwit+"1p",
 	)
 
 	// Send the coins from Alice's wallet to her own, but to the new p2tr

lntest/harness.go

@@ -77,9 +77,9 @@ type HarnessTest struct {
 	// Embed the standbyNodes so we can easily access them via `ht.Alice`.
 	standbyNodes
 
-	// Miner is a reference to a running full node that can be used to
+	// miner is a reference to a running full node that can be used to
 	// create new blocks on the network.
-	Miner *miner.HarnessMiner
+	miner *miner.HarnessMiner
 
 	// manager handles the start and stop of a given node.
 	manager *nodeManager
@@ -188,7 +188,7 @@ func (h *HarnessTest) Start(chain node.BackendConfig,
 	h.manager.feeServiceURL = h.feeService.URL()
 
 	// Assemble the miner.
-	h.Miner = miner
+	h.miner = miner
 }
 
 // ChainBackendName returns the chain backend name used in the test.
@@ -254,7 +254,7 @@ func (h *HarnessTest) createAndSendOutput(target *node.HarnessNode,
 		PkScript: addrScript,
 		Value:    int64(amt),
 	}
-	h.Miner.SendOutput(output, defaultMinerFeeRate)
+	h.miner.SendOutput(output, defaultMinerFeeRate)
 }
 
 // SetupRemoteSigningStandbyNodes starts the initial seeder nodes within the
@@ -371,7 +371,7 @@ func (h *HarnessTest) Stop() {
 	h.stopChainBackend()
 
 	// Stop the miner.
-	h.Miner.Stop()
+	h.miner.Stop()
 }
 
 // RunTestCase executes a harness test case. Any errors or panics will be
@@ -414,7 +414,7 @@ func (h *HarnessTest) Subtest(t *testing.T) *HarnessTest {
 	st := &HarnessTest{
 		T:            t,
 		manager:      h.manager,
-		Miner:        h.Miner,
+		miner:        h.miner,
 		standbyNodes: h.standbyNodes,
 		feeService:   h.feeService,
 		lndErrorChan: make(chan error, lndErrorChanSize),
@@ -424,7 +424,7 @@ func (h *HarnessTest) Subtest(t *testing.T) *HarnessTest {
 	st.runCtx, st.cancel = context.WithCancel(h.runCtx)
 
 	// Inherit the subtest for the miner.
-	st.Miner.T = st.T
+	st.miner.T = st.T
 
 	// Reset the standby nodes.
 	st.resetStandbyNodes(t)
@@ -467,7 +467,7 @@ func (h *HarnessTest) Subtest(t *testing.T) *HarnessTest {
 		st.shutdownNonStandbyNodes()
 
 		// We require the mempool to be cleaned from the test.
-		require.Empty(st, st.Miner.GetRawMempool(), "mempool not "+
+		require.Empty(st, st.miner.GetRawMempool(), "mempool not "+
 			"cleaned, please mine blocks to clean them all.")
 
 		// Finally, cancel the run context. We have to do it here
@@ -1298,7 +1298,7 @@ func (h *HarnessTest) CloseChannelAssertPending(hn *node.HarnessNode,
 		pendingClose.ClosePending.Txid)
 
 	// Assert the closing tx is in the mempool.
-	h.Miner.AssertTxInMempool(closeTxid)
+	h.miner.AssertTxInMempool(closeTxid)
 
 	return stream, closeTxid
 }
@@ -1396,7 +1396,7 @@ func (h *HarnessTest) fundCoins(amt btcutil.Amount, target *node.HarnessNode,
 		PkScript: addrScript,
 		Value:    int64(amt),
 	}
-	h.Miner.SendOutput(output, defaultMinerFeeRate)
+	h.miner.SendOutput(output, defaultMinerFeeRate)
 
 	// Encode the pkScript in hex as this the format that it will be
 	// returned via rpc.
@@ -1903,7 +1903,7 @@ func (h *HarnessTest) CalculateTxFee(tx *wire.MsgTx) btcutil.Amount {
 	var balance btcutil.Amount
 	for _, in := range tx.TxIn {
 		parentHash := in.PreviousOutPoint.Hash
-		rawTx := h.Miner.GetRawTransaction(&parentHash)
+		rawTx := h.miner.GetRawTransaction(&parentHash)
 		parent := rawTx.MsgTx()
 		value := parent.TxOut[in.PreviousOutPoint.Index].Value
 
@@ -2121,12 +2121,12 @@ func (h *HarnessTest) ReceiveChannelEvent(
 func (h *HarnessTest) GetOutputIndex(txid *chainhash.Hash, addr string) int {
 	// We'll then extract the raw transaction from the mempool in order to
 	// determine the index of the p2tr output.
-	tx := h.Miner.GetRawTransaction(txid)
+	tx := h.miner.GetRawTransaction(txid)
 
 	p2trOutputIndex := -1
 	for i, txOut := range tx.MsgTx().TxOut {
 		_, addrs, _, err := txscript.ExtractPkScriptAddrs(
-			txOut.PkScript, h.Miner.ActiveNet,
+			txOut.PkScript, h.miner.ActiveNet,
 		)
 		require.NoError(h, err)