Optimised CI

.github/workflows/integration-test.yml

@@ -155,68 +155,67 @@ jobs:
           echo "${ZOMBIENET_BIN_DIR}" >> "$GITHUB_PATH"
           echo "ZOMBIENET_BINARY=zombienet-linux-x64" >> "$GITHUB_ENV"
 
-      # Westend parachain
-      - name: Run authorize and store (PAPI, RPC node, Westend parachain)
+      # ========================================================================
+      # Westend parachain tests
+      # ========================================================================
+      - name: Start services (Westend parachain)
         working-directory: examples
         run: |
-          export TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
+          TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
           echo "TEST_DIR=$TEST_DIR" >> "$GITHUB_ENV"
-          mkdir -p "$TEST_DIR"
-          just run-authorize-and-store "bulletin-westend-runtime" "ws"
-      - name: Run authorize and store (PAPI, smoldot, Westend parachain)
+          just start-services "$TEST_DIR" "bulletin-westend-runtime"
+
+      - name: Test authorize-and-store ws (Westend parachain)
         working-directory: examples
-        run: |
-          export TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
-          echo "TEST_DIR=$TEST_DIR" >> "$GITHUB_ENV"
-          mkdir -p "$TEST_DIR"
-          just run-authorize-and-store "bulletin-westend-runtime" "smoldot"
-      - name: Run store chunked data + DAG-PB (PJS-API, RPC node, Westend parachain)
+        run: just run-test-authorize-and-store "${{ env.TEST_DIR }}" "bulletin-westend-runtime" "ws"
+
+      - name: Test authorize-and-store smoldot (Westend parachain)
         working-directory: examples
-        run: |
-          export TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
-          echo "TEST_DIR=$TEST_DIR" >> "$GITHUB_ENV"
-          mkdir -p "$TEST_DIR"
-          just run-store-chunked-data "bulletin-westend-runtime"
-      - name: Run store big data (PJS-API, RPC node, Westend parachain)
+        run: just run-test-authorize-and-store "${{ env.TEST_DIR }}" "bulletin-westend-runtime" "smoldot"
+
+      - name: Test store-chunked-data (Westend parachain)
         working-directory: examples
-        run: |
-          export TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
-          echo "TEST_DIR=$TEST_DIR" >> $GITHUB_ENV
-          mkdir -p "$TEST_DIR"
-          just run-store-big-data "bulletin-westend-runtime"
+        run: just run-test-store-chunked-data "${{ env.TEST_DIR }}"
 
-#      TODO: Polkadot parachain
+      - name: Test store-big-data (Westend parachain)
+        working-directory: examples
+        run: just run-test-store-big-data "${{ env.TEST_DIR }}"
 
-      # Polkadot solochain
-      - name: Run authorize and store (PAPI, RPC node, Polkadot solochain)
+      - name: Stop services (Westend parachain)
+        if: always()
         working-directory: examples
-        run: |
-          export TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
-          echo "TEST_DIR=$TEST_DIR" >> "$GITHUB_ENV"
-          mkdir -p "$TEST_DIR"
-          just run-authorize-and-store "bulletin-polkadot-runtime" "ws"
-      - name: Run authorize and store (PAPI, smoldot, Polkadot solochain)
+        run: just stop-services "${{ env.TEST_DIR }}"
+
+      # ========================================================================
+      # Polkadot solochain tests
+      # ========================================================================
+      - name: Start services (Polkadot solochain)
         working-directory: examples
         run: |
-          export TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
+          TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
           echo "TEST_DIR=$TEST_DIR" >> "$GITHUB_ENV"
-          mkdir -p "$TEST_DIR"
-          just run-authorize-and-store "bulletin-polkadot-runtime" "smoldot"
-      - name: Run store chunked data + DAG-PB (PJS-API, RPC node, Polkadot solochain)
+          just start-services "$TEST_DIR" "bulletin-polkadot-runtime"
+
+      - name: Test authorize-and-store ws (Polkadot solochain)
         working-directory: examples
