add sub-directory option (#387)

.changeset/odd-owls-crash.md

@@ -0,0 +1,8 @@
+---
+"@moonwall/types": patch
+"@moonwall/util": patch
+"@moonwall/cli": patch
+"@moonwall/tests": patch
+---
+
+gov fix

.gitignore

@@ -1,5 +1,6 @@
 **/node_modules/
 **/dist/
+**/.tsup/
 test/html/*
 *.sqlite
 **/*.log

packages/cli/src/cmds/entrypoint.ts

@@ -11,6 +11,8 @@ dotenv.config();
 
 configSetup(process.argv);
 
+export type RunCommandArgs = { envName: string; GrepTest?: string; subDirectory?: string };
+
 yargs(hideBin(process.argv))
   .wrap(null)
   .usage("Usage: $0")
@@ -74,6 +76,11 @@ yargs(hideBin(process.argv))
         .positional("GrepTest", {
           type: "string",
           description: "Pattern to grep test ID/Description to run",
+        })
+        .option("subDirectory", {
+          describe: "Additional sub-directory filter for test suites",
+          alias: "d",
+          type: "string",
         });
     },
     async (args) => {
@@ -82,6 +89,7 @@ yargs(hideBin(process.argv))
         if (
           !(await testCmd(args.envName.toString(), {
             testNamePattern: args.GrepTest,
+            subDirectory: args.subDirectory,
           }))
         ) {
           process.exitCode = 1;
@@ -93,7 +101,7 @@ yargs(hideBin(process.argv))
       }
     }
   )
