chore: update sync engine tests for API changes in core crypto

Author: typfel

WireDomain/Sources/WireDomain/Providers/MLSTransportProvider.swift

@@ -19,7 +19,8 @@
 import WireCoreCrypto
 
 /// An object that provides an instance of `MlsTransport`.
-/// 
+
+// sourcery: AutoMockable
 public protocol MLSTransportProvider {
-    func provideMLSTransport() throws -> any MlsTransport
+    func provideMLSTransport() throws -> MlsTransport
 }

WireDomain/Sources/WireDomainSupport/Sourcery/config.yml

@@ -5,5 +5,5 @@ templates:
 output:
   ./generated
 args:
-  autoMockableImports: ["WireAPI", "WireDataModel", "WireDomainPkg"]
+  autoMockableImports: ["WireAPI", "WireDataModel", "WireDomainPkg", "WireCoreCrypto"]
   autoMockableTestableImports: ["WireDomain"]

WireDomain/Sources/WireDomainSupport/Sourcery/generated/AutoMockable.generated.swift

@@ -238,14 +238,9 @@ public final class NotificationSession {
             cryptoboxMigrationManager: cryptoboxMigrationManager,
             allowCreation: false
         )
-        let commitSender = CommitSender(
-            coreCryptoProvider: coreCryptoProvider,
-            notificationContext: coreDataStack.syncContext.notificationContext
-        )
         let featureRepository = FeatureRepository(context: coreDataStack.syncContext)
         let mlsActionExecutor = MLSActionExecutor(
             coreCryptoProvider: coreCryptoProvider,
-            commitSender: commitSender,
             featureRepository: featureRepository
         )
 

wire-ios-notification-engine/Sources/NotificationSession.swift

@@ -434,14 +434,9 @@ public final class SharingSession {
             cryptoboxMigrationManager: cryptoboxMigrationManager,
             allowCreation: false
         )
-        let commitSender = CommitSender(
-            coreCryptoProvider: coreCryptoProvider,
-            notificationContext: coreDataStack.syncContext.notificationContext
-        )
         let featureRepository = FeatureRepository(context: coreDataStack.syncContext)
         let mlsActionExecutor = MLSActionExecutor(
             coreCryptoProvider: coreCryptoProvider,
-            commitSender: commitSender,
             featureRepository: featureRepository
         )
         let contextStorage = LAContextStorage()

wire-ios-share-engine/Sources/SharingSession.swift

@@ -1157,9 +1157,11 @@ final class WireCallCenterV3Tests: MessagingTest {
         }
 
         // So we can inform of new conference infos
