From 27516a2af7debd4688acf3af1be88d68905bd161 Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin Date: Tue, 21 Apr 2026 22:26:21 +0100 Subject: [PATCH] core: update simplexmq 6.5.0.16 --- cabal.project | 2 +- scripts/nix/sha256map.nix | 2 +- tests/ChatClient.hs | 8 +++++--- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cabal.project b/cabal.project index e7d70bde64..557dee3951 100644 --- a/cabal.project +++ b/cabal.project @@ -21,7 +21,7 @@ constraints: zip +disable-bzip2 +disable-zstd source-repository-package type: git location: https://github.com/simplex-chat/simplexmq.git - tag: 95b17ada2795e1c5c84bbe2a50a0752ee66d0aad + tag: 858fac7f4f821a2df6fbea03a1bfbb82ea9717c5 source-repository-package type: git diff --git a/scripts/nix/sha256map.nix b/scripts/nix/sha256map.nix index 82bea05f89..9fe726a02b 100644 --- a/scripts/nix/sha256map.nix +++ b/scripts/nix/sha256map.nix @@ -1,5 +1,5 @@ { - "https://github.com/simplex-chat/simplexmq.git"."95b17ada2795e1c5c84bbe2a50a0752ee66d0aad" = "0n10vjsslay4lkhripjwgyiclsx714prwcblmnf1vgwgc97md14s"; + "https://github.com/simplex-chat/simplexmq.git"."858fac7f4f821a2df6fbea03a1bfbb82ea9717c5" = "1fhzynf80db7h6y2wv61fsdfd80f0blja9ljsfh405r11yg2yxvi"; "https://github.com/simplex-chat/hs-socks.git"."a30cc7a79a08d8108316094f8f2f82a0c5e1ac51" = "0yasvnr7g91k76mjkamvzab2kvlb1g5pspjyjn2fr6v83swjhj38"; "https://github.com/simplex-chat/direct-sqlcipher.git"."f814ee68b16a9447fbb467ccc8f29bdd3546bfd9" = "1ql13f4kfwkbaq7nygkxgw84213i0zm7c1a8hwvramayxl38dq5d"; "https://github.com/simplex-chat/sqlcipher-simple.git"."a46bd361a19376c5211f1058908fc0ae6bf42446" = "1z0r78d8f0812kxbgsm735qf6xx8lvaz27k1a0b4a2m0sshpd5gl"; diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs index ca2581eb01..714aa0c0ed 100644 --- a/tests/ChatClient.hs +++ b/tests/ChatClient.hs @@ -41,7 +41,8 @@ import Simplex.Chat.Types import Simplex.Chat.Types.Shared (GroupMemberRole (..)) import Simplex.FileTransfer.Description (kb, mb) import Simplex.FileTransfer.Server (runXFTPServerBlocking) -import Simplex.FileTransfer.Server.Env (XFTPServerConfig (..), defaultFileExpiration) +import Simplex.FileTransfer.Server.Env (XFTPServerConfig (..), XFTPStoreConfig (..), defaultFileExpiration) +import Simplex.FileTransfer.Server.Store import Simplex.FileTransfer.Transport (alpnSupportedXFTPhandshakes, supportedFileServerVRange) import Simplex.Messaging.Agent (disposeAgentClient) import Simplex.Messaging.Agent.Env.SQLite @@ -589,11 +590,12 @@ xftpTestPort = "7002" xftpServerFiles :: FilePath xftpServerFiles = "tests/tmp/xftp-server-files" -xftpServerConfig :: XFTPServerConfig +xftpServerConfig :: XFTPServerConfig STMFileStore xftpServerConfig = XFTPServerConfig { xftpPort = xftpTestPort, fileIdSize = 16, + serverStoreCfg = XSCMemory $ Just "tests/tmp/xftp-server-store.log", storeLogFile = Just "tests/tmp/xftp-server-store.log", filesPath = xftpServerFiles, fileSizeQuota = Nothing, @@ -628,7 +630,7 @@ xftpServerConfig = withXFTPServer :: IO () -> IO () withXFTPServer = withXFTPServer' xftpServerConfig -withXFTPServer' :: XFTPServerConfig -> IO () -> IO () +withXFTPServer' :: XFTPServerConfig STMFileStore -> IO () -> IO () withXFTPServer' cfg = serverBracket ( \started -> do