review: renaming

Author: BillCarsonFr

ElementX/Sources/Services/ElementCall/ElementCallService.swift

@@ -15,7 +15,7 @@ import PushKit
 import UIKit
 
 // Keep this class testable
-struct Time {
+struct TimeProvider {
     var clock: any Clock<Duration>
     var now: () -> Date
 }
@@ -30,7 +30,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
     private let pushRegistry: PKPushRegistry
     private let callController = CXCallController()
     private let callProvider: CXProviderProtocol
-    private let timeClock: Time
+    private let timeProvider: TimeProvider
 
     private weak var clientProxy: ClientProxyProtocol? {
         didSet {
@@ -66,10 +66,10 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
 
     private var declineListenerHandle: TaskHandle?
 
-    init(callProvider: CXProviderProtocol? = nil, timeClock: Time? = nil) {
+    init(callProvider: CXProviderProtocol? = nil, timeProvider: TimeProvider? = nil) {
         pushRegistry = PKPushRegistry(queue: nil)
 
-        self.timeClock = timeClock ?? Time(clock: ContinuousClock(), now: Date.init)
+        self.timeProvider = timeProvider ?? TimeProvider(clock: ContinuousClock(), now: Date.init)
 
         if let callProvider {
             self.callProvider = callProvider
@@ -182,7 +182,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
             return
         }
 
-        let nowDate = timeClock.now()
+        let nowDate = timeProvider.now()
 
         guard nowDate < expirationDate else {
             MXLog.warning("Call expired for room \(roomID), ignoring incoming push")
@@ -210,7 +210,7 @@ class ElementCallService: NSObject, ElementCallServiceProtocol, PKPushRegistryDe
         }
 
         endUnansweredCallTask = Task { [weak self] in
-            try? await self?.timeClock.clock.sleep(for: .milliseconds(ringDurationMillis))
+            try? await self?.timeProvider.clock.sleep(for: .milliseconds(ringDurationMillis))
 
             guard let self, !Task.isCancelled else {
                 return

UnitTests/Sources/ElementCallServiceTests.swift

@@ -27,7 +27,7 @@ class ElementCallServiceTests: XCTestCase {
 
         let expectation = XCTestExpectation(description: "Call accepted")
 
-        let pkPushPayloadMock = PKPushPayloadMock().addSeconds(currentDate, lifetime: 30)
+        let pkPushPayloadMock = PKPushPayloadMock().updatingExpiration(currentDate, lifetime: 30)
 
         service.pushRegistry(pushRegistry, didReceiveIncomingPushWith: pkPushPayloadMock, for: .voIP) {
             expectation.fulfill()
@@ -44,7 +44,7 @@ class ElementCallServiceTests: XCTestCase {
 
         let expectation = XCTestExpectation(description: "Call accepted")
 
-        let pushPayload = PKPushPayloadMock().addSeconds(currentDate, lifetime: 20)
+        let pushPayload = PKPushPayloadMock().updatingExpiration(currentDate, lifetime: 20)
 
         service.pushRegistry(pushRegistry,
                              didReceiveIncomingPushWith: pushPayload,
@@ -66,7 +66,7 @@ class ElementCallServiceTests: XCTestCase {
 
         XCTAssertFalse(callProvider.reportNewIncomingCallWithUpdateCompletionCalled)
 
-        let pushPayload = PKPushPayloadMock().addSeconds(currentDate, lifetime: 20)
+        let pushPayload = PKPushPayloadMock().updatingExpiration(currentDate, lifetime: 20)
 
         currentDate = currentDate.addingTimeInterval(60)
 
@@ -83,7 +83,7 @@ class ElementCallServiceTests: XCTestCase {
 
         XCTAssertFalse(callProvider.reportNewIncomingCallWithUpdateCompletionCalled)
 
-        let pushPayload = PKPushPayloadMock().addSeconds(currentDate, lifetime: 300)
+        let pushPayload = PKPushPayloadMock().updatingExpiration(currentDate, lifetime: 300)
 
         service.pushRegistry(pushRegistry,
                              didReceiveIncomingPushWith: pushPayload,
@@ -106,7 +106,7 @@ class ElementCallServiceTests: XCTestCase {
         let dateProvider: () -> Date = {
             self.currentDate
         }
-        service = ElementCallService(callProvider: callProvider, timeClock: Time(clock: testClock, now: dateProvider))
+        service = ElementCallService(callProvider: callProvider, timeProvider: TimeProvider(clock: testClock, now: dateProvider))
     }
 }
 
@@ -124,8 +124,8 @@ private class PKPushPayloadMock: PKPushPayload {
         dict
     }
 
-    func addSeconds(_ from: Date, lifetime: Int) -> Self {
-        dict[ElementCallServiceNotificationKey.expirationDate.rawValue] = from.addingTimeInterval(TimeInterval(lifetime))
+    func updatingExpiration(_ from: Date, lifetime: TimeInterval) -> Self {
+        dict[ElementCallServiceNotificationKey.expirationDate.rawValue] = from.addingTimeInterval(lifetime)
         return self
     }
 }