Resolve mergeback conflicts from release/1.84.0 to main

duckduckgo · Apr 18, 2024 · b102844 · b102844
1 parent ff7b0bc
commit b102844
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/...NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift b/...NetworkProtection/AppTargets/DeveloperIDTarget/NetworkProtectionIPCTunnelController.swift
@@ -88,7 +88,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
 
         func handleFailure(_ error: Error) {
             log(error)
-            pixelKit?.fire(StartAttempt.failure(error), frequency: .dailyAndContinuous)
+            pixelKit?.fire(StartAttempt.failure(error), frequency: .dailyAndCount)
         }
 
         do {
@@ -98,7 +98,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
                 if let error {
                     handleFailure(error)
                 } else {
-                    pixelKit?.fire(StartAttempt.success, frequency: .dailyAndContinuous)
+                    pixelKit?.fire(StartAttempt.success, frequency: .dailyAndCount)
                 }
             }
         } catch {
@@ -112,7 +112,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
 
         func handleFailure(_ error: Error) {
             log(error)
-            pixelKit?.fire(StopAttempt.failure(error), frequency: .dailyAndContinuous)
+            pixelKit?.fire(StopAttempt.failure(error), frequency: .dailyAndCount)
         }
 
         do {
@@ -122,7 +122,7 @@ extension NetworkProtectionIPCTunnelController: TunnelController {
                 if let error {
                     handleFailure(error)
                 } else {
-                    pixelKit?.fire(StopAttempt.success, frequency: .dailyAndContinuous)
+                    pixelKit?.fire(StopAttempt.success, frequency: .dailyAndCount)
                 }
             }
         } catch {

diff --git a/UnitTests/NetworkProtection/NetworkProtectionIPCTunnelControllerTests.swift b/UnitTests/NetworkProtection/NetworkProtectionIPCTunnelControllerTests.swift
@@ -31,7 +31,7 @@ final class NetworkProtectionIPCTunnelControllerTests: XCTestCase {
     func testStartTunnelSuccess() async {
         let pixelKit = PixelKitMock(expecting: [
             .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.begin, frequency: .standard),
-            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.success, frequency: .dailyAndContinuous)
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.success, frequency: .dailyAndCount)
         ])
         let controller = NetworkProtectionIPCTunnelController(
             featureVisibility: MockFeatureVisibility(),
@@ -50,7 +50,7 @@ final class NetworkProtectionIPCTunnelControllerTests: XCTestCase {
 
         let pixelKit = PixelKitMock(expecting: [
             .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.begin, frequency: .standard),
-            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.failure(expectedError), frequency: .dailyAndContinuous)
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.failure(expectedError), frequency: .dailyAndCount)
         ])
 
         let controller = NetworkProtectionIPCTunnelController(
@@ -68,7 +68,7 @@ final class NetworkProtectionIPCTunnelControllerTests: XCTestCase {
         let error = NSError(domain: "test", code: 1)
         let pixelKit = PixelKitMock(expecting: [
             .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.begin, frequency: .standard),
-            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.failure(error), frequency: .dailyAndContinuous)
+            .init(pixel: NetworkProtectionIPCTunnelController.StartAttempt.failure(error), frequency: .dailyAndCount)
         ])
         let controller = NetworkProtectionIPCTunnelController(
             featureVisibility: MockFeatureVisibility(),
@@ -86,7 +86,7 @@ final class NetworkProtectionIPCTunnelControllerTests: XCTestCase {
     func testStopTunnelSuccess() async {
         let pixelKit = PixelKitMock(expecting: [
             .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.begin, frequency: .standard),
-            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.success, frequency: .dailyAndContinuous)
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.success, frequency: .dailyAndCount)
         ])
         let controller = NetworkProtectionIPCTunnelController(
             featureVisibility: MockFeatureVisibility(),
@@ -105,7 +105,7 @@ final class NetworkProtectionIPCTunnelControllerTests: XCTestCase {
 
         let pixelKit = PixelKitMock(expecting: [
             .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.begin, frequency: .standard),
-            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.failure(expectedError), frequency: .dailyAndContinuous)
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.failure(expectedError), frequency: .dailyAndCount)
         ])
 
         let controller = NetworkProtectionIPCTunnelController(
@@ -123,7 +123,7 @@ final class NetworkProtectionIPCTunnelControllerTests: XCTestCase {
         let error = NSError(domain: "test", code: 1)
         let pixelKit = PixelKitMock(expecting: [
             .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.begin, frequency: .standard),
-            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.failure(error), frequency: .dailyAndContinuous)
+            .init(pixel: NetworkProtectionIPCTunnelController.StopAttempt.failure(error), frequency: .dailyAndCount)
         ])
         let controller = NetworkProtectionIPCTunnelController(
             featureVisibility: MockFeatureVisibility(),