-        run: |
-          export TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
-          echo "TEST_DIR=$TEST_DIR" >> "$GITHUB_ENV"
-          mkdir -p "$TEST_DIR"
-          just run-store-chunked-data "bulletin-polkadot-runtime"
+        run: just run-test-authorize-and-store "${{ env.TEST_DIR }}" "bulletin-polkadot-runtime" "ws"
 
-      - name: Run store big data (PJS-API, RPC node, Polkadot solochain)
+      - name: Test authorize-and-store smoldot (Polkadot solochain)
         working-directory: examples
-        run: |
-          export TEST_DIR="$(mktemp -d $GITHUB_WORKSPACE/bulletin-tests-run-XXXXX)/test"
-          echo "TEST_DIR=$TEST_DIR" >> $GITHUB_ENV
-          mkdir -p "$TEST_DIR"
-          just run-store-big-data "bulletin-polkadot-runtime"
+        run: just run-test-authorize-and-store "${{ env.TEST_DIR }}" "bulletin-polkadot-runtime" "smoldot"
+
+      - name: Test store-chunked-data (Polkadot solochain)
+        working-directory: examples
+        run: just run-test-store-chunked-data "${{ env.TEST_DIR }}"
+
+      - name: Test store-big-data (Polkadot solochain)
+        working-directory: examples
+        run: just run-test-store-big-data "${{ env.TEST_DIR }}"
+
+      - name: Stop services (Polkadot solochain)
+        if: always()
+        working-directory: examples
+        run: just stop-services "${{ env.TEST_DIR }}"
 
       # Collects logs from the last failed zombienet run.
       - name: Upload Zombienet logs (on failure)

examples/authorize_and_store_papi_smoldot.js

@@ -10,7 +10,8 @@ import { cidFromBytes } from "./cid_dag_metadata.js";
 import { bulletin } from './.papi/descriptors/dist/index.mjs';
 
 // Constants
-const SYNC_WAIT_SEC = 15;
+// Increased sync time for parachain mode where smoldot needs more time to sync relay + para
+const SYNC_WAIT_SEC = 30;
 const SMOLDOT_LOG_LEVEL = 3; // 0=off, 1=error, 2=warn, 3=info, 4=debug, 5=trace
 const HTTP_IPFS_API = 'http://127.0.0.1:8080'   // Local IPFS HTTP gateway
 
