refactor into minDuration func

cmd/restic/lock.go

@@ -34,6 +34,13 @@ var (
 	retrySleepMax   = 60 * time.Second
 )
 
+func minDuration(a, b time.Duration) time.Duration {
+	if a <= b {
+		return a
+	}
+	return b
+}
+
 // lockRepository wraps the ctx such that it is cancelled when the repository is unlocked
 // cancelling the original context also stops the lock refresh
 func lockRepository(ctx context.Context, repo restic.Repository, exclusive bool, retryLock time.Duration, json bool) (*restic.Lock, context.Context, error) {
@@ -51,10 +58,7 @@ func lockRepository(ctx context.Context, repo restic.Repository, exclusive bool,
 	var lock *restic.Lock
 	var err error
 
-	retrySleep := retrySleepStart
-	if retrySleep > retryLock {
-		retrySleep = retryLock
-	}
+	retrySleep := minDuration(retrySleepStart, retryLock)
 	retryMessagePrinted := false
 	retryTimeout := time.After(retryLock)
 
@@ -82,12 +86,7 @@ retryLoop:
 				lock, err = lockFn(ctx, repo)
 				break retryLoop
 			case <-retrySleepCh:
-				retrySleepNext := retrySleep * 2
-				if retrySleepNext > retrySleepMax {
-					retrySleep = retrySleepMax
-				} else {
-					retrySleep = retrySleepNext
-				}
+				retrySleep = minDuration(retrySleep*2, retrySleepMax)
 			}
 		} else {
 			// anything else, either a successful lock or another error