From bd3736d6e232afb055a111f2a4aead475c2f2af0 Mon Sep 17 00:00:00 2001 From: Elle Mouton Date: Thu, 15 Aug 2024 08:52:20 +0200 Subject: [PATCH] config: fix parsing of FaradayDir config option 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. --- config.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config.go b/config.go index dcde522..0769c19 100644 --- a/config.go +++ b/config.go @@ -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