@@ -120,8 +121,9 @@ async function main() {
         const bulletinAPI = client.getTypedApi(bulletin);
         await waitForChainReady(bulletinAPI);
 
-        // Signers.
-        const { sudoSigner, whoSigner, whoAddress } = setupKeyringAndSigners('//Alice', '//Alice');
+        // Signers: Use Bob for the account being authorized to avoid nonce conflicts
+        // when running after ws test (which uses Alice) on the same chain.
+        const { sudoSigner, whoSigner, whoAddress } = setupKeyringAndSigners('//Alice', '//Bob');
 
         // Data to store.
         const dataToStore = "Hello, Bulletin with PAPI + Smoldot - " + new Date().toString();

examples/justfile

@@ -234,12 +234,7 @@ ipfs-start test_dir: _check-docker
     echo "   Container: ipfs-node"
     echo "   Waiting for container to start..."
     sleep 5
-
-    # Bitswap logging
-    docker logs -f ipfs-node > {{ test_dir }}/ipfs-node.log 2>&1 &
-    docker exec ipfs-node ipfs log level bitswap debug
-    docker exec ipfs-node ipfs log level bitswap/client debug
-
+
     # Store container name in PID directory for cleanup
     echo "ipfs-node" > {{ test_dir }}/ipfs-docker.container
 
@@ -365,10 +360,82 @@ teardown-services test_dir:
     just ipfs-shutdown "{{ test_dir }}"
     echo "✅ Docker services stopped"
 
+# Start all services for a runtime (use with run-test-* recipes)
+# Usage: just start-services /tmp/my-test-dir bulletin-polkadot-runtime
+start-services test_dir runtime: npm-install
+    #!/usr/bin/env bash
+    set -e
+    mkdir -p "{{ test_dir }}"
+    just setup-services "{{ test_dir }}" "{{ runtime }}"
+
+# Stop all services
+# Usage: just stop-services /tmp/my-test-dir
+stop-services test_dir:
+    #!/usr/bin/env bash
+    echo "📁 Stopping services - test directory: {{ test_dir }}"
+    just teardown-services "{{ test_dir }}"
+    echo "✅ Services stopped"
+
+# Run authorize-and-store test only (services must already be running via start-services)
+# Parameters:
+#   test_dir - Test directory where services are running
+#   runtime - Runtime name for smoldot chainspec path resolution
+#   mode - Connection mode: "ws" (WebSocket RPC node) or "smoldot" (light client)
+run-test-authorize-and-store test_dir runtime mode="ws":
+    #!/usr/bin/env bash
+    set -e
+
+    if [ "{{ mode }}" = "smoldot" ]; then
+        echo "🧪 Running authorize and store test (mode: smoldot, runtime: {{ runtime }})..."
+        SCRIPT_NAME="authorize_and_store_papi_smoldot.js"
+    elif [ "{{ mode }}" = "ws" ]; then
+        echo "🧪 Running authorize and store test (mode: ws, runtime: {{ runtime }})..."
+        SCRIPT_NAME="authorize_and_store_papi.js"
+    else
+        echo "❌ Error: Invalid mode '{{ mode }}'. Must be 'ws' or 'smoldot'"
+        exit 1
+    fi
+
+    # Run the script with chainspec_path parameter only for smoldot mode
+    if [ "{{ mode }}" = "smoldot" ]; then
+        if [ "{{ runtime }}" = "bulletin-westend-runtime" ]; then
+            RELAY_CHAINSPEC_PATH="{{ test_dir }}/bob/cfg/westend-local.json"
+            PARACHAIN_CHAINSPEC_PATH="{{ test_dir }}/bulletin-westend-collator-2/cfg/westend-local-1006.json"
+            node $SCRIPT_NAME "$RELAY_CHAINSPEC_PATH" "$PARACHAIN_CHAINSPEC_PATH"
+        else
+            CHAINSPEC_PATH="{{ test_dir }}/bob/cfg/bulletin-polkadot-local.json"
+            node $SCRIPT_NAME "$CHAINSPEC_PATH"
+        fi
+    else
+        node $SCRIPT_NAME
+    fi
+
+# Run store-chunked-data test only (services must already be running via start-services)
+# Parameters:
+#   test_dir - Test directory where services are running
+run-test-store-chunked-data test_dir:
+    #!/usr/bin/env bash
+    set -e
+    echo "🧪 Running store chunked data test (test_dir: {{ test_dir }})..."
+    node store_chunked_data.js
+
+# Run store-big-data test only (services must already be running via start-services)
+# Parameters:
+#   test_dir - Test directory where services are running
+run-test-store-big-data test_dir:
+    #!/usr/bin/env bash
+    set -e
+    echo "🧪 Running store big data test (test_dir: {{ test_dir }})..."
+    node store_big_data.js
+
+# ============================================================================
+# Standalone recipes (with full setup/teardown) - kept for local dev convenience
+# ============================================================================
+
 # Run authorize and store example with Docker IPFS
 # Parameters:
 #   mode - Connection mode: "ws" (WebSocket RPC node) or "smoldot" (light client)
-#   runtime - Runtime name (e.g., "bulletin-polkadot-runtime", "bulletin-westend-runtime", "polkadot-bulletin-chain-runtime")
+#   runtime - Runtime name (e.g., "bulletin-polkadot-runtime", "bulletin-westend-runtime")
 run-authorize-and-store runtime mode="ws": npm-install
     #!/usr/bin/env bash
     set -e