scripts: replace js test job with cargo-make

Author: buffalojoec

Makefile.toml

@@ -26,6 +26,16 @@ extend = "js-base"
 dependencies = ["js-install"]
 args = ["lint"]
 
+[tasks.js-test]
+script = [
+    "./scripts/start-test-validator.sh",
+    "cd ${MANIFEST_DIR}",
+    "pnpm install",
+    "pnpm build",
+    "pnpm test",
+    "./scripts/stop-test-validator.sh",
+]
+
 
 # Rust Tasks
 

scripts/js.mts

@@ -9,33 +9,11 @@ import {
 } from './helpers/utils.mts';
 
 enum Command {
-    Test = 'test',
     Publish = 'publish',
 }
 
 const { command, libraryPath, args } = parseCliArguments();
 
-async function pnpm(
-    command: string,
-    build = false,
-) {
-    const [pnpmArgs, commandArgs] = partitionArguments(args, '--');
-    cd(libraryPath);
-    await $`pnpm install`;
-    if (build) {
-        await $`pnpm build`;
-    }
-    await $`pnpm ${command} ${pnpmArgs} -- ${commandArgs}`;
-}
-
-async function test() {
-    // Start the local validator, or restart it if it is already running.
-    await $`pnpm validator:restart`;
-
-    // Build the client and run the tests.
-    return pnpm('test', true);
-}
-
 async function publish() {
     const [level, tag = 'latest'] = args;
     if (!level) {
@@ -72,9 +50,6 @@ async function publish() {
 
 
 switch (command) {
-    case Command.Test:
-        await test();
-        break;
     case Command.Publish:
         await publish();
         break;

scripts/start-test-validator.sh

@@ -0,0 +1,38 @@
+#!/bin/bash
+
+
+PORT=8899
+LOG_FILE="./test-ledger/validator.log"
+
+PID=$(lsof -t -i:$PORT)
+
+if [ -n "$PID" ]; then
+  echo "Detected test validator running on PID $PID. Restarting..."
+  kill "$PID"
+  sleep 1
+fi
+
+echo "Starting Solana test validator..."
+solana-test-validator > /dev/null 2>&1 &
+VALIDATOR_PID=$!
+
+# Wait for test validator to move past slot 0.
+echo -n "Waiting for validator to stabilize"
+for i in {1..8}; do
+  if ! kill -0 "$VALIDATOR_PID" 2>/dev/null; then
+    echo -e "\nTest validator exited early."
+    exit 1
+  fi
+
+  SLOT=$(solana slot -ul 2>/dev/null)
+  if [[ "$SLOT" =~ ^[0-9]+$ ]] && [ "$SLOT" -gt 0 ]; then
+    echo -e "\nTest validator is ready. Slot: $SLOT"
+    exit 0
+  fi
+
+  echo -n "."
+  sleep 2
+done
+
+echo -e "\nTimed out waiting for test validator to stabilize."
+exit 1

scripts/stop-test-validator.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+PORT=8899
+
+if lsof -t -i:$PORT > /dev/null; then
+  echo "Stopping test validator..."
+  pkill -f solana-test-validator
+  sleep 1
+  echo "Test validator terminated."
+else
+  echo "Test validator is not running."
+fi