Use Clock directly

Author: swiftty

Sources/DataCacheKit/DiskCache.swift

@@ -27,7 +27,7 @@ public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
 //        }
     }
 
-    private let clock: _Clock
+    private let clock: any Clock<Duration>
 
     private var path: URL {
         get throws {
@@ -57,23 +57,9 @@ public actor DiskCache<Key: Hashable & Sendable>: Caching, @unchecked Sendable {
         return "[\(path.lastPathComponent)] "
     }
 
-    public init(options: Options, logger: Logger = .init(.disabled)) {
+    public init(options: Options, clock: some Clock<Duration> = .suspending, logger: Logger = .init(.disabled)) {
         self.options = options
-        if #available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *) {
-            self.clock = NewClock(.suspending)
-        } else {
-            self.clock = _Clock()
-        }
-        self.logger = logger
-        Task {
-            try await _prepare()
-        }
-    }
-
-    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-    init<C: Clock>(options: Options, clock: C, logger: Logger = .init(.disabled)) where C.Instant.Duration == Duration {
-        self.options = options
-        self.clock = NewClock(clock)
+        self.clock = clock
         self.logger = logger
         Task {
             try await _prepare()
@@ -225,7 +211,7 @@ extension DiskCache {
         isFlushScheduled = true
         defer { isFlushScheduled = false }
 
-        try await clock.sleep(until: 1)
+        try await clock.sleep(for: .seconds(1))
         try? await oldTask?.value
 
         guard isFlushNeeded else { return }
@@ -344,7 +330,7 @@ extension DiskCache {
         logger.debug("\(self.logKey)sweep scheduled")
         let oldTask = sweepingTask
         sweepingTask = Task {
-            try await clock.sleep(until: seconds)
+            try await clock.sleep(for: .seconds(seconds))
             _ = await oldTask?.result
             do {
                 logger.debug("\(self.logKey)sweep starting")
@@ -460,27 +446,6 @@ extension DiskCache {
     }
 }
 
-extension DiskCache {
-    class _Clock: @unchecked Sendable {
-        func sleep(until seconds: Int) async throws {
-            try await Task.sleep(nanoseconds: UInt64(seconds) * 1_000_000_000)
-        }
-    }
-
-    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
-    final class NewClock<C: Clock>: _Clock, @unchecked Sendable where C.Instant.Duration == Duration {
-        let clock: C
-
-        init(_ clock: C) {
-            self.clock = clock
-        }
-
-        override func sleep(until seconds: Int) async throws {
-            try await clock.sleep(until: clock.now.advanced(by: .seconds(seconds)), tolerance: nil)
-        }
-    }
-}
-
 struct Staging<Key: Hashable & Sendable> {
     enum Operation: Equatable {
         case add(Data)

Tests/DataCacheKitTests/DiskCacheTests.swift

@@ -39,7 +39,6 @@ final class DiskCacheTests {
     }
 
     @Test
-    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
     func testStoreData() async throws {
         let clock = ManualClock()
         let cache = DiskCache<String>(options: cacheOptions(), clock: clock, logger: .init(.default))
@@ -78,7 +77,6 @@ final class DiskCacheTests {
     }
 
     @Test
-    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
     func testStoreDataMultiple() async throws {
         let clock = ManualClock()
         let cache = DiskCache<String>(options: cacheOptions(), clock: clock, logger: .init(.default))
@@ -102,7 +100,6 @@ final class DiskCacheTests {
     }
 
     @Test
-    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
     func testRemoveData() async throws {
         let clock = ManualClock()
         let cache = DiskCache<String>(options: cacheOptions(), clock: clock, logger: .init(.default))
@@ -137,7 +134,6 @@ final class DiskCacheTests {
     }
 
     @Test
-    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
     func testRemoveDataAll() async throws {
         let clock = ManualClock()
         let cache = DiskCache<String>(options: cacheOptions(), clock: clock, logger: .init(.default))
@@ -177,7 +173,6 @@ final class DiskCacheTests {
     }
 
     @Test
-    @available(macOS 13.0, iOS 16.0, watchOS 9.0, tvOS 16.0, *)
     func testSweep() async throws {
         let allocationUnit = 4096