Reuse matrix helpers from @eng-automation/testing

package.json

@@ -71,6 +71,7 @@
   },
   "devDependencies": {
     "@eng-automation/js-style": "^2.3.0",
+    "@eng-automation/testing": "^1.3.0",
     "@types/body-parser": "^1.19.2",
     "@types/express": "^4.17.13",
     "@types/jest": "^29.4.0",

src/config.ts

@@ -6,10 +6,10 @@ import { logger } from "./logger";
 export type SpecType<T> = T extends { type: "string" }
   ? string
   : T extends { type: "number" }
-  ? number
-  : T extends { type: "boolean" }
-  ? boolean
-  : never;
+    ? number
+    : T extends { type: "boolean" }
+      ? boolean
+      : never;
 
 function resolveConfig(): ConfigObject {
   const specs = ConfigManager.loadSpecsFromYaml(`env.faucet.config.json`);

src/faucet.e2e.ts

@@ -1,4 +1,5 @@
 import { until, validatedFetch } from "@eng-automation/js";
+import { matrixHelpers } from "@eng-automation/testing";
 import { e2e_parachain, e2e_relaychain } from "@polkadot-api/descriptors";
 import crypto from "crypto";
 import Joi from "joi";
@@ -10,12 +11,13 @@ import { Repository } from "typeorm";
 import { Drip } from "src/db/entity/Drip";
 import { drip } from "src/test/webhookHelpers";
 
-import { getLatestMessage, postMessage } from "./test/matrixHelpers";
 import { destroyDataSource, E2ESetup, getDataSource, setup, teardown } from "./test/setupE2E";
 
 const randomAddress = () => AccountId().dec(crypto.randomBytes(32));
 const sha256 = (x: string) => crypto.createHash("sha256").update(x, "utf8").digest("hex");
 
+const { getLatestMessage, postMessage } = matrixHelpers;
+
 describe("Faucet E2E", () => {
   const PARACHAIN_ID = 1000; // From the zombienet config.
   let roomId: string;

src/test/setupE2E.ts

@@ -7,14 +7,16 @@ import {
 import path from "path";
 import { promises as fs } from "fs";
 import { exec } from "child_process";
-import { createRoom, getAccessToken, inviteUser, joinRoom } from "./matrixHelpers";
+import { matrixHelpers } from "@eng-automation/testing";
 import { Readable } from "stream";
 import { DataSource } from "typeorm";
 import { Drip } from "src/db/entity/Drip";
 import { migrations } from "src/db/migration/migrations";
 import { PostgresConnectionOptions } from "typeorm/driver/postgres/PostgresConnectionOptions";
 import { DEV_PHRASE } from "@polkadot-labs/hdkd-helpers";
 
+const { createRoom, getAccessToken, inviteUser, joinRoom } = matrixHelpers
+
 export type E2ESetup = {
   matrixContainer: StartedTestContainer;
   dbContainer: StartedTestContainer;