From 79658b3d8dd386b95a0ba83ff9ac1f324071004d Mon Sep 17 00:00:00 2001 From: Evgeny Poberezkin <2769109+epoberezkin@users.noreply.github.com> Date: Thu, 6 Jan 2022 16:03:45 +0000 Subject: [PATCH] update simplexmq to 0.5.2, update resolver (#175) * groups when in status invited - list as invitations on /gs * don't list on start * test * refactor * getUserGroupDetails * update simplexmq to 0.5.2, update resolver Co-authored-by: Efim Poberezkin <8711996+efim-poberezkin@users.noreply.github.com> --- .github/changelog_conf.json | 4 ++-- .github/workflows/build.yml | 2 +- package.yaml | 8 ++++---- simplex-chat.cabal | 24 ++++++++++++------------ stack.yaml | 6 ++---- tests/ChatClient.hs | 1 + 6 files changed, 22 insertions(+), 23 deletions(-) diff --git a/.github/changelog_conf.json b/.github/changelog_conf.json index e4c7eab9b1..9074987efa 100644 --- a/.github/changelog_conf.json +++ b/.github/changelog_conf.json @@ -1,4 +1,4 @@ { - "template": "${{UNCATEGORIZED}}", - "pr_template": "- ${{TITLE}}\n" + "template": "Commits:\n${{UNCATEGORIZED}}", + "pr_template": "- ${{TITLE}}" } diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index e1ec517d74..3ab917a6db 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -75,7 +75,7 @@ jobs: - name: Setup Stack uses: haskell/actions/setup@v1 with: - ghc-version: '8.8.4' + ghc-version: '8.10.7' enable-stack: true stack-version: 'latest' diff --git a/package.yaml b/package.yaml index f85cacd535..afc5d71148 100644 --- a/package.yaml +++ b/package.yaml @@ -13,7 +13,7 @@ extra-source-files: dependencies: - aeson == 1.5.* - - ansi-terminal == 0.10.* + - ansi-terminal >= 0.10 && < 0.12.0 - attoparsec == 0.13.* - base >= 4.7 && < 5 - base64-bytestring >= 1.0 && < 1.3 @@ -23,13 +23,13 @@ dependencies: - cryptonite >= 0.27 && < 0.30 - directory == 1.3.* - exceptions == 0.10.* - - file-embed == 0.0.14.* + - file-embed >= 0.0.14 && < 0.0.16 - filepath == 1.4.* - mtl == 2.2.* - - optparse-applicative == 0.15.* + - optparse-applicative >= 0.15 && < 0.17 - process == 1.6.* - simple-logger == 0.1.* - - simplexmq == 0.5.* + - simplexmq >= 0.5.2 && < 0.6 - sqlite-simple == 0.4.* - stm == 2.5.* - terminal == 0.2.* diff --git a/simplex-chat.cabal b/simplex-chat.cabal index d38a81e7b7..a1e78a15ea 100644 --- a/simplex-chat.cabal +++ b/simplex-chat.cabal @@ -40,7 +40,7 @@ library ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns build-depends: aeson ==1.5.* - , ansi-terminal ==0.10.* + , ansi-terminal >=0.10 && <0.12.0 , attoparsec ==0.13.* , base >=4.7 && <5 , base64-bytestring >=1.0 && <1.3 @@ -50,13 +50,13 @@ library , cryptonite >=0.27 && <0.30 , directory ==1.3.* , exceptions ==0.10.* - , file-embed ==0.0.14.* + , file-embed >=0.0.14 && <0.0.16 , filepath ==1.4.* , mtl ==2.2.* - , optparse-applicative ==0.15.* + , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , simple-logger ==0.1.* - , simplexmq ==0.5.* + , simplexmq >=0.5.2 && <0.6 , sqlite-simple ==0.4.* , stm ==2.5.* , terminal ==0.2.* @@ -75,7 +75,7 @@ executable simplex-chat ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns -threaded build-depends: aeson ==1.5.* - , ansi-terminal ==0.10.* + , ansi-terminal >=0.10 && <0.12.0 , attoparsec ==0.13.* , base >=4.7 && <5 , base64-bytestring >=1.0 && <1.3 @@ -85,14 +85,14 @@ executable simplex-chat , cryptonite >=0.27 && <0.30 , directory ==1.3.* , exceptions ==0.10.* - , file-embed ==0.0.14.* + , file-embed >=0.0.14 && <0.0.16 , filepath ==1.4.* , mtl ==2.2.* - , optparse-applicative ==0.15.* + , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , simple-logger ==0.1.* , simplex-chat - , simplexmq ==0.5.* + , simplexmq >=0.5.2 && <0.6 , sqlite-simple ==0.4.* , stm ==2.5.* , terminal ==0.2.* @@ -116,7 +116,7 @@ test-suite simplex-chat-test ghc-options: -Wall -Wcompat -Werror=incomplete-patterns -Wredundant-constraints -Wincomplete-record-updates -Wincomplete-uni-patterns -Wunused-type-patterns build-depends: aeson ==1.5.* - , ansi-terminal ==0.10.* + , ansi-terminal >=0.10 && <0.12.0 , async ==2.2.* , attoparsec ==0.13.* , base >=4.7 && <5 @@ -127,16 +127,16 @@ test-suite simplex-chat-test , cryptonite >=0.27 && <0.30 , directory ==1.3.* , exceptions ==0.10.* - , file-embed ==0.0.14.* + , file-embed >=0.0.14 && <0.0.16 , filepath ==1.4.* , hspec ==2.7.* , mtl ==2.2.* , network ==3.1.* - , optparse-applicative ==0.15.* + , optparse-applicative >=0.15 && <0.17 , process ==1.6.* , simple-logger ==0.1.* , simplex-chat - , simplexmq ==0.5.* + , simplexmq >=0.5.2 && <0.6 , sqlite-simple ==0.4.* , stm ==2.5.* , terminal ==0.2.* diff --git a/stack.yaml b/stack.yaml index 027d032048..36cc708824 100644 --- a/stack.yaml +++ b/stack.yaml @@ -17,7 +17,7 @@ # # resolver: ./custom-snapshot.yaml # resolver: https://example.com/snapshots/2018-01-01.yaml -resolver: lts-17.12 +resolver: lts-18.21 # User packages to be built. # Various formats can be used as shown in the example below. @@ -36,11 +36,9 @@ packages: # extra-deps: - cryptostore-0.2.1.0@sha256:9896e2984f36a1c8790f057fd5ce3da4cbcaf8aa73eb2d9277916886978c5b19,3881 - - direct-sqlite-2.3.26@sha256:04e835402f1508abca383182023e4e2b9b86297b8533afbd4e57d1a5652e0c23,3718 - simple-logger-0.1.0@sha256:be8ede4bd251a9cac776533bae7fb643369ebd826eb948a9a18df1a8dd252ff8,1079 - - sqlite-simple-0.4.18.0@sha256:3ceea56375c0a3590c814e411a4eb86943f8d31b93b110ca159c90689b6b39e5,3002 - terminal-0.2.0.0@sha256:de6770ecaae3197c66ac1f0db5a80cf5a5b1d3b64a66a05b50f442de5ad39570,2977 - - simplexmq-0.5.0@sha256:3d9b84d986df7409839c19455a376722837d52a646cb5d136037cadd0b5a4b76,7828 + - simplexmq-0.5.2@sha256:3544e479f353c1bbc6aa9405ef6976b78364f437d8af9cc45b9e0b228429e240,7884 # - ../simplexmq # - github: simplex-chat/simplexmq # commit: f15067cf6891bda3216c6cf6d2e3ecdba9b7269e diff --git a/tests/ChatClient.hs b/tests/ChatClient.hs index ded8b68bb4..c268ddbc32 100644 --- a/tests/ChatClient.hs +++ b/tests/ChatClient.hs @@ -145,6 +145,7 @@ serverCfg = ServerConfig { transports = [(serverPort, transport @TCP)], tbqSize = 1, + serverTbqSize = 1, msgQueueQuota = 4, queueIdBytes = 12, msgIdBytes = 6,