core: use version from config, add tests (#3588)

* core: use version from config, add tests

* comment

* refactor

tests/ChatClient.hs

@@ -128,16 +128,43 @@ testCfg =
       xftpFileConfig = Nothing
     }
 
+testAgentCfgVPrev :: AgentConfig
+testAgentCfgVPrev =
+  testAgentCfg
+    { smpAgentVRange = prevRange $ smpAgentVRange testAgentCfg,
+      smpClientVRange = prevRange $ smpClientVRange testAgentCfg,
+      e2eEncryptVRange = prevRange $ e2eEncryptVRange testAgentCfg,
+      smpCfg = (smpCfg testAgentCfg) {serverVRange = prevRange $ serverVRange $ smpCfg testAgentCfg}
+    }
+
 testAgentCfgV1 :: AgentConfig
 testAgentCfgV1 =
   testAgentCfg
-    { smpClientVRange = mkVersionRange 1 1,
-      smpAgentVRange = mkVersionRange 1 1,
-      smpCfg = (smpCfg testAgentCfg) {serverVRange = mkVersionRange 1 1}
+    { smpClientVRange = v1Range,
+      smpAgentVRange = v1Range,
+      e2eEncryptVRange = v1Range,
+      smpCfg = (smpCfg testAgentCfg) {serverVRange = v1Range}
+    }
+
+testCfgVPrev :: ChatConfig
+testCfgVPrev =
+  testCfg
+    { chatVRange = prevRange $ chatVRange testCfg,
+      agentConfig = testAgentCfgVPrev
     }
 
 testCfgV1 :: ChatConfig
-testCfgV1 = testCfg {agentConfig = testAgentCfgV1}
+testCfgV1 =
+  testCfg
+    { chatVRange = v1Range,
+      agentConfig = testAgentCfgV1
+    }
+
+prevRange :: VersionRange -> VersionRange
+prevRange vr = vr {maxVersion = maxVersion vr - 1}
+
+v1Range :: VersionRange
+v1Range = mkVersionRange 1 1
 
 testCfgCreateGroupDirect :: ChatConfig
 testCfgCreateGroupDirect =

tests/ChatTests/Groups.hs

@@ -24,8 +24,9 @@ import Test.Hspec
 chatGroupTests :: SpecWith FilePath
 chatGroupTests = do
   describe "chat groups" $ do
-    it "add contacts, create group and send/receive messages" testGroup
-    it "add contacts, create group and send/receive messages, check messages" testGroupCheckMessages
+    describe "add contacts, create group and send/receive messages" testGroupMatrix
+    it "v1: add contacts, create group and send/receive messages" testGroup
+    it "v1: add contacts, create group and send/receive messages, check messages" testGroupCheckMessages
     it "create group with incognito membership" testNewGroupIncognito
     it "create and join group with 4 members" testGroup2
     it "create and delete group" testGroupDelete
@@ -146,15 +147,19 @@ chatGroupTests = do
 testGroup :: HasCallStack => FilePath -> IO ()
 testGroup =
   testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
-    \alice bob cath -> testGroupShared alice bob cath False
+    \alice bob cath -> testGroupShared alice bob cath False True
 
 testGroupCheckMessages :: HasCallStack => FilePath -> IO ()
 testGroupCheckMessages =
   testChatCfg3 testCfgCreateGroupDirect aliceProfile bobProfile cathProfile $
-    \alice bob cath -> testGroupShared alice bob cath True
+    \alice bob cath -> testGroupShared alice bob cath True True
 
-testGroupShared :: HasCallStack => TestCC -> TestCC -> TestCC -> Bool -> IO ()
-testGroupShared alice bob cath checkMessages = do
+testGroupMatrix :: SpecWith FilePath
+testGroupMatrix =
+  versionTestMatrix3 $ \alice bob cath -> testGroupShared alice bob cath False False
+
+testGroupShared :: HasCallStack => TestCC -> TestCC -> TestCC -> Bool -> Bool -> IO ()
+testGroupShared alice bob cath checkMessages directConnections = do
   connectUsers alice bob
   connectUsers alice cath
   alice ##> "/g team"
@@ -206,7 +211,8 @@ testGroupShared alice bob cath checkMessages = do
     (alice <# "#team cath> hey team")
     (bob <# "#team cath> hey team")
   msgItem2 <- lastItemId alice
-  bob <##> cath
+  when directConnections $
+    bob <##> cath
   when checkMessages $ getReadChats msgItem1 msgItem2
   -- list groups
   alice ##> "/gs"
@@ -263,17 +269,34 @@ testGroupShared alice bob cath checkMessages = do
     (cath </)
   cath ##> "#team hello"
   cath <## "you are no longer a member of the group"
-  bob <##> cath
+  when directConnections $
+    bob <##> cath
   -- delete contact
   alice ##> "/d bob"
   alice <## "bob: contact is deleted"
   bob <## "alice (Alice) deleted contact with you"
   alice `send` "@bob hey"
-  alice
-    <### [ "@bob hey",
-           "member #team bob does not have direct connection, creating",
-           "peer chat protocol version range incompatible"
-         ]
+  if directConnections
+    then
+      alice
+        <### [ "@bob hey",
+               "member #team bob does not have direct connection, creating",
+               "peer chat protocol version range incompatible"
+             ]
+    else do
+      alice
+        <### [ WithTime "@bob hey",
+               "member #team bob does not have direct connection, creating",
+               "contact for member #team bob is created",
+               "sent invitation to connect directly to member #team bob",
+               "bob (Bob): contact is connected"
+             ]
+      bob
+        <### [ "#team alice is creating direct contact alice with you",
+               WithTime "alice> hey",
+               "alice: security code changed",
+               "alice (Alice): contact is connected"
+             ]
   when checkMessages $ threadDelay 1000000
   alice #> "#team checking connection"
   bob <# "#team alice> checking connection"