+        let listentingOnConferenceInfoChange = expectation(description: "listenting to onConferenceInfoChange")
         let conferenceInfoChangeSubject = PassthroughSubject<MLSConferenceInfo, Never>()
         mlsService.onConferenceInfoChangeParentGroupIDSubConversationGroupID_MockMethod = { _, _ in
             var iterator = conferenceInfoChangeSubject.values.makeAsyncIterator()
+            listentingOnConferenceInfoChange.fulfill()
             return AsyncThrowingStream {
                 await iterator.next()
             }
@@ -1173,6 +1175,8 @@ final class WireCallCenterV3Tests: MessagingTest {
             // when
             try block()
         }
+        
+        wait(for: [listentingOnConferenceInfoChange])
 
         let didSetConferenceInfo2 = customExpectation(description: "didSetConferenceInfo2")
         mockAVSWrapper.mockSetMLSConferenceInfo = {

wire-ios-sync-engine/Tests/Source/Calling/WireCallCenterV3Tests.swift

@@ -27,7 +27,7 @@ final class CertificateRevocationListsCheckerTests: XCTestCase {
     private var coreDataHelper: CoreDataStackHelper!
 
     private var sut: CertificateRevocationListsChecker!
-    private var mockCoreCrypto: MockCoreCryptoProtocol!
+    private var mockCoreCryptoContext: MockCoreCryptoContextProtocol!
     private var mockCRLAPI: MockCertificateRevocationListAPIProtocol!
     private var mockMLSGroupVerification: MockMLSGroupVerificationProtocol!
     private var mockSelfClientCertificateProvider: MockSelfClientCertificateProviderProtocol!
@@ -38,8 +38,8 @@ final class CertificateRevocationListsCheckerTests: XCTestCase {
     override func setUp() async throws {
         try await super.setUp()
 
-        mockCoreCrypto = MockCoreCryptoProtocol()
-        let safeCoreCrypto = MockSafeCoreCrypto(coreCrypto: mockCoreCrypto)
+        mockCoreCryptoContext = MockCoreCryptoContextProtocol()
+        let safeCoreCrypto = MockSafeCoreCrypto(coreCryptoContext: mockCoreCryptoContext)
         let provider = MockCoreCryptoProviderProtocol()
         provider.coreCrypto_MockValue = safeCoreCrypto
 
@@ -68,7 +68,7 @@ final class CertificateRevocationListsCheckerTests: XCTestCase {
 
     override func tearDown() async throws {
         sut = nil
-        mockCoreCrypto = nil
+        mockCoreCryptoContext = nil
         mockCRLAPI = nil
         mockMLSGroupVerification = nil
         mockSelfClientCertificateProvider = nil
@@ -117,9 +117,9 @@ final class CertificateRevocationListsCheckerTests: XCTestCase {
         )
 
         // It registers the CRLs with core crypto
-        XCTAssertEqual(mockCoreCrypto.e2eiRegisterCrlCrlDpCrlDer_Invocations.count, 2)
+        XCTAssertEqual(mockCoreCryptoContext.e2eiRegisterCrlCrlDpCrlDer_Invocations.count, 2)
         XCTAssertEqual(
-            Set(mockCoreCrypto.e2eiRegisterCrlCrlDpCrlDer_Invocations.map(\.crlDp)),
+            Set(mockCoreCryptoContext.e2eiRegisterCrlCrlDpCrlDer_Invocations.map(\.crlDp)),
             Set([dp2, dp3])
         )
 
@@ -153,7 +153,7 @@ final class CertificateRevocationListsCheckerTests: XCTestCase {
         XCTAssertTrue(mockCRLAPI.getRevocationListFrom_Invocations.isEmpty)
 
         // It doesn't register any CRL with core crypto
-        XCTAssertTrue(mockCoreCrypto.e2eiRegisterCrlCrlDpCrlDer_Invocations.isEmpty)
+        XCTAssertTrue(mockCoreCryptoContext.e2eiRegisterCrlCrlDpCrlDer_Invocations.isEmpty)
 
         // It desn't store expiration date
         XCTAssertTrue(mockCRLExpirationDatesRepository.storeCRLExpirationDateFor_Invocations.isEmpty)
@@ -212,9 +212,9 @@ final class CertificateRevocationListsCheckerTests: XCTestCase {
         )
 
         // It registers the fetched CRLs with core crypto
-        XCTAssertEqual(mockCoreCrypto.e2eiRegisterCrlCrlDpCrlDer_Invocations.count, 1)
+        XCTAssertEqual(mockCoreCryptoContext.e2eiRegisterCrlCrlDpCrlDer_Invocations.count, 1)
         XCTAssertEqual(
-            Set(mockCoreCrypto.e2eiRegisterCrlCrlDpCrlDer_Invocations.map(\.crlDp)),
+            Set(mockCoreCryptoContext.e2eiRegisterCrlCrlDpCrlDer_Invocations.map(\.crlDp)),
             Set([dp2])
         )
 
@@ -244,7 +244,7 @@ final class CertificateRevocationListsCheckerTests: XCTestCase {
 
     private func mockCRLRegistration(with configurations: [String: (dirty: Bool, expiration: Date?)]) {
         // Mock registering the CRL with core crypto and returning the registration
-        mockCoreCrypto.e2eiRegisterCrlCrlDpCrlDer_MockMethod = { dp, _ in
+        mockCoreCryptoContext.e2eiRegisterCrlCrlDpCrlDer_MockMethod = { dp, _ in
             guard let configuration = configurations[dp] else {
                 return .init(dirty: false, expiration: nil)
             }

wire-ios-sync-engine/Tests/Source/E2EI/CertificateRevocationListsCheckerTests.swift

@@ -29,16 +29,22 @@ final class SyncAgentTests: XCTestCase, InitialSyncProvider, IncrementalSyncProv
     var legacySyncStatus: MockSyncStatusProtocol!
     var initialSync: MockInitialSyncProtocol!
     var incrementalSync: MockIncrementalSyncProtocol!
+    var coreCryptoProvider: MockCoreCryptoProviderProtocol!
+    var mlsTransportProvider: MockMLSTransportProvider!
 
     override func setUp() {
         lastUpdateEventIDRepository = MockLastEventIDRepositoryInterface()
         legacySyncStatus = MockSyncStatusProtocol()
         initialSync = MockInitialSyncProtocol()
         incrementalSync = MockIncrementalSyncProtocol()
+        coreCryptoProvider = MockCoreCryptoProviderProtocol()
+        mlsTransportProvider = MockMLSTransportProvider()
         sut = SyncAgent(
             lastUpdateEventIDRepository: lastUpdateEventIDRepository,
+            coreCryptoProvider: coreCryptoProvider,
             initialSyncProvider: self,
             incrementalSyncProvider: self,
+            mlsTransportProvider: mlsTransportProvider,
             legacySyncStatus: legacySyncStatus
         )
     }

wire-ios-sync-engine/Tests/Source/Synchronization/SyncAgentTests.swift

@@ -27,7 +27,7 @@ class CheckOneOnOneConversationIsReadyUseCaseTests: XCTestCase {
     private var sut: CheckOneOnOneConversationIsReadyUseCase!
     private var coreDataStack: CoreDataStack!
     private var mockCoreCryptoProvider: MockCoreCryptoProviderProtocol!
-    private var mockCoreCrypto: MockCoreCryptoProtocol!
+    private var mockCoreCryptoContext: MockCoreCryptoContextProtocol!
     private var syncMOC: NSManagedObjectContext!
     private var user: ZMUser!
     private var userID: QualifiedID!
@@ -38,9 +38,9 @@ class CheckOneOnOneConversationIsReadyUseCaseTests: XCTestCase {
         coreDataStack = try await coreDataStackHelper.createStack()
         syncMOC = coreDataStack.syncContext
 
-        mockCoreCrypto = MockCoreCryptoProtocol()
+        mockCoreCryptoContext = MockCoreCryptoContextProtocol()
         mockCoreCryptoProvider = MockCoreCryptoProviderProtocol()
-        mockCoreCryptoProvider.coreCrypto_MockValue = MockSafeCoreCrypto(coreCrypto: mockCoreCrypto)
+        mockCoreCryptoProvider.coreCrypto_MockValue = MockSafeCoreCrypto(coreCryptoContext: mockCoreCryptoContext)
 
         sut = CheckOneOnOneConversationIsReadyUseCase(
             context: syncMOC,
@@ -54,7 +54,7 @@ class CheckOneOnOneConversationIsReadyUseCaseTests: XCTestCase {
         sut = nil
         coreDataStack = nil
         mockCoreCryptoProvider = nil
-        mockCoreCrypto = nil
+        mockCoreCryptoContext = nil
         syncMOC = nil
         user = nil
         super.tearDown()
@@ -88,7 +88,7 @@ class CheckOneOnOneConversationIsReadyUseCaseTests: XCTestCase {
     func test_ItReturnsTrue_WhenConversationExists_MLS_Established() async throws {
         // Given
         await setupOneOnOne(messageProtocol: .mls, groupID: .random())
-        mockCoreCrypto.conversationExistsConversationId_MockValue = true
+        mockCoreCryptoContext.conversationExistsConversationId_MockValue = true
 
         // When
         let isReady = try await sut.invoke(userID: userID)
@@ -100,7 +100,7 @@ class CheckOneOnOneConversationIsReadyUseCaseTests: XCTestCase {
     func test_ItReturnsFalse_WhenConversationExists_MLS_NotEstablished() async throws {
         // Given
         await setupOneOnOne(messageProtocol: .mls, groupID: .random())
-        mockCoreCrypto.conversationExistsConversationId_MockValue = false
+        mockCoreCryptoContext.conversationExistsConversationId_MockValue = false
 
         // When
         let isReady = try await sut.invoke(userID: userID)

wire-ios-sync-engine/Tests/Source/Use cases/CheckOneOnOneConversationIsReadyUseCaseTests.swift

@@ -30,13 +30,13 @@ final class GetE2eIdentityCertificatesUseCaseTests: XCTestCase {
     private var sut: GetE2eIdentityCertificatesUseCase!
     private var coreCryptoProvider: MockCoreCryptoProviderProtocol!
     private var safeCoreCrypto: MockSafeCoreCrypto!
-    private var coreCrypto: MockCoreCryptoProtocol!
+    private var coreCryptoContext: MockCoreCryptoContextProtocol!
 
     override func setUp() async throws {
         try await super.setUp()
         stack = try await coreDataStackHelper.createStack()
-        coreCrypto = MockCoreCryptoProtocol()
-        safeCoreCrypto = MockSafeCoreCrypto(coreCrypto: coreCrypto)
+        coreCryptoContext = MockCoreCryptoContextProtocol()
+        safeCoreCrypto = MockSafeCoreCrypto(coreCryptoContext: coreCryptoContext)
         coreCryptoProvider = MockCoreCryptoProviderProtocol()
         coreCryptoProvider.coreCrypto_MockValue = safeCoreCrypto
         sut = GetE2eIdentityCertificatesUseCase(
@@ -48,7 +48,7 @@ final class GetE2eIdentityCertificatesUseCaseTests: XCTestCase {
     override func tearDown() async throws {
         stack = nil
         sut = nil
-        coreCrypto = nil
+        coreCryptoContext = nil
         safeCoreCrypto = nil
         coreCryptoProvider = nil
         try coreDataStackHelper.cleanupDirectory()
@@ -135,7 +135,7 @@ final class GetE2eIdentityCertificatesUseCaseTests: XCTestCase {
             status: .revoked
         )
 
-        coreCrypto.getDeviceIdentitiesConversationIdDeviceIds_MockMethod = { _, _ in
+        coreCryptoContext.getDeviceIdentitiesConversationIdDeviceIds_MockMethod = { _, _ in
             [
                 validIdentity,
                 identityWithInvalidHandle,