From baf69779489932ab20235c70382753e3a1752b84 Mon Sep 17 00:00:00 2001 From: Harsha Goli Date: Mon, 13 Dec 2021 19:11:49 -0500 Subject: [PATCH] Revert "lntest: export attributes of type BitcoindBackendConfig" [skip ci] This reverts commit eccf20c5b2edbfc5b7f2de1d6fbcb98848838f34. --- lntest/bitcoind_common.go | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/lntest/bitcoind_common.go b/lntest/bitcoind_common.go index 6ec6bfdaf..937aca540 100644 --- a/lntest/bitcoind_common.go +++ b/lntest/bitcoind_common.go @@ -22,12 +22,12 @@ const logDirPattern = "%s/.backendlogs" // BitcoindBackendConfig is an implementation of the BackendConfig interface // backed by a Bitcoind node. type BitcoindBackendConfig struct { - RpcHost string - RpcUser string - RpcPass string - ZmqBlockPath string - ZmqTxPath string - P2pPort int + rpcHost string + rpcUser string + rpcPass string + zmqBlockPath string + zmqTxPath string + p2pPort int rpcClient *rpcclient.Client // minerAddr is the p2p address of the miner to connect to. @@ -43,13 +43,13 @@ var _ BackendConfig = (*BitcoindBackendConfig)(nil) func (b BitcoindBackendConfig) GenArgs() []string { var args []string args = append(args, "--bitcoin.node=bitcoind") - args = append(args, fmt.Sprintf("--bitcoind.rpchost=%v", b.RpcHost)) - args = append(args, fmt.Sprintf("--bitcoind.rpcuser=%v", b.RpcUser)) - args = append(args, fmt.Sprintf("--bitcoind.rpcpass=%v", b.RpcPass)) + args = append(args, fmt.Sprintf("--bitcoind.rpchost=%v", b.rpcHost)) + args = append(args, fmt.Sprintf("--bitcoind.rpcuser=%v", b.rpcUser)) + args = append(args, fmt.Sprintf("--bitcoind.rpcpass=%v", b.rpcPass)) args = append(args, fmt.Sprintf("--bitcoind.zmqpubrawblock=%v", - b.ZmqBlockPath)) + b.zmqBlockPath)) args = append(args, fmt.Sprintf("--bitcoind.zmqpubrawtx=%v", - b.ZmqTxPath)) + b.zmqTxPath)) return args } @@ -184,12 +184,12 @@ func newBackend(miner string, netParams *chaincfg.Params, extraArgs []string) ( } bd := BitcoindBackendConfig{ - RpcHost: rpcHost, - RpcUser: rpcUser, - RpcPass: rpcPass, - ZmqBlockPath: zmqBlockAddr, - ZmqTxPath: zmqTxAddr, - P2pPort: p2pPort, + rpcHost: rpcHost, + rpcUser: rpcUser, + rpcPass: rpcPass, + zmqBlockPath: zmqBlockAddr, + zmqTxPath: zmqTxAddr, + p2pPort: p2pPort, rpcClient: client, minerAddr: miner, }