Wait for workers deploy

jest.config.js

@@ -18,6 +18,7 @@
 export default {
   testEnvironment: "node",
   testTimeout: 1000 * 60 * 10, // 10 minutes in milliseconds
+  bail: true,
   projects: [
     {
       // Uses the serial runner for integration test files

src/aqua/main.aqua

@@ -8,7 +8,7 @@ use "hosts.aqua"
 import "services.aqua"
 
 -- IMPORTANT: Add exports for all functions that you want to run
-export helloWorld, helloWorldRemote, getInfo, getInfos
+export showSubnet, helloWorld, helloWorldRemote, getInfo, getInfos
 
 -- DOCUMENTATION:
 -- https://fluence.dev

test/fRPC.integration-test.ts

@@ -17,7 +17,13 @@
 import { multiaddr } from "@multiformats/multiaddr";
 
 import { FLUENCE_CHAIN_PRIVATE_KEY, FLUENCE_ENV, RPC_PROVIDERS } from "./env";
-import { startGateway, fluence, backupFile, randomElement } from "./utils";
+import {
+  startGateway,
+  fluence,
+  subnet,
+  backupFile,
+  randomElement,
+} from "./utils";
 import { updateConfig } from "./config";
 
 function throwError(msg: string): never {
@@ -41,6 +47,7 @@ async function testGateway(mode?: string, times = 6) {
         id,
       };
       const response = await gateway.request(request);
+      console.log(response);
       expect(response).toMatchObject({
         jsonrpc: "2.0",
         id,
@@ -154,14 +161,34 @@ describe("fRPC", () => {
       // Remove previous deployment info
       await backupFile(".fluence/workers.yaml");
 
-      const [stdout, _] = await fluenceKeyEnv("deal", "deploy");
+      const [stdout, stderr] = await fluenceKeyEnv("deal", "deploy");
 
       expect(stdout.includes("Success!")).toBeTruthy();
 
-      // Wait until workers are deployed
-      // TODO: Make this gracefully,
-      //       call aqua subnet resolution
-      await new Promise((resolve) => setTimeout(resolve, 10000));
+      const workersMatch = stderr.match(/(\d+)\s*workers/);
+      const workers =
+        workersMatch?.[1] ?? throwError("Failed to parse workers");
+      const workersNum = parseInt(workers);
+
+      expect(workersNum).toBeGreaterThanOrEqual(3);
+
+      /**
+       * Wait for workers to deploy
+       */
+      const DEPLOY_TIMEOUT = 60_000;
+      const deadline = Date.now() + DEPLOY_TIMEOUT;
+      for (;;) {
+        const workers = await subnet(FLUENCE_ENV);
+        const deployed = workers.filter((w) => w.worker_id !== undefined);
+        if (deployed.length === workersNum) {
+          break;
+        }
+        if (Date.now() > deadline) {
+          throw new Error(
+            `Deployment timeout: ${workersNum} workers expected, ${deployed.length} deployed`,
+          );
+        }
+      }
     });
 
     ["random", "round-robin", "quorum"].forEach((mode) => {

test/utils.ts

@@ -49,6 +49,30 @@ export async function fluence(...args: string[]): Promise<[string, string]> {
   return execute("fluence", ...args, "--no-input");
 }
 
+interface Worker {
+  host_id: string;
+  worker_id: string | undefined;
+}
+
+/**
+ * Run `showSubnet` function and return workers
+ * @param env Fluence environment
+ * @returns Subnet workers
+ */
+export async function subnet(env: string): Promise<Worker[]> {
+  const [stdout, _] = await fluence(
+    "run",
+    "-f",
+    "showSubnet()",
+    "-i",
+    "src/aqua/main.aqua",
+    "--env",
+    env,
+  );
+
+  return JSON.parse(stdout);
+}
+
 export class Gateway {
   private stdout: string = "";