chore(core-manager): trigger processes from ark-core or ark-forger (#…

…3915)
ArkEcosystem · Jul 30, 2020 · f00e075 · f00e075
1 parent 184f500
commit f00e075
Show file tree

Hide file tree

Showing 11 changed files with 71 additions and 10 deletions.
diff --git a/__tests__/unit/core-manager/actions/info-current-delegate.test.ts b/__tests__/unit/core-manager/actions/info-current-delegate.test.ts
@@ -2,6 +2,7 @@ import "jest-extended";
 
 import { Action } from "@packages/core-manager/src/actions/info-current-delegate";
 import { Identifiers } from "@packages/core-manager/src/ioc";
+import * as Utils from "@packages/core-manager/src/utils";
 import { Sandbox } from "@packages/core-test-framework";
 
 import { TriggerResponses } from "../__fixtures__";
@@ -13,6 +14,9 @@ let mockCli;
 let mockTrigger;
 
 beforeEach(() => {
+    jest.spyOn(Utils, "getCoreOrForgerProcessName").mockReturnValue("ark-core");
+    jest.spyOn(Utils, "getOnlineProcesses").mockReturnValue([]);
+
     mockTrigger = jest.fn().mockReturnValue({
         stdout: TriggerResponses.forgetCurrentDelegateResponse,
     });

diff --git a/__tests__/unit/core-manager/actions/info-last-forged-block.test.ts b/__tests__/unit/core-manager/actions/info-last-forged-block.test.ts
@@ -2,6 +2,7 @@ import "jest-extended";
 
 import { Action } from "@packages/core-manager/src/actions/info-last-forged-block";
 import { Identifiers } from "@packages/core-manager/src/ioc";
+import * as Utils from "@packages/core-manager/src/utils";
 import { Sandbox } from "@packages/core-test-framework";
 
 import { TriggerResponses } from "../__fixtures__";
@@ -13,6 +14,9 @@ let mockCli;
 let mockTrigger;
 
 beforeEach(() => {
+    jest.spyOn(Utils, "getCoreOrForgerProcessName").mockReturnValue("ark-core");
+    jest.spyOn(Utils, "getOnlineProcesses").mockReturnValue([]);
+
     mockTrigger = jest.fn().mockReturnValue({
         stdout: TriggerResponses.forgetLastForgedBlockResponse,
     });

diff --git a/__tests__/unit/core-manager/actions/info-next-forging-slot.test.ts b/__tests__/unit/core-manager/actions/info-next-forging-slot.test.ts
@@ -2,6 +2,7 @@ import "jest-extended";
 
 import { Action } from "@packages/core-manager/src/actions/info-next-forging-slot";
 import { Identifiers } from "@packages/core-manager/src/ioc";
+import * as Utils from "@packages/core-manager/src/utils";
 import { Sandbox } from "@packages/core-test-framework";
 
 import { TriggerResponses } from "../__fixtures__";
@@ -13,6 +14,9 @@ let mockCli;
 let mockTrigger;
 
 beforeEach(() => {
+    jest.spyOn(Utils, "getCoreOrForgerProcessName").mockReturnValue("ark-core");
+    jest.spyOn(Utils, "getOnlineProcesses").mockReturnValue([]);
+
     mockTrigger = jest.fn().mockReturnValue({
         stdout: TriggerResponses.forgetNextForgingSlotResponse,
     });

diff --git a/__tests__/unit/core-manager/utils/process.test.ts b/__tests__/unit/core-manager/utils/process.test.ts
@@ -0,0 +1,31 @@
+import "jest-extended";
+
+import { getCoreOrForgerProcessName, getOnlineProcesses } from "@packages/core-manager/src/utils";
+
+let processManager;
+const processes = [{ name: "ark-core" }, { name: "ark-forger" }, { name: "ark-relay" }];
+
+beforeEach(() => {
+    processManager = {
+        list: jest.fn().mockReturnValue(processes),
+        isOnline: jest.fn().mockReturnValue(true),
+    };
+});
+
+describe("getOnlineProcesses", () => {
+    it("should filter online processes", async () => {
+        expect(getOnlineProcesses(processManager)).toEqual(processes);
+    });
+});
+
+describe("getCoreOrForgerProcessName", () => {
+    it("should return ark-core", async () => {
+        expect(getCoreOrForgerProcessName(processes)).toEqual("ark-core");
+    });
+
+    it("should throw error if ark-core or ark-forger is not online process", async () => {
+        expect(() => {
+            getCoreOrForgerProcessName([]);
+        }).toThrowError("Process with name ark-forger or ark-core is not online");
+    });
+});
diff --git a/packages/core-manager/src/actions/info-current-delegate.ts b/packages/core-manager/src/actions/info-current-delegate.ts
@@ -3,7 +3,7 @@ import { Application, Container } from "@arkecosystem/core-kernel";
 
 import { Actions } from "../contracts";
 import { Identifiers } from "../ioc";
-import { parseProcessActionResponse } from "../utils";
+import { parseProcessActionResponse, getOnlineProcesses, getCoreOrForgerProcessName } from "../utils";
 
 @Container.injectable()
 export class Action implements Actions.Action {
@@ -21,7 +21,9 @@ export class Action implements Actions.Action {
 
         const processManager = cli.get<Services.ProcessManager>(CliContainer.Identifiers.ProcessManager);
 
-        const response = processManager.trigger("ark-core", "forger.currentDelegate");
+        const processName = getCoreOrForgerProcessName(getOnlineProcesses(processManager));
+
+        const response = processManager.trigger(processName, "forger.currentDelegate");
 
         const result = parseProcessActionResponse(response);
 

diff --git a/packages/core-manager/src/actions/info-last-forged-block.ts b/packages/core-manager/src/actions/info-last-forged-block.ts
@@ -3,7 +3,7 @@ import { Application, Container } from "@arkecosystem/core-kernel";
 
 import { Actions } from "../contracts";
 import { Identifiers } from "../ioc";
-import { parseProcessActionResponse } from "../utils";
+import { getCoreOrForgerProcessName, getOnlineProcesses, parseProcessActionResponse } from "../utils";
 
 @Container.injectable()
 export class Action implements Actions.Action {
@@ -21,7 +21,9 @@ export class Action implements Actions.Action {
 
         const processManager = cli.get<Services.ProcessManager>(CliContainer.Identifiers.ProcessManager);
 
-        const response = processManager.trigger("ark-core", "forger.lastForgedBlock");
+        const processName = getCoreOrForgerProcessName(getOnlineProcesses(processManager));
+
+        const response = processManager.trigger(processName, "forger.lastForgedBlock");
 
         const result = parseProcessActionResponse(response);
 

diff --git a/packages/core-manager/src/actions/info-next-forging-slot.ts b/packages/core-manager/src/actions/info-next-forging-slot.ts
@@ -3,7 +3,7 @@ import { Application, Container } from "@arkecosystem/core-kernel";
 
 import { Actions } from "../contracts";
 import { Identifiers } from "../ioc";
-import { parseProcessActionResponse } from "../utils";
+import { getCoreOrForgerProcessName, getOnlineProcesses, parseProcessActionResponse } from "../utils";
 
 @Container.injectable()
 export class Action implements Actions.Action {
@@ -21,7 +21,9 @@ export class Action implements Actions.Action {
 
         const processManager = cli.get<Services.ProcessManager>(CliContainer.Identifiers.ProcessManager);
 
-        const response = processManager.trigger("ark-core", "forger.nextSlot");
+        const processName = getCoreOrForgerProcessName(getOnlineProcesses(processManager));
+
+        const response = processManager.trigger(processName, "forger.nextSlot");
 
         const result = parseProcessActionResponse(response);
 

diff --git a/packages/core-manager/src/utils/index.ts b/packages/core-manager/src/utils/index.ts
@@ -1,3 +1,4 @@
 export * from "./api-connection";
 export * from "./http-client";
 export * from "./process-actions";
+export * from "./process";
diff --git a/packages/core-manager/src/utils/process.ts b/packages/core-manager/src/utils/process.ts
@@ -0,0 +1,15 @@
+import { Services } from "@arkecosystem/core-cli";
+
+export const getOnlineProcesses = (processManager: Services.ProcessManager): { name: string }[] => {
+    return processManager.list().filter((x) => processManager.isOnline(x.name)) as [{ name: string }];
+};
+
+export const getCoreOrForgerProcessName = (processes: { name: string }[]) => {
+    const process = processes.find((x) => x.name === "ark-forger" || x.name === "ark-core");
+
+    if (!process) {
+        throw new Error("Process with name ark-forger or ark-core is not online");
+    }
+
+    return process.name;
+};
diff --git a/packages/core/src/commands/core-run.ts b/packages/core/src/commands/core-run.ts
@@ -58,8 +58,6 @@ export class Command extends Commands.Command {
         const flags: Contracts.AnyObject = { ...this.getFlags() };
         flags.processType = "core";
 
-        // this.actions.abortRunningProcess(`${flags.token}-core`);
-
         await Utils.buildApplication({
             flags,
             plugins: {

diff --git a/packages/core/src/commands/forger-run.ts b/packages/core/src/commands/forger-run.ts
@@ -53,8 +53,6 @@ export class Command extends Commands.Command {
         const flags: Contracts.AnyObject = { ...this.getFlags() };
         flags.processType = "forger";
 
-        this.actions.abortRunningProcess(`${flags.token}-forger`);
-
         await Utils.buildApplication({
             flags,
             plugins: {