Fold guardComponent

wireapp · Jan 25, 2023 · 4b008d3 · 4b008d3
1 parent 88326ad
commit 4b008d3
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 6 deletions.
diff --git a/services/galley/test/integration/API/Federation.hs b/services/galley/test/integration/API/Federation.hs
@@ -838,10 +838,7 @@ sendMessage = do
   connectWithRemoteUser aliceId bob
   connectWithRemoteUser aliceId chad
   -- conversation
-  let responses1 = do
-        comp <- frComponent <$> getRequest
-        guard (comp == Brig)
-        mockReply [bobProfile, chadProfile]
+  let responses1 = guardComponent Brig *> mockReply [bobProfile, chadProfile]
   (convId, requests1) <-
     withTempMockFederator' (responses1 <|> mockReply ()) $
       fmap decodeConvId $

diff --git a/services/galley/test/integration/API/Util.hs b/services/galley/test/integration/API/Util.hs
@@ -2746,8 +2746,7 @@ checkTimeout = 3 # Second
 -- responses by Brig on the mocked side of federation.
 mockedFederatedBrigResponse :: [(Qualified UserId, Text)] -> Mock LByteString
 mockedFederatedBrigResponse users = do
-  comp <- frComponent <$> getRequest
-  guard (comp == Brig)
+  guardComponent Brig
   mockReply [mkProfile mem (Name name) | (mem, name) <- users]
 
 fedRequestsForDomain :: HasCallStack => Domain -> Component -> [FederatedRequest] -> [FederatedRequest]