test: pull forwardToDeviceMessage out to helper.ts

This is a useful helper for other tests.

Author: richvdh

tests/device.test.js

@@ -26,7 +26,7 @@ const {
     QrCode,
     QrCodeScan,
 } = require("@matrix-org/matrix-sdk-crypto-wasm");
-const { zip, addMachineToMachine } = require("./helper");
+const { zip, addMachineToMachine, forwardToDeviceMessage } = require("./helper");
 const { VerificationRequestPhase, QrState } = require("@matrix-org/matrix-sdk-crypto-wasm");
 
 // Uncomment to enable debug logging for tests
@@ -1122,36 +1122,3 @@ describe("VerificationMethod", () => {
         expect(VerificationMethod.ReciprocateV1).toStrictEqual(3);
     });
 });
-
-/**
- * Forward an outgoing to-device message returned by one OlmMachine into another OlmMachine.
- */
-async function forwardToDeviceMessage(sendingUser, recipientMachine, outgoingVerificationRequest) {
-    expect(outgoingVerificationRequest).toBeInstanceOf(ToDeviceRequest);
-    await sendToDeviceMessageIntoMachine(
-        sendingUser,
-        outgoingVerificationRequest.event_type,
-        JSON.parse(outgoingVerificationRequest.body).messages[recipientMachine.userId.toString()][
-            recipientMachine.deviceId.toString()
-        ],
-        recipientMachine,
-    );
-}
-
-/**
- * Send a to-device message into an OlmMachine.
- */
-async function sendToDeviceMessageIntoMachine(sendingUser, eventType, content, recipientMachine) {
-    await recipientMachine.receiveSyncChanges(
-        JSON.stringify([
-            {
-                sender: sendingUser.toString(),
-                type: eventType,
-                content: content,
-            },
-        ]),
-        new DeviceLists(),
-        new Map(),
-        undefined,
-    );
-}

tests/helper.ts

@@ -19,7 +19,9 @@ import {
     RequestType,
     KeysUploadRequest,
     KeysQueryRequest,
+    ToDeviceRequest,
     OlmMachine,
+    UserId,
 } from "@matrix-org/matrix-sdk-crypto-wasm";
 
 export function* zip(...arrays: Array<Array<any>>): Generator<any> {
@@ -112,3 +114,45 @@ export async function addMachineToMachine(machineToAdd: OlmMachine, machine: Olm
         expect(marked).toStrictEqual(true);
     }
 }
+
+/**
+ * Forward an outgoing to-device message returned by one OlmMachine into another OlmMachine.
+ */
+export async function forwardToDeviceMessage(
+    sendingUser: UserId,
+    recipientMachine: OlmMachine,
+    toDeviceRequest: ToDeviceRequest,
+): Promise<void> {
+    expect(toDeviceRequest).toBeInstanceOf(ToDeviceRequest);
+    await sendToDeviceMessageIntoMachine(
+        sendingUser,
+        toDeviceRequest.event_type,
+        JSON.parse(toDeviceRequest.body).messages[recipientMachine.userId.toString()][
+            recipientMachine.deviceId.toString()
+        ],
+        recipientMachine,
+    );
+}
+
+/**
+ * Send a to-device message into an OlmMachine.
+ */
+export async function sendToDeviceMessageIntoMachine(
+    sendingUser: UserId,
+    eventType: string,
+    content: object,
+    recipientMachine: OlmMachine,
+): Promise<void> {
+    await recipientMachine.receiveSyncChanges(
+        JSON.stringify([
+            {
+                sender: sendingUser.toString(),
+                type: eventType,
+                content: content,
+            },
+        ]),
+        new DeviceLists(),
+        new Map(),
+        undefined,
+    );
+}