From 175301628f042439c204ca6eeb0ac86c393e7635 Mon Sep 17 00:00:00 2001
From: yyforyongyu <yong2452@gmail.com>
Date: Tue, 25 Feb 2025 16:45:36 +0800
Subject: [PATCH] lntest/unittest: make sure miner is connected to `bitcoind`

We change how the `bitcoind` node connects to the miner by creating a
temp RPC client and use it to connect to the miner. In addition we also
assert the connection is made.
---
 lntest/unittest/backend.go | 44 +++++++++++++++++++++++++++++++++++++-
 1 file changed, 43 insertions(+), 1 deletion(-)

diff --git a/lntest/unittest/backend.go b/lntest/unittest/backend.go
index 39c4d9d29..f759a3e1a 100644
--- a/lntest/unittest/backend.go
+++ b/lntest/unittest/backend.go
@@ -10,6 +10,7 @@ import (
 
 	"github.com/btcsuite/btcd/chaincfg"
 	"github.com/btcsuite/btcd/integration/rpctest"
+	"github.com/btcsuite/btcd/rpcclient"
 	"github.com/btcsuite/btcwallet/chain"
 	"github.com/btcsuite/btcwallet/walletdb"
 	"github.com/lightninglabs/neutrino"
@@ -101,7 +102,6 @@ func NewBitcoindBackend(t *testing.T, netParams *chaincfg.Params,
 	netParams.DefaultPort = fmt.Sprintf("%d", p2pPort)
 
 	args := []string{
-		"-connect=" + minerAddr,
 		"-datadir=" + tempBitcoindDir,
 		"-regtest",
 		"-rpcauth=weks:469e9bb14ab2360f8e226efed5ca6fd$507c670e800a95" +
@@ -178,6 +178,48 @@ func NewBitcoindBackend(t *testing.T, netParams *chaincfg.Params,
 	}
 	t.Cleanup(conn.Stop)
 
+	// Assert that the connection with the miner is made.
+	//
+	// Create a new RPC client.
+	rpcCfg := rpcclient.ConnConfig{
+		Host:                 cfg.Host,
+		User:                 cfg.User,
+		Pass:                 cfg.Pass,
+		DisableConnectOnNew:  true,
+		DisableAutoReconnect: false,
+		DisableTLS:           true,
+		HTTPPostMode:         true,
+	}
+
+	rpcClient, err := rpcclient.New(&rpcCfg, nil)
+	require.NoError(t, err, "failed to create RPC client")
+
+	// Connect to the miner node.
+	err = rpcClient.AddNode(minerAddr, rpcclient.ANAdd)
+	require.NoError(t, err, "failed to connect to miner")
+
+	// Get the network info and assert the num of outbound connections is 1.
+	err = wait.NoError(func() error {
+		result, err := rpcClient.GetNetworkInfo()
+		require.NoError(t, err)
+
+		if int(result.Connections) != 1 {
+			return fmt.Errorf("want 1 conn, got %d",
+				result.Connections)
+		}
+
+		if int(result.ConnectionsOut) != 1 {
+			return fmt.Errorf("want 1 outbound conn, got %d",
+				result.Connections)
+		}
+
+		return nil
+	}, wait.DefaultTimeout)
+	require.NoError(t, err, "timeout connecting to the miner")
+
+	// Tear down the rpc client.
+	rpcClient.Shutdown()
+
 	return conn
 }