blade/simplex-chat
1
0
Fork 0
mirror of https://github.com/simplex-chat/simplex-chat.git synced 2024-12-17 17:20:21 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix race in test

Browse Source
This commit is contained in:
Alexander Bondarenko
2024-05-29 21:41:21 +03:00
parent 4d2452b03f
commit 73bd003984
4 changed files with 7 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Simplex/Chat.hs
+6 -4
View File
@@ -3384,8 +3384,9 @@ subscribeUserConnections vr onlyNeeded user = do
getContactConns = do
ctConns <- withStore_ getUserContactConnIds
ctConns' <- mapMaybe contactConnId . filter contactActive <$> withStore_ (`getUserContacts` vr)
unless (S.fromList ctConns == S.fromList ctConns') $
unless (S.fromList ctConns == S.fromList ctConns') $ do
logError $ "getContactConns differ: " <> tshow (ctConns, ctConns')
fail "abandon ship!"
pure ctConns -- (map fst cts', M.fromList cts')
getUserContactLinkConns :: CM ([ConnId], Map ConnId UserContact)
getUserContactLinkConns = do
@@ -3397,10 +3398,11 @@ subscribeUserConnections vr onlyNeeded user = do
gs <- withStore_ (`getUserGroupMemberConnIds` vr)
let mConns = S.fromList (concatMap snd gs)
gs' <- withStore_ (`getUserGroups` vr)
let mPairs = concatMap (\(Group _ ms) -> mapMaybe memberConnId (filter (not . memberRemoved) ms)) gs'
let mConns' = S.fromList mPairs
unless (mConns == mConns') $
let mPairs = concatMap (\(Group _ ms) -> mapMaybe (\m -> (,m) <$> memberConnId m) (filter (not . memberRemoved) ms)) gs'
let mConns' = S.fromList (map fst mPairs)
unless (mConns == mConns') $ do
logError $ "getGroupMemberConns differ: " <> tshow (mConns, mConns')
fail "abandon ship!"
pure (gs, concatMap snd gs)
getSndFileTransferConns :: CM ([ConnId], Map ConnId SndFileTransfer)
getSndFileTransferConns = do