GlcoinCore/faraday
1
0
Fork 0
mirror of https://github.com/lightninglabs/faraday.git synced 2026-08-13 12:33:35 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: fix parsing of FaradayDir config option

Browse source 
Set the `faradayDirSet` boolean before namespacing the directory with
the network. This fixes a bug where the user would _not_ set faradayDir
but would set the macaroon path and would run into the "faradaydir
overwrites macaroonpath..." error.
This commit is contained in:
Elle Mouton 2024-08-15 08:52:20 +02:00
parent 8e6b4b5dcb
commit bd3736d6e2
No known key found for this signature in database
GPG key ID: D7D916376026F177
1 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
config.go
View file

@ -192,6 +192,10 @@ func ValidateConfig(config *Config) error {
config.TLSKeyPath = lncfg.CleanAndExpandPath(config.TLSKeyPath)
config.MacaroonPath = lncfg.CleanAndExpandPath(config.MacaroonPath)
// Before adding the network namespace below, check if the user has
// overwritten the default faraday directory.
faradayDirSet := config.FaradayDir != FaradayDirBase
// Append the network type to faraday directory so they are "namespaced"
// per network.
config.FaradayDir = filepath.Join(config.FaradayDir, config.Network)
@ -205,7 +209,6 @@ func ValidateConfig(config *Config) error {
// values, make sure that they are not set when faraday dir is set. We
// fail hard here rather than overwriting and potentially confusing the
// user.
faradayDirSet := config.FaradayDir != FaradayDirBase
if faradayDirSet {
tlsCertPathSet := config.TLSCertPath != DefaultTLSCertPath
tlsKeyPathSet := config.TLSKeyPath != DefaultTLSKeyPath