Merge pull request softwarefactory-project#26 from TristanCacqueray/conduit-service

Use conduit server for testing

Author: TristanCacqueray

.github/workflows/main.yml

@@ -9,7 +9,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        ghc: ['8.10']
+        ghc: ['8.10', '9.2']
     name: Haskell GHC ${{ matrix.ghc }}
     steps:
     - uses: actions/checkout@v2

README.md

@@ -43,9 +43,9 @@ Some tests requires a local matrix server, run integration service:
 
 ```ShellSession
 # In another terminal:
-$ nix develop -c dendrite-start
+$ nix develop -c conduit-start
 # Before running cabal test:
-$ export $(nix develop -c dendrite-setup)
+$ export $(nix develop -c conduit-setup)
 $ cabal test all
 ```
 

flake.lock

@@ -6,15 +6,16 @@
   nixConfig.bash-prompt = "[nix]λ ";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs";
+    nixpkgs.url =
+      "github:NixOS/nixpkgs/00d73d5385b63e868bd11282fb775f6fe4921fb5";
     flake-utils.url = "github:numtide/flake-utils";
   };
 
   outputs = { self, nixpkgs, flake-utils }:
     flake-utils.lib.eachSystem [ "x86_64-linux" ] (system:
       let
         config = { };
-        compilerVersion = "8107";
+        compilerVersion = "924";
         compiler = "ghc" + compilerVersion;
         overlays = [
           (final: prev: {
@@ -33,31 +34,44 @@
           })
         ];
         pkgs = import nixpkgs { inherit config overlays system; };
-        dendriteHome = "/tmp/dendrite-home";
+        conduitHome = "/tmp/conduit-home";
 
-        # A script to start a local matrix server with dendrite
-        dendriteStart = pkgs.writeScriptBin "dendrite-start" ''
+        conduitConfig = pkgs.writeTextFile {
+          name = "conduit.toml";
+          text = ''
+            [global]
+            server_name = "localhost"
+            database_path = "${conduitHome}"
+            database_backend = "rocksdb"
+            port = 6167
+            max_request_size = 20_000_000
+            allow_registration = true
+            allow_federation = false
+            trusted_servers = []
+            #log = "info,state_res=warn,rocket=off,_=off,sled=off"
+            address = "127.0.0.1"
+          '';
+        };
+
+        # A script to start a local matrix server with conduit
+        conduitStart = pkgs.writeScriptBin "conduit-start" ''
           #!/bin/sh -e
-          mkdir -p ${dendriteHome}
-          cd ${dendriteHome}
-          if ! test -f dendrite.yaml; then
-             ${pkgs.dendrite}/bin/generate-config > dendrite.yaml
-             sed -e 's|/var/log/dendrite|${dendriteHome}/logs|' -i dendrite.yaml
-          fi
-          if ! test -f matrix_key.pem; then
-             ${pkgs.dendrite}/bin/generate-keys -private-key matrix_key.pem -tls-cert test.crt -tls-key test.key
-          fi
-          ${pkgs.dendrite}/bin/dendrite-monolith-server
+          mkdir -p ${conduitHome}
+          exec env CONDUIT_CONFIG=${conduitConfig} ${pkgs.matrix-conduit}/bin/conduit
         '';
 
         # A script to setup test environment
-        dendriteSetup = pkgs.writeScriptBin "dendrite-setup" ''
+        conduitSetup = pkgs.writeScriptBin "conduit-setup" ''
           #!/bin/sh -e
-          cd ${dendriteHome}
-          HOMESERVER_URL=http://localhost:8008
+          HOMESERVER_URL=http://localhost:6167
+          export PATH=$PATH:${pkgs.jq}/bin:${pkgs.curl}/bin
           create_token () {
-            ${pkgs.dendrite}/bin/create-account -username $1 -password $2 || true
-            ${pkgs.curl}/bin/curl -XPOST $HOMESERVER_URL/_matrix/client/r0/login -d '{"user": "'$1'", "password": "'$2'", "type": "m.login.password"}' | ${pkgs.jq}/bin/jq -r ".access_token"
+            REGISTER_TOKEN=$(curl -XPOST $HOMESERVER_URL/_matrix/client/v3/register -d '{"auth":{"type": "m.login.dummy"}, "username": "'$1'", "password": "'$2'"}' | jq -r ".access_token")
+            if [ "$REGISTER_TOKEN" != "null" ]; then
+                echo $REGISTER_TOKEN
+            else
+                curl -XPOST $HOMESERVER_URL/_matrix/client/v3/login -d '{"type": "m.login.password", "identifier": {"type": "m.id.user", "user": "'$1'"}, "password": "'$2'"}' | jq -r ".access_token"
+            fi
           }
           echo HOMESERVER_URL=$HOMESERVER_URL
           echo PRIMARY_TOKEN=$(create_token "test-user" "test-pass")
@@ -87,8 +101,8 @@
             pkgs.haskell-language-server
             pkgs.ghcid
             testScript
-            dendriteStart
-            dendriteSetup
+            conduitStart
+            conduitSetup
           ];
 
           withHoogle = false;

flake.nix

@@ -22,7 +22,7 @@ category:            Network
 build-type:          Simple
 extra-doc-files:     CHANGELOG.md
 extra-source-files:  test/data/*.json
-tested-with:         GHC == 8.10.4
+tested-with:         GHC == 8.10.7, GHC == 9.2.4
 
 source-repository head
   type:                git

matrix-client/matrix-client.cabal

@@ -10,7 +10,7 @@
 -- > git clone https://github.com/matrix-org/dendrite
 -- > cd dendrite; ./build.sh; ./bin/generate-keys --private-key matrix_key.pem; cp dendrite-config.yaml dendrite.yaml
 -- > ./bin/dendrite-monolith-server --config dendrite.yaml
--- > curl -XPOST http://localhost:8008/_matrix/client/r0/register -d'{"username": "tristanC", "password": "supersecret", "auth": {"type": "mlogin.dummy"}}
+-- > curl -XPOST http://localhost:8008/_matrix/client/r0/register -d'{"username": "tristanC", "password": "supersecret", "auth": {"type": "m.login.dummy"}}'
 --
 -- To avoid manipulating the token directly, put it in your environment:
 --