From c7767d7480acf03a033ffaf778d14320c4a09fca Mon Sep 17 00:00:00 2001 From: Boris Safonov Date: Fri, 13 Dec 2024 16:21:01 +0200 Subject: [PATCH] Fixed code style --- .../conversation/MLSConversationRepository.kt | 6 +++--- .../conversation/MLSConversationRepositoryTest.kt | 15 ++++++++------- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt index c5363221deb..73aa6c45c16 100644 --- a/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt +++ b/logic/src/commonMain/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepository.kt @@ -32,6 +32,7 @@ import com.wire.kalium.logic.StorageFailure import com.wire.kalium.logic.data.client.MLSClientProvider import com.wire.kalium.logic.data.conversation.mls.MLSAdditionResult import com.wire.kalium.logic.data.e2ei.CertificateRevocationListRepository +import com.wire.kalium.logic.data.e2ei.RevocationListChecker import com.wire.kalium.logic.data.event.Event import com.wire.kalium.logic.data.event.EventDeliveryInfo import com.wire.kalium.logic.data.id.ConversationId @@ -45,12 +46,11 @@ import com.wire.kalium.logic.data.id.toModel import com.wire.kalium.logic.data.keypackage.KeyPackageLimitsProvider import com.wire.kalium.logic.data.keypackage.KeyPackageRepository import com.wire.kalium.logic.data.mls.CipherSuite +import com.wire.kalium.logic.data.mls.MLSPublicKeys import com.wire.kalium.logic.data.mlspublickeys.MLSPublicKeysRepository import com.wire.kalium.logic.data.mlspublickeys.getRemovalKey import com.wire.kalium.logic.data.user.UserId import com.wire.kalium.logic.di.MapperProvider -import com.wire.kalium.logic.data.e2ei.RevocationListChecker -import com.wire.kalium.logic.data.mls.MLSPublicKeys import com.wire.kalium.logic.functional.Either import com.wire.kalium.logic.functional.flatMap import com.wire.kalium.logic.functional.flatMapLeft @@ -68,9 +68,9 @@ import com.wire.kalium.logic.sync.incremental.EventSource import com.wire.kalium.logic.wrapApiRequest import com.wire.kalium.logic.wrapMLSRequest import com.wire.kalium.logic.wrapStorageRequest +import com.wire.kalium.network.api.authenticated.notification.EventContentDTO import com.wire.kalium.network.api.base.authenticated.client.ClientApi import com.wire.kalium.network.api.base.authenticated.message.MLSMessageApi -import com.wire.kalium.network.api.authenticated.notification.EventContentDTO import com.wire.kalium.network.exceptions.KaliumException import com.wire.kalium.network.exceptions.isMlsClientMismatch import com.wire.kalium.network.exceptions.isMlsCommitMissingReferences diff --git a/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt b/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt index d4e7eca113f..02face9132e 100644 --- a/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt +++ b/logic/src/commonTest/kotlin/com/wire/kalium/logic/data/conversation/MLSConversationRepositoryTest.kt @@ -99,7 +99,6 @@ import io.mockative.matches import io.mockative.mock import io.mockative.once import io.mockative.twice -import io.mockative.verify import kotlinx.coroutines.async import kotlinx.coroutines.flow.MutableSharedFlow import kotlinx.coroutines.flow.first @@ -304,13 +303,15 @@ class MLSConversationRepositoryTest { coVerify { arrangement.mlsClient.createConversation( groupId = eq(Arrangement.RAW_GROUP_ID), - externalSenders = any()) + externalSenders = any() + ) }.wasInvoked(once) coVerify { arrangement.mlsClient.addMember( groupId = eq(Arrangement.RAW_GROUP_ID), - membersKeyPackages = any()) + membersKeyPackages = any() + ) }.wasInvoked(once) coVerify { @@ -1925,10 +1926,10 @@ class MLSConversationRepositoryTest { "user_handle", "wire.com" ), - "User Test", - "domain.com", - "certificate", - serialNumber = "serialNumber", + "User Test", + "domain.com", + "certificate", + serialNumber = "serialNumber", notAfter = 1899105093, notBefore = 1899205093 )