diff --git a/integration/test/MLS/Util.hs b/integration/test/MLS/Util.hs index e70fa74d259..2824b292035 100644 --- a/integration/test/MLS/Util.hs +++ b/integration/test/MLS/Util.hs @@ -588,7 +588,10 @@ consumingMessages mlsProtocol mp = Codensity $ \k -> do Set.difference (Set.map (.user) newClients) (Set.map (.user) oldClients) - withWebSockets (map fst clients) $ \wss -> do + let userClients = map ((\ci -> (ci.user, ci.client)) . fst) clients + + -- withEventWebSockets userClients + withwebsockets (map fst clients) $ \wss -> do r <- k () -- if the conversation is actually MLS (and not mixed), pick one client for diff --git a/integration/test/Performance/BigConversation.hs b/integration/test/Performance/BigConversation.hs index 8c67daf6242..ade01e9546a 100644 --- a/integration/test/Performance/BigConversation.hs +++ b/integration/test/Performance/BigConversation.hs @@ -38,17 +38,19 @@ batchForSize :: ConversationSize -> Word batchForSize Tiny = 10 batchForSize Small = 20 batchForSize Medium = 100 -batchForSize Big = 100 -batchForSize Large = 250 +batchForSize Big = 250 +batchForSize Large = 500 batchForSize VeryLarge = 500 -testCreateBigMLSConversation :: ConversationSize -> App () -testCreateBigMLSConversation convSize = do - let teamSize = sizeToNumber convSize - let batchSize = fromIntegral . batchForSize $ convSize +testCreateBigMLSConversation :: App () +testCreateBigMLSConversation = withModifiedBackend def \domain -> do + let teamSize = 200 + let batchSize = 50 + putStrLn $ "Creating a team with " <> show teamSize <> " members" + (_, ownerClient, _, members, _) <- createTeamAndClients teamSize + putStrLn $ "Creating a conversation with " <> show teamSize <> " members in batches of " <> show batchSize totalTime <- - fmap snd $ timeIt do - (_, ownerClient, _, members, _) <- createTeamAndClients . fromIntegral $ teamSize + snd <$> timeIt do convId <- createNewGroup def ownerClient let memberChunks = chunksOf batchSize members for_ memberChunks $ \chunk -> do @@ -87,7 +89,8 @@ createTeamAndClients teamSize = do { clientArgs = def { prekeys = Just [firstPrekey], - lastPrekey = Just lastPrekey + lastPrekey = Just lastPrekey, + acapabilities = Just ["consumable-notifications"] } } createMLSClient def mlsClientOpts user diff --git a/integration/test/Test/Events.hs b/integration/test/Test/Events.hs index 29f6fd4f945..bf78d9eb3ef 100644 --- a/integration/test/Test/Events.hs +++ b/integration/test/Test/Events.hs @@ -307,7 +307,12 @@ testTransientEvents = do ---------------------------------------------------------------------- -- helpers -withEventsWebSockets :: forall uid a. (HasCallStack, MakesValue uid) => [(uid, String)] -> ([(TChan Value, TChan Value)] -> App a) -> App a +withEventsWebSockets :: + forall uid a. + (HasCallStack, MakesValue uid) => + [(uid, String)] -> + ([(TChan Value, TChan Value)] -> App a) -> + App a withEventsWebSockets userClients k = go [] $ reverse userClients where go :: [(TChan Value, TChan Value)] -> [(uid, String)] -> App a