chopsticks tail support

Moonsong-Labs · Sep 12, 2023 · ddf7923 · ddf7923
1 parent a30131d
commit ddf7923
Show file tree

Hide file tree

Showing 6 changed files with 26 additions and 18 deletions.
diff --git a/packages/cli/src/cmds/runNetwork.ts b/packages/cli/src/cmds/runNetwork.ts
@@ -418,7 +418,7 @@ const resolveTailChoice = async (env: Environment) => {
           resolve("");
         });
     } else {
-      const logFilePath = reportLogLocation(true);
+      const logFilePath = process.env.MOON_LOG_LOCATION;
 
       // eslint-disable-next-line prefer-const
       let currentReadPosition = 0;
@@ -451,11 +451,12 @@ const resolveTailChoice = async (env: Environment) => {
 
         if (char === "p") {
           tailing = false;
-          printLogs(fs.statSync(logFilePath).size, 0);
+          // printLogs(fs.statSync(logFilePath).size, currentReadPosition);
           ui.updateBottomBar(bottomBarContents + resumePauseProse[1]);
         }
 
         if (char === "r") {
+          printLogs(fs.statSync(logFilePath).size, currentReadPosition);
           tailing = true;
           ui.updateBottomBar(bottomBarContents + resumePauseProse[0]);
         }
@@ -469,12 +470,14 @@ const resolveTailChoice = async (env: Environment) => {
 
         if (char === "t") {
           await resolveTestChoice(env, true);
+          ui.updateBottomBar(bottomBarContents + resumePauseProse[tailing ? 0 : 1]);
         }
 
         if (char === "g") {
           ui.rl.input.pause();
           tailing = false;
           await resolveGrepChoice(env, true);
+          ui.updateBottomBar(bottomBarContents + resumePauseProse[tailing ? 0 : 1]);
           tailing = true;
           ui.rl.input.resume();
         }

diff --git a/packages/cli/src/internal/cmdFunctions/tempLogs.ts b/packages/cli/src/internal/cmdFunctions/tempLogs.ts
@@ -22,7 +22,9 @@ export function reportLogLocation(silent: boolean = false) {
   let consoleMessage = "";
   let filePath = "";
   try {
-    filePath = path.join(dirPath, result.find((file) => path.extname(file) == ".log")!);
+    filePath = process.env.MOON_LOG_LOCATION
+      ? process.env.MOON_LOG_LOCATION
+      : path.join(dirPath, result.find((file) => path.extname(file) == ".log")!);
     consoleMessage = `  🪵   Log location: ${filePath}`;
   } catch (e) {
     console.error(e);

diff --git a/packages/cli/src/internal/localNode.ts b/packages/cli/src/internal/localNode.ts
@@ -25,15 +25,18 @@ export async function launchNode(cmd: string, args: string[], name: string): Pro
   process.once("SIGINT", onProcessInterrupt);
 
   const runningNode = spawn(cmd, args);
-
-  const fsStream = fs.createWriteStream(
-    path.join(
+  const logLocation = path
+    .join(
       dirPath,
       `${path.basename(cmd)}_node_${args.find((a) => a.includes("port"))?.split("=")[1]}_${
         runningNode.pid
       }.log`
     )
-  );
+    .replaceAll("node_node_undefined", "chopsticks");
+
+  process.env.MOON_LOG_LOCATION = logLocation;
+
+  const fsStream = fs.createWriteStream(logLocation);
 
   runningNode.once("exit", () => {
     process.removeListener("exit", onProcessExit);

diff --git a/test/suites/chopsticks/test-chopsticks-basic.ts b/test/suites/chopsticks/test-chopsticks-basic.ts
@@ -16,7 +16,7 @@ describeSuite({
     });
 
     it({
-      id: "T1",
+      id: "T01",
       title: "Query the chain",
       timeout: 60000,
       // modifier:"only",
@@ -33,7 +33,7 @@ describeSuite({
     });
 
     it({
-      id: "T2",
+      id: "T02",
       title: "Send a transaction ",
       timeout: 60000,
       test: async function () {
@@ -47,7 +47,7 @@ describeSuite({
     });
 
     it({
-      id: "T3",
+      id: "T03",
       title: "Skips multiple blocks ",
       timeout: 60000,
       test: async function () {
@@ -59,7 +59,7 @@ describeSuite({
     });
 
     it({
-      id: "T4",
+      id: "T04",
       title: "Can overwrite storage values",
       timeout: 60000,
       test: async function () {
@@ -94,7 +94,7 @@ describeSuite({
     });
 
     it({
-      id: "T5",
+      id: "T05",
       title: "Do an upgrade test",
       timeout: 120000,
       modifier: "skip",
@@ -109,7 +109,7 @@ describeSuite({
     });
 
     it({
-      id: "T6",
+      id: "T06",
       title: "Create block and check events",
       timeout: 60000,
       test: async function () {
@@ -126,7 +126,7 @@ describeSuite({
     });
 
     it({
-      id: "T7",
+      id: "T07",
       title: "Create block, allow failures and check events",
       timeout: 60000,
       test: async function () {

diff --git a/test/suites/chopsticks/test-chopsticks-state.ts b/test/suites/chopsticks/test-chopsticks-state.ts
@@ -18,7 +18,7 @@ describeSuite({
     });
 
     it({
-      id: "T1",
+      id: "T01",
       title: "Check initial balance is zero",
       test: async function () {
         const currentBalance = (await api.query.system.account(RANDOM_ADDRESS)).data.free;
@@ -27,7 +27,7 @@ describeSuite({
     });
 
     it({
-      id: "T2",
+      id: "T02",
       title: "Send a transaction ",
       test: async function () {
         const currentBalance = (await api.query.system.account(RANDOM_ADDRESS)).data.free;

diff --git a/test/suites/chopsticks/test-chopsticks-state2.ts b/test/suites/chopsticks/test-chopsticks-state2.ts
@@ -18,7 +18,7 @@ describeSuite({
     });
 
     it({
-      id: "T1",
+      id: "T01",
       title: "Check initial balance is zero",
       test: async function () {
         const currentBalance = (await api.query.system.account(RANDOM_ADDRESS)).data.free;
@@ -27,7 +27,7 @@ describeSuite({
     });
 
     it({
-      id: "T2",
+      id: "T02",
       title: "Send a transaction ",
       test: async function () {
         const currentBalance = (await api.query.system.account(RANDOM_ADDRESS)).data.free;