multi: unify utilizing NewBtcdClientWithConfig

btcwallet.go

@@ -13,6 +13,7 @@ import (
 	"runtime"
 	"sync"
 
+	"github.com/btcsuite/btcd/rpcclient"
 	"github.com/btcsuite/btcwallet/chain"
 	"github.com/btcsuite/btcwallet/rpc/legacyrpc"
 	"github.com/btcsuite/btcwallet/wallet"
@@ -262,15 +263,24 @@ func readCAFile() []byte {
 }
 
 // startChainRPC opens a RPC client connection to a btcd server for blockchain
-// services.  This function uses the RPC options from the global config and
+// services. This function uses the RPC options from the global config and
 // there is no recovery in case the server is not available or if there is an
 // authentication error.  Instead, all requests to the client will simply error.
 func startChainRPC(certs []byte) (*chain.BtcdClient, error) {
 	log.Infof("Attempting RPC client connection to %v", cfg.RPCConnect)
-	rpcc, err := chain.NewBtcdClient(
-		activeNet.Params, cfg.RPCConnect, cfg.BtcdUsername, cfg.BtcdPassword,
-		certs, cfg.DisableClientTLS, 0,
-	)
+
+	chainCfg := &chain.BtcdConfig{
+		Conn: &rpcclient.ConnConfig{
+			Host:         cfg.RPCConnect,
+			User:         cfg.BtcdUsername,
+			Pass:         cfg.BtcdPassword,
+			Certificates: certs,
+			DisableTLS:   cfg.DisableClientTLS,
+		},
+		Chain:             activeNet.Params,
+		ReconnectAttempts: 0,
+	}
+	rpcc, err := chain.NewBtcdClientWithConfig(chainCfg)
 	if err != nil {
 		return nil, err
 	}

rpc/rpcserver/server.go

@@ -8,11 +8,11 @@
 // Full documentation of the API implemented by this package is maintained in a
 // language-agnostic document:
 //
-//   https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/api.md
+//	https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/api.md
 //
 // Any API changes must be performed according to the steps listed here:
 //
-//   https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/serverchanges.md
+//	https://github.com/btcsuite/btcwallet/blob/master/rpc/documentation/serverchanges.md
 package rpcserver
 
 import (
@@ -486,12 +486,12 @@ func (s *walletServer) SignTransaction(ctx context.Context, req *pb.SignTransact
 }
 
 // BUGS:
-// - The transaction is not inspected to be relevant before publishing using
-//   sendrawtransaction, so connection errors to btcd could result in the tx
-//   never being added to the wallet database.
-// - Once the above bug is fixed, wallet will require a way to purge invalid
-//   transactions from the database when they are rejected by the network, other
-//   than double spending them.
+//   - The transaction is not inspected to be relevant before publishing using
+//     sendrawtransaction, so connection errors to btcd could result in the tx
+//     never being added to the wallet database.
+//   - Once the above bug is fixed, wallet will require a way to purge invalid
+//     transactions from the database when they are rejected by the network, other
+//     than double spending them.
 func (s *walletServer) PublishTransaction(ctx context.Context, req *pb.PublishTransactionRequest) (
 	*pb.PublishTransactionResponse, error) {
 
@@ -769,8 +769,9 @@ func (s *loaderServer) StartConsensusRpc(ctx context.Context, // nolint:golint
 		return nil, status.Errorf(codes.FailedPrecondition, "RPC client already created")
 	}
 
-	networkAddress, err := cfgutil.NormalizeAddress(req.NetworkAddress,
-		s.activeNet.RPCClientPort)
+	networkAddress, err := cfgutil.NormalizeAddress(
+		req.NetworkAddress, s.activeNet.RPCClientPort,
+	)
 	if err != nil {
 		return nil, status.Errorf(codes.InvalidArgument,
 			"Network address is ill-formed: %v", err)
@@ -783,10 +784,18 @@ func (s *loaderServer) StartConsensusRpc(ctx context.Context, // nolint:golint
 			"wallet is loaded and already synchronizing")
 	}
 
-	rpcClient, err := chain.NewBtcdClient(
-		s.activeNet.Params, networkAddress, req.Username, string(req.Password),
-		req.Certificate, len(req.Certificate) == 0, 1,
-	)
+	chainCfg := &chain.BtcdConfig{
+		Conn: &rpcclient.ConnConfig{
+			Host:         networkAddress,
+			User:         req.Username,
+			Pass:         string(req.Password),
+			Certificates: req.Certificate,
+			DisableTLS:   len(req.Certificate) == 0,
+		},
+		Chain:             s.activeNet.Params,
+		ReconnectAttempts: 1,
+	}
+	rpcClient, err := chain.NewBtcdClientWithConfig(chainCfg)
 	if err != nil {
 		return nil, translateError(err)
 	}