mirrors/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-02-23 14:40:30 +01:00
Code Issues Projects Releases Wiki Activity

Merge pull request #6202 from guggero/itest-lnddir

Browse source 
lntest: set --lnddir instead of --datadir
This commit is contained in:
Oliver Gugger 2022-01-26 16:12:29 +01:00 • committed by GitHub
commit 0dae2d47f2
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
docs/release-notes/release-notes-0.15.0.md
View file

@ -73,6 +73,9 @@
* [Refactored itest to better manage contexts inside integration tests](https://github.com/lightningnetwork/lnd/pull/5756). * [Refactored itest to better manage contexts inside integration tests](https://github.com/lightningnetwork/lnd/pull/5756).
* [Fix itest not picking up local config file or creating directories in home
dir of the user](https://github.com/lightningnetwork/lnd/pull/6202).
# Contributors (Alphabetical Order) # Contributors (Alphabetical Order)
* 3nprob * 3nprob

11
lntest/harness_node.go
View file

@ -222,10 +222,7 @@ func (cfg *BaseNodeConfig) GenArgs() []string {
fmt.Sprintf("--restcors=https://%v", cfg.RESTAddr()), fmt.Sprintf("--restcors=https://%v", cfg.RESTAddr()),
fmt.Sprintf("--listen=%v", cfg.P2PAddr()), fmt.Sprintf("--listen=%v", cfg.P2PAddr()),
fmt.Sprintf("--externalip=%v", cfg.P2PAddr()), fmt.Sprintf("--externalip=%v", cfg.P2PAddr()),
fmt.Sprintf("--logdir=%v", cfg.LogDir), fmt.Sprintf("--lnddir=%v", cfg.BaseDir),
fmt.Sprintf("--datadir=%v", cfg.DataDir),
fmt.Sprintf("--tlscertpath=%v", cfg.TLSCertPath),
fmt.Sprintf("--tlskeypath=%v", cfg.TLSKeyPath),
fmt.Sprintf("--adminmacaroonpath=%v", cfg.AdminMacPath), fmt.Sprintf("--adminmacaroonpath=%v", cfg.AdminMacPath),
fmt.Sprintf("--readonlymacaroonpath=%v", cfg.ReadMacPath), fmt.Sprintf("--readonlymacaroonpath=%v", cfg.ReadMacPath),
fmt.Sprintf("--invoicemacaroonpath=%v", cfg.InvoiceMacPath), fmt.Sprintf("--invoicemacaroonpath=%v", cfg.InvoiceMacPath),
@ -408,9 +405,9 @@ func newNode(cfg *BaseNodeConfig) (*HarnessNode, error) {
} }
} }
cfg.DataDir = filepath.Join(cfg.BaseDir, "data") cfg.DataDir = filepath.Join(cfg.BaseDir, "data")
cfg.LogDir = filepath.Join(cfg.BaseDir, "log") cfg.LogDir = filepath.Join(cfg.BaseDir, "logs")
cfg.TLSCertPath = filepath.Join(cfg.DataDir, "tls.cert") cfg.TLSCertPath = filepath.Join(cfg.BaseDir, "tls.cert")
cfg.TLSKeyPath = filepath.Join(cfg.DataDir, "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", "bitcoin", cfg.NetParams.Name,