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

config: fix default macaroon paths

Browse source 
We used the wrong constants for the default values of lnd's macaroon
paths. This commit sets the correct default values before the config is
parsed.
This commit is contained in:
Oliver Gugger 2021-06-25 21:17:01 +02:00
parent e835163de7
commit 728a262ea4
No known key found for this signature in database
GPG key ID: 8E4256593F177720
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
config.go
View file

@ -395,14 +395,18 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
// (like the log or lnd options) as they will be taken from lnd's config
// struct. Others we want to force to be the same as lnd so the user
// doesn't have to set them manually, like the network for example.
cfg.Faraday.Lnd.MacaroonPath = faraday.DefaultLndMacaroonPath
if err := faraday.ValidateConfig(cfg.Faraday); err != nil {
return nil, err
}
cfg.Loop.Lnd.MacaroonPath = loopd.DefaultMacaroonPath
defaultLoopCfg := loopd.DefaultConfig()
cfg.Loop.Lnd.MacaroonPath = defaultLoopCfg.Lnd.MacaroonPath
if err := loopd.Validate(cfg.Loop); err != nil {
return nil, err
}
cfg.Pool.Lnd.MacaroonPath = pool.DefaultMacaroonPath
cfg.Pool.Lnd.MacaroonPath = pool.DefaultLndMacaroonPath
if err := pool.Validate(cfg.Pool); err != nil {
return nil, err
}
@ -436,7 +440,6 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
}
}
defaultLoopCfg := loopd.DefaultConfig()
if cfg.loopRemote && cfg.Network != defaultNetwork {
if cfg.Remote.Loop.MacaroonPath == defaultLoopCfg.MacaroonPath {
cfg.Remote.Loop.MacaroonPath = cfg.Loop.MacaroonPath