highperfocused/lnd
1
0
Fork 0
mirror of https://github.com/lightningnetwork/lnd.git synced 2025-10-11 00:32:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9279 from ellemouton/misc

Browse Source 
misc: nil checks and remove deprecated default values
This commit is contained in:
Elle
2024-11-19 10:37:01 +02:00
committed by GitHub
parent 0e999ed9f5 9f72ce7dd4
commit d14f4c7e1f
3 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config.go
View File

@@ -562,8 +562,6 @@ func DefaultConfig() Config {
LetsEncryptDir: defaultLetsEncryptDir, LetsEncryptDir: defaultLetsEncryptDir,
LetsEncryptListen: defaultLetsEncryptListen, LetsEncryptListen: defaultLetsEncryptListen,
LogDir: defaultLogDir, LogDir: defaultLogDir,
MaxLogFiles: build.DefaultMaxLogFiles,
MaxLogFileSize: build.DefaultMaxLogFileSize,
AcceptorTimeout: defaultAcceptorTimeout, AcceptorTimeout: defaultAcceptorTimeout,
WSPingInterval: lnrpc.DefaultPingInterval, WSPingInterval: lnrpc.DefaultPingInterval,
WSPongWait: lnrpc.DefaultPongWait, WSPongWait: lnrpc.DefaultPongWait,
@@ -1417,7 +1415,7 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser,
os.Exit(0) os.Exit(0)
} }
if cfg.MaxLogFiles != build.DefaultMaxLogFiles { if cfg.MaxLogFiles != 0 {
if cfg.LogConfig.File.MaxLogFiles != if cfg.LogConfig.File.MaxLogFiles !=
build.DefaultMaxLogFiles { build.DefaultMaxLogFiles {
@@ -1427,7 +1425,7 @@ func ValidateConfig(cfg Config, interceptor signal.Interceptor, fileParser,
cfg.LogConfig.File.MaxLogFiles = cfg.MaxLogFiles cfg.LogConfig.File.MaxLogFiles = cfg.MaxLogFiles
} }
if cfg.MaxLogFileSize != build.DefaultMaxLogFileSize { if cfg.MaxLogFileSize != 0 {
if cfg.LogConfig.File.MaxLogFileSize != if cfg.LogConfig.File.MaxLogFileSize !=
build.DefaultMaxLogFileSize { build.DefaultMaxLogFileSize {

4
lntest/harness_assertion.go
View File

@@ -255,10 +255,10 @@ func (h *HarnessTest) AssertNumActiveEdges(hn *node.HarnessNode,
// filterDisabled is a helper closure that filters out disabled // filterDisabled is a helper closure that filters out disabled
// channels. // channels.
filterDisabled := func(edge *lnrpc.ChannelEdge) bool { filterDisabled := func(edge *lnrpc.ChannelEdge) bool {
if edge.Node1Policy.Disabled { if edge.Node1Policy != nil && edge.Node1Policy.Disabled {
return false return false
} }
if edge.Node2Policy.Disabled { if edge.Node2Policy != nil && edge.Node2Policy.Disabled {
return false return false
} }

4
lntest/node/state.go
View File

@@ -312,10 +312,10 @@ func (s *State) updateEdgeStats() {
// filterDisabled is a helper closure that filters out disabled // filterDisabled is a helper closure that filters out disabled
// channels. // channels.
filterDisabled := func(edge *lnrpc.ChannelEdge) bool { filterDisabled := func(edge *lnrpc.ChannelEdge) bool {
if edge.Node1Policy.Disabled { if edge.Node1Policy != nil && edge.Node1Policy.Disabled {
return false return false
} }
if edge.Node2Policy.Disabled { if edge.Node2Policy != nil && edge.Node2Policy.Disabled {
return false return false
} }