-  .command(
+  .command<RunCommandArgs>(
     "run <envName> [GrepTest]",
     "Start new network found in global config",
     (yargs) => {
@@ -104,11 +112,16 @@ yargs(hideBin(process.argv))
         .positional("GrepTest", {
           type: "string",
           description: "Pattern to grep test ID/Description to run",
+        })
+        .option("subDirectory", {
+          describe: "Additional sub-directory filter for test suites",
+          alias: "d",
+          type: "string",
         });
     },
     async (argv) => {
       process.env.MOON_RUN_SCRIPTS = "true";
-      await runNetworkCmd(argv as any);
+      await runNetworkCmd(argv);
     }
   )
   .command<{ suitesRootDir: string }>(

packages/cli/src/cmds/runNetwork.ts

@@ -20,14 +20,16 @@ import {
   resolveZombieInteractiveCmdChoice,
 } from "./interactiveCmds";
 import { executeTests } from "./runTests";
+import { RunCommandArgs } from "./entrypoint";
 
 inquirer.registerPrompt("press-to-continue", PressToContinuePrompt);
 
 let lastSelected = 0;
 
-export async function runNetworkCmd(args) {
+export async function runNetworkCmd(args: RunCommandArgs) {
   await cacheConfig();
   process.env.MOON_TEST_ENV = args.envName;
+  process.env.MOON_SUBDIR = args.subDirectory;
   const globalConfig = await importAsyncConfig();
   const env = globalConfig.environments.find(({ name }) => name === args.envName);
 
@@ -144,6 +146,10 @@ export async function runNetworkCmd(args) {
     console.log(`  🖥️   https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A${port}`);
   }
 
+  if (process.env.MOON_SUBDIR) {
+    console.log(chalk.bgWhite.blackBright(`📍 Subdirectory Filter: ${process.env.MOON_SUBDIR}`));
+  }
+
   if (!args.GrepTest) {
     const question = questions.find(({ name }) => name === "NetworkStarted");
 
@@ -154,8 +160,8 @@ export async function runNetworkCmd(args) {
     await inquirer.prompt(question);
   } else {
     process.env.MOON_RECYCLE = "true";
-    process.env.MOON_GREP = await args.GrepTest;
-    await executeTests(env, { testNamePattern: await args.GrepTest });
+    process.env.MOON_GREP = args.GrepTest;
+    await executeTests(env, { testNamePattern: args.GrepTest, subDirectory: args.subDirectory });
   }
 
   mainloop: for (;;) {
@@ -299,6 +305,9 @@ const resolveInfoChoice = async (env: Environment) => {
   for (const { port } of portsList) {
     console.log(`  🖥️   https://polkadot.js.org/apps/?rpc=ws%3A%2F%2F127.0.0.1%3A${port}`);
   }
+  if (process.env.MOON_SUBDIR) {
+    console.log(chalk.bgWhite.blackBright(`📍 Subdirectory Filter: ${process.env.MOON_SUBDIR}`));
+  }
 };
 
 const resolveGrepChoice = async (env: Environment, silent = false) => {
@@ -310,7 +319,11 @@ const resolveGrepChoice = async (env: Environment, silent = false) => {
   });
   process.env.MOON_RECYCLE = "true";
   process.env.MOON_GREP = await choice.grep;
-  const opts: any = { testNamePattern: await choice.grep, silent };
+  const opts: any = {
+    testNamePattern: await choice.grep,
+    silent,
+    subDirectory: process.env.MOON_SUBDIR,
+  };
   if (silent) {
     opts.reporters = ["dot"];
   }
@@ -319,7 +332,7 @@ const resolveGrepChoice = async (env: Environment, silent = false) => {
 
 const resolveTestChoice = async (env: Environment, silent = false) => {
   process.env.MOON_RECYCLE = "true";
-  const opts: any = { silent };
+  const opts: any = { silent, subDirectory: process.env.MOON_SUBDIR };
   if (silent) {
     opts.reporters = ["dot"];
   }

packages/cli/src/cmds/runTests.ts

@@ -50,7 +50,7 @@ export async function testCmd(envName: string, additionalArgs?: object): Promise
   return false;
 }
 
-export async function executeTests(env: Environment, additionalArgs?: object) {
+export async function executeTests(env: Environment, additionalArgs?: any) {
   return new Promise<Vitest>(async (resolve, reject) => {
     const globalConfig = await importAsyncConfig();
     if (env.foundation.type === "read_only") {
@@ -118,7 +118,11 @@ export async function executeTests(env: Environment, additionalArgs?: object) {
     }
 
     try {
-      const folders = env.testFileDir.map((folder) => path.join(".", folder, "/"));
+      const testFileDir = additionalArgs?.subDirectory
+        ? env.testFileDir.map((folder) => path.join(folder, additionalArgs.subDirectory))
+        : env.testFileDir;
+
+      const folders = testFileDir.map((folder) => path.join(".", folder, "/"));
       resolve(
         (await startVitest("test", folders, {
           ...options,

test/configs/relaytest.toml

@@ -5,17 +5,17 @@ id = 2_001
 [parachains.collator]
 args = ["-lparachain=debug"]
 command = "polkadot-parachain"
-image = "parity/polkadot-parachain:1.3.0"
+image = "parity/polkadot-parachain:1.7.0"
 name = "collator02"
 
 [relaychain]
 chain = "rococo-local"
-default_image = "docker.io/parity/polkadot:v1.3.0"
+default_image = "docker.io/parity/polkadot:v1.7.0"
 
-[relaychain.genesis.runtime.configuration.config]
+[relaychain.genesis.runtimeGenesis.patch.configuration.config]
 scheduling_lookahead = 4
 
-[relaychain.genesis.runtime.configuration.config.async_backing_params]
+[relaychain.genesis.runtimeGenesis.patch.configuration.config.async_backing_params]
 allowed_ancestry_len = 4
 max_candidate_depth = 4
 
@@ -30,4 +30,4 @@ timeout = 1_000
 [types.Header]
 number = "u64"
 parent_hash = "Hash"
-post_state = "Hash"
+post_state = "Hash"

test/suites/dev_tests/test_dev.ts → test/suites/dev_tests/test1/test_dev.ts

@@ -35,7 +35,7 @@ import {
   verifyMessage,
 } from "viem";
 import { generatePrivateKey, privateKeyToAccount } from "viem/accounts";
-import { tokenAbi, bytecode as tokenBytecode } from "../../_test_data/token";
+import { tokenAbi, bytecode as tokenBytecode } from "../../../_test_data/token";
 
 describeSuite({
   id: "D01",
@@ -618,6 +618,7 @@ describeSuite({
         log(`Previous block #${block}, new block #${block2}`);
         log(`Previous round #${round}, new round #${round2}`);
         expect(round2).toBe(round + 1);
+
       },
     });