tests/ChatTests/Utils.hs

@@ -69,20 +69,22 @@ ifCI xrun run d t = do
 
 versionTestMatrix2 :: (HasCallStack => TestCC -> TestCC -> IO ()) -> SpecWith FilePath
 versionTestMatrix2 runTest = do
-  it "v2" $ testChat2 aliceProfile bobProfile runTest
+  it "current" $ testChat2 aliceProfile bobProfile runTest
+  it "prev" $ testChatCfg2 testCfgVPrev aliceProfile bobProfile runTest
+  it "prev to curr" $ runTestCfg2 testCfg testCfgVPrev runTest
+  it "curr to prev" $ runTestCfg2 testCfgVPrev testCfg runTest
   it "v1" $ testChatCfg2 testCfgV1 aliceProfile bobProfile runTest
   it "v1 to v2" $ runTestCfg2 testCfg testCfgV1 runTest
   it "v2 to v1" $ runTestCfg2 testCfgV1 testCfg runTest
 
--- versionTestMatrix3 :: (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> SpecWith FilePath
--- versionTestMatrix3 runTest = do
---   it "v2" $ testChat3 aliceProfile bobProfile cathProfile runTest
-
--- it "v1" $ testChatCfg3 testCfgV1 aliceProfile bobProfile cathProfile runTest
--- it "v1 to v2" $ runTestCfg3 testCfg testCfgV1 testCfgV1 runTest
--- it "v2+v1 to v2" $ runTestCfg3 testCfg testCfg testCfgV1 runTest
--- it "v2 to v1" $ runTestCfg3 testCfgV1 testCfg testCfg runTest
--- it "v2+v1 to v1" $ runTestCfg3 testCfgV1 testCfg testCfgV1 runTest
+versionTestMatrix3 :: (HasCallStack => TestCC -> TestCC -> TestCC -> IO ()) -> SpecWith FilePath
+versionTestMatrix3 runTest = do
+  it "current" $ testChat3 aliceProfile bobProfile cathProfile runTest
+  it "prev" $ testChatCfg3 testCfgVPrev aliceProfile bobProfile cathProfile runTest
+  it "prev to curr" $ runTestCfg3 testCfg testCfgVPrev testCfgVPrev runTest
+  it "curr+prev to curr" $ runTestCfg3 testCfg testCfg testCfgVPrev runTest
+  it "curr to prev" $ runTestCfg3 testCfgVPrev testCfg testCfg runTest
+  it "curr+prev to prev" $ runTestCfg3 testCfgVPrev testCfg testCfgVPrev runTest
 
 inlineCfg :: Integer -> ChatConfig
 inlineCfg n = testCfg {inlineFiles = defaultInlineFilesConfig {sendChunks = 0, offerChunks = n, receiveChunks = n}}