Rolls back some bad changes

duckduckgo · Apr 15, 2024 · e2fddef · e2fddef
1 parent 9d0cb88
commit e2fddef
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 28 deletions.
diff --git a/...NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift b/...NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
@@ -61,7 +61,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
 
     @MainActor
     func start() async {
-        try? await pixelKit?.fire(StartAttempt.begin)
+        pixelKit?.fire(StartAttempt.begin)
 
         do {
             guard try await enableLoginItems() else {
@@ -70,16 +70,16 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
             }
 
             ipcClient.start()
-            try? await pixelKit?.fire(StartAttempt.success, frequency: .dailyAndContinuous)
+            pixelKit?.fire(StartAttempt.success, frequency: .dailyAndContinuous)
         } catch {
             os_log("🔴 IPC Controller found en error when starting the VPN: \(error)", log: .networkProtection)
-            try? await pixelKit?.fire(StartAttempt.failure(error), frequency: .dailyAndContinuous)
+            pixelKit?.fire(StartAttempt.failure(error), frequency: .dailyAndContinuous)
         }
     }
 
     @MainActor
     func stop() async {
-        try? await pixelKit?.fire(StopAttempt.begin)
+        pixelKit?.fire(StopAttempt.begin)
 
         do {
             guard try await enableLoginItems() else {
@@ -88,10 +88,10 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
             }
 
             ipcClient.stop()
-            try? await pixelKit?.fire(StopAttempt.success, frequency: .dailyAndContinuous)
+            pixelKit?.fire(StopAttempt.success, frequency: .dailyAndContinuous)
         } catch {
             os_log("🔴 IPC Controller found en error when starting the VPN: \(error)", log: .networkProtection)
-            try? await pixelKit?.fire(StopAttempt.failure(error), frequency: .dailyAndContinuous)
+            pixelKit?.fire(StopAttempt.failure(error), frequency: .dailyAndContinuous)
         }
     }
 

diff --git a/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift b/LocalPackages/PixelKit/Sources/PixelKit/PixelKitEventV2.swift
@@ -39,32 +39,20 @@ public protocol PixelKitEventV2: PixelKitEvent {
 /// and the call to `fire` should process those properties to serialize in the requests.
 ///
 public protocol PixelFiring {
-    @discardableResult
-    func fire(_ event: PixelKitEventV2) async throws -> Bool
+    func fire(_ event: PixelKitEventV2)
 
-    @discardableResult
     func fire(_ event: PixelKitEventV2,
-              frequency: PixelKit.Frequency) async throws -> Bool
+              frequency: PixelKit.Frequency)
 }
 
 extension PixelKit: PixelFiring {
-    @discardableResult
-    public func fire(_ event: PixelKitEventV2) async throws -> Bool {
-        try await fire(event, frequency: .standard)
+    public func fire(_ event: PixelKitEventV2) {
+        fire(event, frequency: .standard)
     }
 
-    @discardableResult
     public func fire(_ event: PixelKitEventV2,
-                     frequency: PixelKit.Frequency) async throws -> Bool {
-        try await withCheckedThrowingContinuation { continuation in
-            fire(event, frequency: frequency) { fired, error in
-                if let error {
-                    continuation.resume(throwing: error)
-                    return
-                }
+                     frequency: PixelKit.Frequency) {
 
-                continuation.resume(returning: fired)
-            }
-        }
+        fire(event, frequency: frequency, onComplete: { _, _ in })
     }
 }
diff --git a/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelKitMock.swift b/LocalPackages/PixelKit/Sources/PixelKitTestingUtilities/PixelKitMock.swift
@@ -33,14 +33,13 @@ public final class PixelKitMock: PixelFiring {
         self.expectedFireCalls = expectedFireCalls
     }
 
-    public func fire(_ event: PixelKitEventV2) async throws -> Bool {
-        try await fire(event, frequency: .standard)
+    public func fire(_ event: PixelKitEventV2) {
+        fire(event, frequency: .standard)
     }
 
-    public func fire(_ event: PixelKitEventV2, frequency: PixelKit.Frequency) async throws -> Bool {
+    public func fire(_ event: PixelKitEventV2, frequency: PixelKit.Frequency) {
         let fireCall = ExpectedFireCall(pixel: event, frequency: frequency)
         actualFireCalls.append(fireCall)
-        return true
     }
 
     public var expectationsMet: Bool {