diff --git a/internal/bridge/bridge.go b/internal/bridge/bridge.go index fc9a3b00..36d74020 100644 --- a/internal/bridge/bridge.go +++ b/internal/bridge/bridge.go @@ -636,14 +636,6 @@ func loadTLSConfig(vault *vault.Vault) (*tls.Config, error) { }, nil } -func min(a, b time.Duration) time.Duration { //nolint:predeclared - if a < b { - return a - } - - return b -} - func (bridge *Bridge) HasAPIConnection() bool { return bridge.api.GetStatus() == proton.StatusUp } diff --git a/internal/network/proton.go b/internal/network/proton.go index 29aae338..52cf489d 100644 --- a/internal/network/proton.go +++ b/internal/network/proton.go @@ -31,8 +31,8 @@ type CoolDownProvider interface { Reset() } -func jitter(max int) time.Duration { //nolint:predeclared - return time.Duration(rand.Intn(max)) * time.Second //nolint:gosec +func jitter(maxValue int) time.Duration { + return time.Duration(rand.Intn(maxValue)) * time.Second //nolint:gosec } type ExpCoolDown struct { diff --git a/internal/services/syncservice/stage_download.go b/internal/services/syncservice/stage_download.go index 17144cd0..dff87c87 100644 --- a/internal/services/syncservice/stage_download.go +++ b/internal/services/syncservice/stage_download.go @@ -231,7 +231,7 @@ func downloadAttachment(ctx context.Context, cache *DownloadCache, client APICli } type DownloadRateModifier interface { - Apply(wasSuccess bool, current int, max int) int //nolint:predeclared + Apply(wasSuccess bool, currentValue int, maxValue int) int } func autoDownloadRate[T any, R any]( @@ -285,14 +285,14 @@ func autoDownloadRate[T any, R any]( type DefaultDownloadRateModifier struct{} -func (d DefaultDownloadRateModifier) Apply(wasSuccess bool, current int, max int) int { //nolint:predeclared +func (d DefaultDownloadRateModifier) Apply(wasSuccess bool, currentValue int, maxValue int) int { if !wasSuccess { return 2 } - parallelTasks := current * 2 - if parallelTasks > max { - parallelTasks = max + parallelTasks := currentValue * 2 + if parallelTasks > maxValue { + parallelTasks = maxValue } return parallelTasks