File tree Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Expand file tree Collapse file tree 1 file changed +6
-3
lines changed Original file line number Diff line number Diff line change @@ -395,14 +395,18 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
395
395
// (like the log or lnd options) as they will be taken from lnd's config
396
396
// struct. Others we want to force to be the same as lnd so the user
397
397
// doesn't have to set them manually, like the network for example.
398
+ cfg .Faraday .Lnd .MacaroonPath = faraday .DefaultLndMacaroonPath
398
399
if err := faraday .ValidateConfig (cfg .Faraday ); err != nil {
399
400
return nil , err
400
401
}
401
- cfg .Loop .Lnd .MacaroonPath = loopd .DefaultMacaroonPath
402
+
403
+ defaultLoopCfg := loopd .DefaultConfig ()
404
+ cfg .Loop .Lnd .MacaroonPath = defaultLoopCfg .Lnd .MacaroonPath
402
405
if err := loopd .Validate (cfg .Loop ); err != nil {
403
406
return nil , err
404
407
}
405
- cfg .Pool .Lnd .MacaroonPath = pool .DefaultMacaroonPath
408
+
409
+ cfg .Pool .Lnd .MacaroonPath = pool .DefaultLndMacaroonPath
406
410
if err := pool .Validate (cfg .Pool ); err != nil {
407
411
return nil , err
408
412
}
@@ -436,7 +440,6 @@ func loadAndValidateConfig(interceptor signal.Interceptor) (*Config, error) {
436
440
}
437
441
}
438
442
439
- defaultLoopCfg := loopd .DefaultConfig ()
440
443
if cfg .loopRemote && cfg .Network != defaultNetwork {
441
444
if cfg .Remote .Loop .MacaroonPath == defaultLoopCfg .MacaroonPath {
442
445
cfg .Remote .Loop .MacaroonPath = cfg .Loop .MacaroonPath
You can’t perform that action at this time.
0 commit comments