diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs index 3c600b4a79..dc6b6b5431 100644 --- a/tests/ChatClient.hs +++ b/tests/ChatClient.hs @@ -58,7 +58,6 @@ import Simplex.Messaging.Agent.Store.Shared (MigrationConfig (..), MigrationConf import qualified Simplex.Messaging.Agent.Store.DB as DB import Simplex.Messaging.Client (ProtocolClientConfig (..)) import Simplex.Messaging.Client.Agent (defaultSMPClientAgentConfig) -import Simplex.Messaging.Crypto.Ratchet (supportedE2EEncryptVRange) import Simplex.Messaging.Protocol (ProtocolType (..)) import Simplex.Messaging.Server (runSMPServerBlocking) import Simplex.Messaging.Server.Env.STM (ServerConfig (..), ServerStoreCfg (..), StartOptions (..), StorePaths (..), defaultMessageExpiration, defaultIdleQueueInterval, defaultNtfExpiration, defaultInactiveClientExpiration) @@ -233,7 +232,7 @@ testAgentCfgVPrev = testAgentCfg { smpClientVRange = prevRange $ smpClientVRange testAgentCfg, smpAgentVRange = prevRange supportedSMPAgentVRange, - e2eEncryptVRange = prevRange supportedE2EEncryptVRange, + -- e2eEncryptVRange = prevRange supportedE2EEncryptVRange, smpCfg = (smpCfg testAgentCfg) {serverVRange = prevRange $ serverVRange $ smpCfg testAgentCfg} } diff --git a/tests/ChatTests/Utils.hs b/tests/ChatTests/Utils.hs index dfcf76f761..f16b3ac090 100644 --- a/tests/ChatTests/Utils.hs +++ b/tests/ChatTests/Utils.hs @@ -124,9 +124,9 @@ skip = before_ . pendingWith versionTestMatrix2 :: (HasCallStack => Bool -> Bool -> TestCC -> TestCC -> IO ()) -> SpecWith TestParams versionTestMatrix2 runTest = do it "current" $ testChat2 aliceProfile bobProfile (runTest True True) - it "prev" $ runTestCfg2 testCfgVPrev testCfgVPrev (runTest False True) - it "prev to curr" $ runTestCfg2 testCfg testCfgVPrev (runTest False True) - it "curr to prev" $ runTestCfg2 testCfgVPrev testCfg (runTest False True) + it "prev" $ runTestCfg2 testCfgVPrev testCfgVPrev (runTest True True) + it "prev to curr" $ runTestCfg2 testCfg testCfgVPrev (runTest True True) + it "curr to prev" $ runTestCfg2 testCfgVPrev testCfg (runTest True True) it "old (1st supported)" $ testChatCfg2 testCfgV1 aliceProfile bobProfile (runTest True False) it "old to curr" $ runTestCfg2 testCfg testCfgV1 (runTest True True) it "curr to old" $ runTestCfg2 testCfgV1 testCfg (runTest True False)