Skip to content

Commit 6f092e9

Browse files
authored
Fix content type used when testing MLS commit bundles (#2795)
* Fix content type used when testing MLS commit bundles * shellcheck .cabal file * Must not forget to regen derivations
1 parent cfd288c commit 6f092e9

File tree

3 files changed

+11
-7
lines changed

3 files changed

+11
-7
lines changed

libs/polysemy-wire-zoo/default.nix

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# This file is generated by running hack/bin/generate-local-nix-packages.sh and
33
# must be regenerated whenever local packages are added or removed, or
44
# dependencies are added or removed.
5-
{ mkDerivation, base, cassandra-util, gitignoreSource, HsOpenSSL
6-
, hspec, imports, lib, polysemy, polysemy-check, polysemy-plugin
7-
, QuickCheck, saml2-web-sso, time, tinylog, types-common, unliftio
8-
, uuid, wire-api
5+
{ mkDerivation, base, cassandra-util, containers, gitignoreSource
6+
, HsOpenSSL, hspec, hspec-discover, imports, lib, polysemy
7+
, polysemy-check, polysemy-plugin, QuickCheck, saml2-web-sso, time
8+
, tinylog, types-common, unliftio, uuid, wire-api
99
}:
1010
mkDerivation {
1111
pname = "polysemy-wire-zoo";
@@ -16,6 +16,11 @@ mkDerivation {
1616
polysemy-plugin QuickCheck saml2-web-sso time tinylog types-common
1717
unliftio uuid wire-api
1818
];
19+
testHaskellDepends = [
20+
base containers hspec imports polysemy polysemy-check
21+
polysemy-plugin unliftio
22+
];
23+
testToolDepends = [ hspec-discover ];
1924
description = "Polysemy interface for various libraries";
2025
license = lib.licenses.agpl3Only;
2126
}

libs/polysemy-wire-zoo/polysemy-wire-zoo.cabal

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,6 @@ library
9696

9797
default-language: Haskell2010
9898

99-
10099
test-suite spec
101100
type: exitcode-stdio-1.0
102101
main-is: Spec.hs
@@ -158,7 +157,7 @@ test-suite spec
158157
, hspec
159158
, imports
160159
, polysemy
161-
, polysemy-check >=0.9
160+
, polysemy-check >=0.9
162161
, polysemy-plugin
163162
, polysemy-wire-zoo
164163
, unliftio

services/galley/test/integration/API/MLS/Util.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ postCommitBundle sender bundle = do
136136
( galley . paths ["mls", "commit-bundles"]
137137
. zUser sender
138138
. zConn "conn"
139-
. content "application/vnd.wire.commit-bundle"
139+
. content "application/x-protobuf"
140140
. bytes bundle
141141
)
142142

0 commit comments

Comments
 (0)