mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-01-18 21:35:24 +01:00
Code Issues Projects Releases Wiki Activity

multi: use "bitcoin" chain name constant

Browse Source 
Make use of the `bitcoinChainName` constant instead of re-writing the
"bitcoin" string.
This commit is contained in:
Elle Mouton 2023-09-05 11:47:00 +02:00 committed by Olaoluwa Osuntokun
parent 8a195ed761
commit 1211e7eb7b
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/lncli/main.go
View File

@ -15,6 +15,7 @@ import (
"syscall" "syscall"
"github.com/btcsuite/btcd/btcutil" "github.com/btcsuite/btcd/btcutil"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/build" "github.com/lightningnetwork/lnd/build"
"github.com/lightningnetwork/lnd/lncfg" "github.com/lightningnetwork/lnd/lncfg"
"github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc"
@ -301,8 +302,8 @@ func extractPathArgs(ctx *cli.Context) (string, string, error) {
// lnddir/data/chain/<chain>/<network> in order to fetch the // lnddir/data/chain/<chain>/<network> in order to fetch the
// macaroon that we need. // macaroon that we need.
macPath = filepath.Join( macPath = filepath.Join(
lndDir, defaultDataDir, defaultChainSubDir, "bitcoin", lndDir, defaultDataDir, defaultChainSubDir,
network, defaultMacaroonFilename, lnd.BitcoinChainName, network, defaultMacaroonFilename,
) )
} }

4
config.go
View File

@ -259,7 +259,7 @@ var (
defaultBtcdDir = btcutil.AppDataDir(btcdBackendName, false) defaultBtcdDir = btcutil.AppDataDir(btcdBackendName, false)
defaultBtcdRPCCertFile = filepath.Join(defaultBtcdDir, "rpc.cert") defaultBtcdRPCCertFile = filepath.Join(defaultBtcdDir, "rpc.cert")
defaultBitcoindDir = btcutil.AppDataDir("bitcoin", false) defaultBitcoindDir = btcutil.AppDataDir(BitcoinChainName, false)
defaultTorSOCKS = net.JoinHostPort("localhost", strconv.Itoa(defaultTorSOCKSPort)) defaultTorSOCKS = net.JoinHostPort("localhost", strconv.Itoa(defaultTorSOCKSPort))
defaultTorDNS = net.JoinHostPort(defaultTorDNSHost, strconv.Itoa(defaultTorDNSPort)) defaultTorDNS = net.JoinHostPort(defaultTorDNSHost, strconv.Itoa(defaultTorDNSPort))
@ -1811,7 +1811,7 @@ func parseRPCParams(cConfig *lncfg.Chain, nodeConfig interface{},
daemonName = bitcoindBackendName daemonName = bitcoindBackendName
confDir = conf.Dir confDir = conf.Dir
confFile = conf.ConfigPath confFile = conf.ConfigPath
confFileBase = "bitcoin" confFileBase = BitcoinChainName
// Check that cookie and credentials don't contradict each // Check that cookie and credentials don't contradict each
// other. // other.

3
lntest/node/config.go
View File

@ -11,6 +11,7 @@ import (
"sync/atomic" "sync/atomic"
"github.com/btcsuite/btcd/chaincfg" "github.com/btcsuite/btcd/chaincfg"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/chanbackup" "github.com/lightningnetwork/lnd/chanbackup"
"github.com/lightningnetwork/lnd/kvdb/etcd" "github.com/lightningnetwork/lnd/kvdb/etcd"
"github.com/lightningnetwork/lnd/lntest/wait" "github.com/lightningnetwork/lnd/lntest/wait"
@ -157,7 +158,7 @@ func (cfg BaseNodeConfig) DBPath() string {
func (cfg BaseNodeConfig) ChanBackupPath() string { func (cfg BaseNodeConfig) ChanBackupPath() string {
return filepath.Join( return filepath.Join(
cfg.DataDir, "chain", "bitcoin", cfg.DataDir, "chain", lnd.BitcoinChainName,
fmt.Sprintf( fmt.Sprintf(
"%v/%v", cfg.NetParams.Name, "%v/%v", cfg.NetParams.Name,
chanbackup.DefaultBackupFileName, chanbackup.DefaultBackupFileName,

3
lntest/node/harness_node.go
View File

@ -18,6 +18,7 @@ import (
"time" "time"
"github.com/jackc/pgx/v4/pgxpool" "github.com/jackc/pgx/v4/pgxpool"
"github.com/lightningnetwork/lnd"
"github.com/lightningnetwork/lnd/lnrpc" "github.com/lightningnetwork/lnd/lnrpc"
"github.com/lightningnetwork/lnd/lntest/rpc" "github.com/lightningnetwork/lnd/lntest/rpc"
"github.com/lightningnetwork/lnd/lntest/wait" "github.com/lightningnetwork/lnd/lntest/wait"
@ -107,7 +108,7 @@ func NewHarnessNode(t *testing.T, cfg *BaseNodeConfig) (*HarnessNode, error) {
cfg.TLSKeyPath = filepath.Join(cfg.BaseDir, "tls.key") cfg.TLSKeyPath = filepath.Join(cfg.BaseDir, "tls.key")
networkDir := filepath.Join( networkDir := filepath.Join(
cfg.DataDir, "chain", "bitcoin", cfg.NetParams.Name, cfg.DataDir, "chain", lnd.BitcoinChainName, cfg.NetParams.Name,
) )
cfg.AdminMacPath = filepath.Join(networkDir, "admin.macaroon") cfg.AdminMacPath = filepath.Join(networkDir, "admin.macaroon")
cfg.ReadMacPath = filepath.Join(networkDir, "readonly.macaroon") cfg.ReadMacPath = filepath.Join(networkDir, "readonly.macaroon")