Merge branch 'dl/lru-on-evict' into dl/blockdb

Author: DracoLi

cache/lru/cache_test.go

@@ -46,5 +46,5 @@ func TestCachePutWithOnEvict(t *testing.T) {
 
 	cachetest.Basic(t, c)
 	require.Len(t, evicted, 1)
-	require.Equal(t, evicted[ids.ID{1}], int64(1))
+	require.Equal(t, int64(1), evicted[ids.ID{1}])
 }

x/sync/manager.go

@@ -1030,10 +1030,7 @@ func (m *Manager) enqueueWork(work *workItem) {
 func midPoint(startMaybe, endMaybe maybe.Maybe[[]byte]) maybe.Maybe[[]byte] {
 	start := startMaybe.Value()
 	end := endMaybe.Value()
-	length := len(start)
-	if len(end) > length {
-		length = len(end)
-	}
+	length := max(len(end), len(start))
 
 	if length == 0 {
 		if endMaybe.IsNothing() {
@@ -1180,10 +1177,8 @@ func calculateBackoff(attempt int) time.Duration {
 		return 0
 	}
 
-	retryWait := initialRetryWait * time.Duration(math.Pow(retryWaitFactor, float64(attempt)))
-	if retryWait > maxRetryWait {
-		retryWait = maxRetryWait
-	}
-
-	return retryWait
+	return min(
+		initialRetryWait*time.Duration(math.Pow(retryWaitFactor, float64(attempt))),
+		maxRetryWait,
+	)
 }