genlayer 0.4.0 → 0.5.1-beta.0

package/tests/actions/init.test.ts

@@ -5,6 +5,13 @@ import { initAction } from "../../src/commands/general/init";
 import { tmpdir } from "os";
 import {mkdtempSync} from "fs";
 import {join} from "path";
+import fs from "fs";
+import * as dotenv from "dotenv";
+
+
+vi.mock("fs");
+vi.mock("dotenv");
+
 
 const tempDir = mkdtempSync(join(tmpdir(), "test-initAction-"));
 const defaultActionOptions = { numValidators: 5, branch: "main", location: tempDir, headless: false, resetDb: false };
@@ -18,9 +25,7 @@ describe("init action", () => {
   let simServCheckVersionRequirements: ReturnType<any>;
   let simServResetDockerContainers: ReturnType<any>;
   let simServResetDockerImages: ReturnType<any>;
-  let simServDownloadSimulator: ReturnType<any>;
   let simServgetAiProvidersOptions: ReturnType<any>;
-  let simServConfigSimulator: ReturnType<any>;
   let simServRunSimulator: ReturnType<any>;
   let simServWaitForSimulator: ReturnType<any>;
   let simServPullOllamaModel: ReturnType<any>;
@@ -28,6 +33,7 @@ describe("init action", () => {
   let simServCreateRandomValidators: ReturnType<any>;
   let simServOpenFrontend: ReturnType<any>;
   let simGetSimulatorUrl: ReturnType<any>;
+  let simAddConfigToEnvFile: ReturnType<any>;
 
   beforeEach(() => {
     vi.clearAllMocks();
@@ -40,8 +46,6 @@ describe("init action", () => {
     simServCheckVersionRequirements = vi.spyOn(simulatorService, "checkVersionRequirements");
     simServResetDockerContainers = vi.spyOn(simulatorService, "resetDockerContainers");
     simServResetDockerImages = vi.spyOn(simulatorService, "resetDockerImages");
-    simServDownloadSimulator = vi.spyOn(simulatorService, "downloadSimulator");
-    simServConfigSimulator = vi.spyOn(simulatorService, "configSimulator");
     simServgetAiProvidersOptions = vi.spyOn(simulatorService, "getAiProvidersOptions");
     simServRunSimulator = vi.spyOn(simulatorService, "runSimulator");
     simServWaitForSimulator = vi.spyOn(simulatorService, "waitForSimulatorToBeReady");
@@ -50,6 +54,7 @@ describe("init action", () => {
     simServCreateRandomValidators = vi.spyOn(simulatorService, "createRandomValidators");
     simServOpenFrontend = vi.spyOn(simulatorService, "openFrontend");
     simGetSimulatorUrl = vi.spyOn(simulatorService, "getFrontendUrl")
+    simAddConfigToEnvFile = vi.spyOn(simulatorService, "addConfigToEnvFile")
 
     simServCheckVersionRequirements.mockResolvedValue({
       node: '',
@@ -59,22 +64,17 @@ describe("init action", () => {
       git: true,
       docker: true,
     })
+    simAddConfigToEnvFile.mockResolvedValue(true);
+    const mockEnvContent = "FRONTEND_PORT=8080";
+    const mockEnvConfig = { FRONTEND_PORT: "8080" };
+    vi.mocked(fs.readFileSync).mockReturnValue(mockEnvContent);
+    vi.mocked(dotenv.parse).mockReturnValue(mockEnvConfig);
   });
 
   afterEach(() => {
     vi.restoreAllMocks();
   });
 
-  test("if both requirements are missing, then the execution fails", async () => {
-    simServCheckInstallRequirements.mockResolvedValue({ git: false, docker: false });
-
-    await initAction(defaultActionOptions, simulatorService);
-
-    expect(error).toHaveBeenCalledWith(
-      "Git and Docker are not installed. Please install them and try again.\n"
-    );
-  });
-
   test("if only docker is missing, then the execution fails", async () => {
     simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: false });
 
@@ -83,14 +83,6 @@ describe("init action", () => {
     expect(error).toHaveBeenCalledWith("Docker is not installed. Please install Docker and try again.\n");
   });
 
-  test("if only git is missing, then the execution fails", async () => {
-    simServCheckInstallRequirements.mockResolvedValue({ git: false, docker: true });
-
-    await initAction(defaultActionOptions, simulatorService);
-
-    expect(error).toHaveBeenCalledWith("Git is not installed. Please install Git and try again.\n");
-  });
-
   test("if check install requirements fail, then the execution aborts", async () => {
     simServCheckInstallRequirements.mockRejectedValue(new Error("Error"));
 
@@ -169,7 +161,6 @@ describe("init action", () => {
       { name: "OpenAI", value: "openai" },
       { name: "Heurist", value: "heuristai" },
     ]);
-    simServConfigSimulator.mockResolvedValue(true);
     simServRunSimulator.mockResolvedValue(true);
     simServWaitForSimulator.mockResolvedValue({ initialized: true });
     simServPullOllamaModel.mockResolvedValue(true);
@@ -200,7 +191,6 @@ describe("init action", () => {
       { name: "OpenAI", value: "openai" },
       { name: "Heurist", value: "heuristai" },
     ]);
-    simServConfigSimulator.mockResolvedValue(true);
     simServRunSimulator.mockResolvedValue(true);
     simServWaitForSimulator.mockResolvedValue({ initialized: true });
     simServPullOllamaModel.mockResolvedValue(true);
@@ -230,7 +220,6 @@ describe("init action", () => {
       { name: "OpenAI", value: "openai" },
       { name: "Heurist", value: "heuristai" },
     ]);
-    simServConfigSimulator.mockResolvedValue(true);
     simServRunSimulator.mockResolvedValue(true);
     simServWaitForSimulator.mockResolvedValue({ initialized: true });
     simServPullOllamaModel.mockResolvedValue(true);
@@ -248,18 +237,6 @@ describe("init action", () => {
     expect(error).toHaveBeenCalledWith('Unable to initialize the validators.');
   });
 
-
-  test("if configSimulator fails, then the execution aborts", async () => {
-    inquirerPrompt.mockResolvedValue({ confirmReset: true, confirmDownload: true, selectedLlmProviders: [] });
-    simServConfigSimulator.mockRejectedValue(new Error("Error"));
-    simServResetDockerContainers.mockResolvedValue(true);
-    simServResetDockerImages.mockResolvedValue(true);
-
-    await initAction(defaultActionOptions, simulatorService);
-
-    expect(error).toHaveBeenCalledWith(new Error("Error"));
-  });
-
   test("if runSimulator fails, then the execution aborts", async () => {
     inquirerPrompt.mockResolvedValue({ confirmReset: true, confirmDownload: true, selectedLlmProviders: [] });
     simServRunSimulator.mockRejectedValue(new Error("Error"));
@@ -285,7 +262,7 @@ describe("init action", () => {
       { name: "Heurist", value: "heuristai" },
       { name: "Ollama", value: "ollama" },
     ]);
-    simServConfigSimulator.mockResolvedValue(true);
+
     simServRunSimulator.mockResolvedValue(true);
     simServWaitForSimulator.mockResolvedValue({ initialized: true });
     simServPullOllamaModel.mockResolvedValue(true);
@@ -308,20 +285,6 @@ describe("init action", () => {
     expect(error).toHaveBeenCalledWith(errorMsg);
   });
 
-  test("logs 'Aborted!' if confirmDownload is false", async () => {
-    inquirerPrompt
-      .mockResolvedValueOnce({ confirmReset: true })
-      .mockResolvedValueOnce({ confirmDownload: false });
-
-    simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
-    simServResetDockerContainers.mockResolvedValue(true);
-    simServResetDockerImages.mockResolvedValue(true);
-
-    await initAction(defaultActionOptions, simulatorService);
-
-    expect(log).toHaveBeenCalledWith("Aborted!");
-  });
-
   test("logs error if resetDockerContainers throws", async () => {
     inquirerPrompt.mockResolvedValue({ confirmReset: true });
     simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
@@ -334,9 +297,11 @@ describe("init action", () => {
   });
 
   test("prompts for LLM providers and validates that at least one is selected", async () => {
+    const mockEnvContent = "FRONTEND_PORT=8080";
+    vi.mocked(fs.readFileSync).mockReturnValue(mockEnvContent);
+
     inquirerPrompt
       .mockResolvedValueOnce({ confirmReset: true })
-      .mockResolvedValueOnce({ confirmDownload: true })
       .mockImplementation((questions: any) => {
         if (questions[0].type === "checkbox") {
           const validateFunction = questions[0].validate;
@@ -353,11 +318,9 @@ describe("init action", () => {
         }
       });
 
-    simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
+    simServCheckInstallRequirements.mockResolvedValue({ docker: true });
     simServResetDockerContainers.mockResolvedValue(true);
     simServResetDockerImages.mockResolvedValue(true);
-    simServDownloadSimulator.mockResolvedValue({ wasInstalled: false });
-    simServConfigSimulator.mockResolvedValue(true);
     simServRunSimulator.mockResolvedValue(true);
     simServWaitForSimulator.mockResolvedValue({ initialized: true });
     simServDeleteAllValidators.mockResolvedValue(true);
@@ -367,31 +330,16 @@ describe("init action", () => {
     await initAction(defaultActionOptions, simulatorService);
   });
 
-  test("logs error if downloadSimulator throws", async () => {
-    inquirerPrompt.mockResolvedValue({ confirmReset: true, confirmDownload: true });
-    simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
-    simServResetDockerContainers.mockResolvedValue(true);
-    simServResetDockerImages.mockResolvedValue(true);
-    const errorMsg = new Error("downloadSimulator error");
-    simServDownloadSimulator.mockRejectedValueOnce(errorMsg);
-
-    await initAction(defaultActionOptions, simulatorService);
-
-    expect(error).toHaveBeenCalledWith(errorMsg);
-  });
 
   test("logs error message if simulator fails to initialize with ERROR code", async () => {
     inquirerPrompt
       .mockResolvedValueOnce({ confirmReset: true })
-      .mockResolvedValueOnce({ confirmDownload: true })
       .mockResolvedValueOnce({ selectedLlmProviders: ["openai"] })
       .mockResolvedValueOnce({ openai: "API_KEY1" });
 
-    simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
+    simServCheckInstallRequirements.mockResolvedValue({ docker: true });
     simServResetDockerContainers.mockResolvedValue(true);
     simServResetDockerImages.mockResolvedValue(true);
-    simServDownloadSimulator.mockResolvedValue({ wasInstalled: false });
-    simServConfigSimulator.mockResolvedValue(true);
     simServRunSimulator.mockResolvedValue(true);
 
     simServWaitForSimulator.mockResolvedValue({
@@ -416,8 +364,6 @@ describe("init action", () => {
     simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
     simServResetDockerContainers.mockResolvedValue(true);
     simServResetDockerImages.mockResolvedValue(true);
-    simServDownloadSimulator.mockResolvedValue({ wasInstalled: false });
-    simServConfigSimulator.mockResolvedValue(true);
     const errorMsg = new Error("runSimulator error");
     simServRunSimulator.mockRejectedValueOnce(errorMsg);
 
@@ -436,8 +382,6 @@ describe("init action", () => {
     simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
     simServResetDockerContainers.mockResolvedValue(true);
     simServResetDockerImages.mockResolvedValue(true);
-    simServDownloadSimulator.mockResolvedValue({ wasInstalled: false });
-    simServConfigSimulator.mockResolvedValue(true);
     simServRunSimulator.mockResolvedValue(true);
     simServWaitForSimulator.mockResolvedValue({
       initialized: false,
@@ -455,15 +399,12 @@ describe("init action", () => {
   test("catches and logs error if waitForSimulatorToBeReady throws an exception", async () => {
     inquirerPrompt
       .mockResolvedValueOnce({ confirmReset: true })
-      .mockResolvedValueOnce({ confirmDownload: true })
       .mockResolvedValueOnce({ selectedLlmProviders: ["openai"] })
       .mockResolvedValueOnce({ openai: "API_KEY1" });
 
-    simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
+    simServCheckInstallRequirements.mockResolvedValue({ docker: true });
     simServResetDockerContainers.mockResolvedValue(true);
     simServResetDockerImages.mockResolvedValue(true);
-    simServDownloadSimulator.mockResolvedValue({ wasInstalled: false });
-    simServConfigSimulator.mockResolvedValue(true);
     simServRunSimulator.mockResolvedValue(true);
 
     const errorMsg = new Error("Unexpected simulator error");
@@ -475,17 +416,17 @@ describe("init action", () => {
   });
 
   test("catches and logs error if openFrontend throws an exception", async () => {
+    const mockEnvContent = "FRONTEND_PORT=8080";
+    vi.mocked(fs.readFileSync).mockReturnValue(mockEnvContent);
+
     inquirerPrompt
       .mockResolvedValueOnce({ confirmReset: true })
-      .mockResolvedValueOnce({ confirmDownload: true })
       .mockResolvedValueOnce({ selectedLlmProviders: ["openai"] })
       .mockResolvedValueOnce({ openai: "API_KEY1" });
 
-    simServCheckInstallRequirements.mockResolvedValue({ git: true, docker: true });
+    simServCheckInstallRequirements.mockResolvedValue({ docker: true });
     simServResetDockerContainers.mockResolvedValue(true);
     simServResetDockerImages.mockResolvedValue(true);
-    simServDownloadSimulator.mockResolvedValue({ wasInstalled: false });
-    simServConfigSimulator.mockResolvedValue(true);
     simServRunSimulator.mockResolvedValue(true);
     simServWaitForSimulator.mockResolvedValue({ initialized: true });
     simServDeleteAllValidators.mockResolvedValue(true);

package/tests/actions/start.test.ts

@@ -12,8 +12,6 @@ describe("startAction - Additional Tests", () => {
   const defaultOptions: StartActionOptions = {
     resetValidators: false,
     numValidators: 5,
-    branch: "main",
-    location: '',
     headless: false,
     resetDb: false
   };
@@ -32,6 +30,7 @@ describe("startAction - Additional Tests", () => {
       openFrontend: vi.fn().mockResolvedValue(undefined),
       setSimulatorLocation: vi.fn().mockResolvedValue(undefined),
       setComposeOptions: vi.fn(),
+      checkCliVersion: vi.fn(),
       getAiProvidersOptions: vi.fn(() => [
         { name: "Provider A", value: "providerA" },
         { name: "Provider B", value: "providerB" },
@@ -48,13 +47,10 @@ describe("startAction - Additional Tests", () => {
   test("runs successfully with default options and keeps existing validators", async () => {
     await startAction(defaultOptions, simulatorService);
 
-    expect(simulatorService.updateSimulator).toHaveBeenCalledWith("main");
     expect(simulatorService.runSimulator).toHaveBeenCalled();
     expect(simulatorService.waitForSimulatorToBeReady).toHaveBeenCalled();
 
     expect(logSpy).toHaveBeenCalledWith("Starting GenLayer simulator keeping the existing validators");
-    expect(logSpy).toHaveBeenCalledWith("Updating GenLayer Simulator...");
-    expect(logSpy).toHaveBeenCalledWith("Running the GenLayer Simulator...");
     expect(logSpy).toHaveBeenCalledWith("Simulator is running!");
     expect(logSpy).toHaveBeenCalledWith("GenLayer simulator initialized successfully! Go to http://localhost:8080 in your browser to access it.");
 
@@ -64,26 +60,15 @@ describe("startAction - Additional Tests", () => {
   test("runs successfully with custom options and keeps existing validators", async () => {
     await startAction({...defaultOptions, headless: true, resetDb: true}, simulatorService);
 
-    expect(simulatorService.updateSimulator).toHaveBeenCalledWith("main");
     expect(simulatorService.runSimulator).toHaveBeenCalled();
     expect(simulatorService.waitForSimulatorToBeReady).toHaveBeenCalled();
 
     expect(logSpy).toHaveBeenCalledWith("Starting GenLayer simulator keeping the existing validators");
-    expect(logSpy).toHaveBeenCalledWith("Updating GenLayer Simulator...");
-    expect(logSpy).toHaveBeenCalledWith("Running the GenLayer Simulator...");
+
     expect(logSpy).toHaveBeenCalledWith("Simulator is running!");
     expect(logSpy).toHaveBeenCalledWith("GenLayer simulator initialized successfully! ");
   });
 
-  test("logs error and stops if updateSimulator fails", async () => {
-    const errorMsg = new Error("updateSimulator error");
-    (simulatorService.updateSimulator as Mock).mockRejectedValueOnce(errorMsg);
-
-    await startAction(defaultOptions, simulatorService);
-
-    expect(errorSpy).toHaveBeenCalledWith(errorMsg);
-    expect(simulatorService.runSimulator).not.toHaveBeenCalled();
-  });
 
   test("logs error and stops if runSimulator fails", async () => {
     const errorMsg = new Error("runSimulator error");

package/tests/commands/init.test.ts

@@ -7,8 +7,6 @@ import simulatorService from  '../../src/lib/services/simulator'
 const openFrontendSpy = vi.spyOn(simulatorService, "openFrontend");
 const defaultOptions = {
   numValidators: "5",
-  branch: "main",
-  location: process.cwd(),
   headless: false,
   resetDb: false
 }
@@ -52,21 +50,6 @@ describe("init command", () => {
     expect(numValidatorsOption?.defaultValue).toBe("5");
   });
 
-  test("option --branch is accepted", async () => {
-    expect(() => program.parse(["node", "test", "init", "--branch", "example"])).not.toThrow();
-  });
-
-  test("option --branch default value is main", async () => {
-    const branchOption = getCommandOption(initCommand, "--branch");
-    expect(branchOption?.defaultValue).toBe("main");
-  });
-
-  test("option --location default value is user's current directory", async () => {
-    // Given // When
-    const locationOption = getCommandOption(initCommand, "--location");
-    expect(locationOption?.defaultValue).toBe(process.cwd());
-  });
-
 
   test("random option is not accepted", async () => {
     initCommand?.exitOverride();

package/tests/commands/up.test.ts

@@ -10,8 +10,6 @@ const action = vi.fn();
 const defaultOptions = {
   resetValidators: false,
   numValidators: "5",
-  branch: "main",
-  location: process.cwd(),
   headless: false ,
   resetDb: false
 }
@@ -58,14 +56,6 @@ describe("up command", () => {
     expect(numValidatorsOption?.defaultValue).toBe("5");
   });
 
-  test("option --branch is accepted", async () => {
-    expect(() => program.parse(["node", "test", "up", "--branch", "development"])).not.toThrow();
-  });
-
-  test("option --branch default value is main", async () => {
-    const branchOption = getCommandOption(upCommand, "--branch");
-    expect(branchOption?.defaultValue).toBe("main");
-  });
 
   test("unrecognized option is not accepted", async () => {
     upCommand?.exitOverride();
@@ -91,15 +81,13 @@ describe("up command", () => {
       "--reset-validators",
       "--numValidators",
       "10",
-      "--branch",
-      "development",
       "--headless",
       "true",
       "--reset-db",
       "true"
     ]);
     expect(action).toHaveBeenCalledTimes(1);
-    expect(action).toHaveBeenCalledWith({...defaultOptions, headless: true, branch: 'development', numValidators: '10', resetValidators: true, resetDb: true});
+    expect(action).toHaveBeenCalledWith({...defaultOptions, headless: true, numValidators: '10', resetValidators: true, resetDb: true});
     expect(openFrontendSpy).not.toHaveBeenCalled();
   });
 });