Clean up

wireapp · Feb 8, 2023 · 4f7a5e6 · 4f7a5e6
1 parent 839f26f
commit 4f7a5e6
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 11 deletions.
diff --git a/libs/wire-api/src/Wire/API/Conversation.hs b/libs/wire-api/src/Wire/API/Conversation.hs
@@ -235,7 +235,7 @@ instance ToSchema (Versioned 'V2 ConversationMetadata) where
           "ConversationMetadata"
           (conversationMetadataObjectSchema accessRolesSchemaV2)
 
--- | Public-facing client list
+-- | Client list for internal API.
 data ClientList = ClientList {clClients :: [ClientId]}
   deriving stock (Eq, Show, Generic)
   deriving (Arbitrary) via (GenericUniform ClientList)

diff --git a/services/galley/src/Galley/API/MLS/Removal.hs b/services/galley/src/Galley/API/MLS/Removal.hs
@@ -176,7 +176,7 @@ removeUser lc qusr = do
     let getKPs = Map.findWithDefault mempty qusr . membersConvOrSub
     removeClientsWithClientMapRecursively (qualifyAs lc mlsConv) getKPs qusr
 
--- TODO: move this or similar function into store
+-- | Convert cassandra subconv maps into SubConversations
 listSubConversations' ::
   Member SubConversationStore r =>
   ConvId ->

diff --git a/services/galley/src/Galley/API/Update.hs b/services/galley/src/Galley/API/Update.hs
@@ -1206,7 +1206,7 @@ removeMemberQualified ::
   Qualified ConvId ->
   Qualified UserId ->
   Sem r (Maybe Event)
-removeMemberQualified lusr con qcnv victim = do
+removeMemberQualified lusr con qcnv victim = 
   mapErrorS @('ActionDenied 'LeaveConversation) @('ActionDenied 'RemoveConversationMember) $
     foldQualified
       lusr

diff --git a/services/galley/test/integration/API/MLS.hs b/services/galley/test/integration/API/MLS.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -Wno-incomplete-uni-patterns -Wno-unused-matches -Wno-unused-imports #-}
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 -- This file is part of the Wire Server implementation.
 --
@@ -46,7 +46,6 @@ import Data.String.Conversions
 import qualified Data.Text as T
 import Data.Time
 import Federator.MockServer hiding (withTempMockFederator)
-import Galley.Cassandra.Conversation.MLS (lookupMLSClients)
 import Imports
 import qualified Network.Wai.Utilities.Error as Wai
 import Test.Tasty
@@ -62,11 +61,8 @@ import Wire.API.Conversation.Role
 import Wire.API.Error.Galley
 import Wire.API.Federation.API.Common
 import Wire.API.Federation.API.Galley
-import Wire.API.Internal.Notification (ntfPayload)
 import Wire.API.MLS.CipherSuite
 import Wire.API.MLS.Credential
-import Wire.API.MLS.Epoch
-import Wire.API.MLS.Group
 import Wire.API.MLS.Keys
 import Wire.API.MLS.Serialisation
 import Wire.API.MLS.SubConversation

diff --git a/services/galley/test/integration/API/MLS/Util.hs b/services/galley/test/integration/API/MLS/Util.hs
@@ -892,7 +892,7 @@ consumeWelcome welcome = do
 consumeMessage :: HasCallStack => MessagePackage -> MLSTest ()
 consumeMessage msg = do
   mems <- State.gets mlsMembers
-  for_ (Set.delete (mpSender msg) mems) $ \cid -> do
+  for_ (Set.delete (mpSender msg) mems) $ \cid ->
     consumeMessage1 cid (mpMessage msg)
 
 consumeMessage1 :: HasCallStack => ClientIdentity -> ByteString -> MLSTest ()

diff --git a/services/galley/test/integration/API/Util.hs b/services/galley/test/integration/API/Util.hs
@@ -1,4 +1,4 @@
-{-# OPTIONS_GHC -Wno-incomplete-uni-patterns -Wno-unused-matches -Wno-unused-imports #-}
+{-# OPTIONS_GHC -Wno-incomplete-uni-patterns #-}
 
 -- This file is part of the Wire Server implementation.
 --
@@ -107,7 +107,7 @@ import UnliftIO.Timeout
 import Util.Options
 import Web.Cookie
 import Wire.API.Connection
-import Wire.API.Conversation as C
+import Wire.API.Conversation
 import Wire.API.Conversation.Action
 import Wire.API.Conversation.Protocol
 import Wire.API.Conversation.Role