feat(nix): improve flake.nix, adding checks and formatter

.github/workflows/ci.yml

@@ -47,6 +47,7 @@ jobs:
         # FIXME: Once rustup adds a command to install a toolchain from rust-toolchain.toml, we can remove this.
         run: rustup toolchain add 1.73.0 --profile minimal --component llvm-tools-preview
       - uses: taiki-e/install-action@cargo-llvm-cov
+      - uses: taiki-e/install-action@nextest
 
       - name: Lint
         run: make lint

Makefile

@@ -60,7 +60,7 @@ test: test-unit test-int
 test-unit:
 # --lib only runs unit tests in library crates
 # --bins only runs unit tests in binary crates
-	@cargo test --lib --bins 
+	@cargo nextest run --lib --bins 
 
 .PHONY: test-int
 test-int:
@@ -70,7 +70,7 @@ test-int:
 # FIXME(https://linear.app/tezos/issue/JSTZ-46): 
 # Currently this runs the test for `test_nested_transactions`. This test should 
 # be moved to an inline-test in the `jstz_core` crate to avoid this.  
-	@cargo test --test "*"
+	@cargo nextest run --test "*"
 
 .PHONY: cov 
 cov:

crates/jstz_rollup/entrypoint.sh

@@ -7,7 +7,7 @@ mkdir -p "$JSTZ_ROLLUP_OCTEZ_CLIENT_DIR"
 export JSTZ_ROLLUP_OCTEZ_ROLLUP_NODE_DIR="/root/.octez-smart-rollup-node"
 mkdir -p "$JSTZ_ROLLUP_OCTEZ_ROLLUP_NODE_DIR"
 
-# shellcheck disable=SC2034 
+# shellcheck disable=SC2034
 # JSTZ_ROLLUP_OCTEZ_NODE_ENDPOINT is used in the jstz-rollup command
 export JSTZ_ROLLUP_OCTEZ_NODE_ENDPOINT="https://rpc.$NETWORK.teztnets.com/"
 
@@ -16,96 +16,96 @@ installer_dir="root/installer"
 logs_dir="root/logs"
 
 if [ ! -f "$JSTZ_ROLLUP_OCTEZ_CLIENT_DIR/secret_keys" ]; then
-    echo "Importing operator secret key..."
-    if [ -z "$OPERATOR_SK" ]; then
-        echo "OPERATOR_SK is not set"
-        exit 1
-    fi
-    jstz-rollup operator import-keys --secret-key "$OPERATOR_SK"
+  echo "Importing operator secret key..."
+  if [ -z "$OPERATOR_SK" ]; then
+    echo "OPERATOR_SK is not set"
+    exit 1
+  fi
+  jstz-rollup operator import-keys --secret-key "$OPERATOR_SK"
 fi
 
 make-installer() {
-    jstz-rollup make-installer \
-        --kernel "$kernel_path" \
-        --bridge "$JSTZ_ROLLUP_BRIDGE_ADDRESS" \
-        --output "$installer_dir"
-    
-    # Check the exit status of the last command
-    if [ $? -eq 0 ]; then
-        echo "Installer created successfully in $installer_dir."
-    else
-        echo "Failed to create installer. Please check the parameters and try again."
-        exit 1
-    fi
+  jstz-rollup make-installer \
+    --kernel "$kernel_path" \
+    --bridge "$JSTZ_ROLLUP_BRIDGE_ADDRESS" \
+    --output "$installer_dir"
+
+  # Check the exit status of the last command
+  if [ $? -eq 0 ]; then
+    echo "Installer created successfully in $installer_dir."
+  else
+    echo "Failed to create installer. Please check the parameters and try again."
+    exit 1
+  fi
 }
 
 deploy-bridge() {
-    jstz-rollup deploy-bridge \
-        --operator "$OPERATOR_ADDRESS"
+  jstz-rollup deploy-bridge \
+    --operator "$OPERATOR_ADDRESS"
 }
 
 deploy-installer() {
-    jstz-rollup deploy-installer \
-        --installer "$installer_dir/installer.wasm" \
-        --bridge "$JSTZ_ROLLUP_BRIDGE_ADDRESS"
+  jstz-rollup deploy-installer \
+    --installer "$installer_dir/installer.wasm" \
+    --bridge "$JSTZ_ROLLUP_BRIDGE_ADDRESS"
 }
 
 run() {
-    if [ -z "$(ls -A $installer_dir)" ]; then
-        make-installer
-    fi
-
-    mkdir -p "$logs_dir"
-
-    jstz-rollup run \
-        --preimages "$installer_dir/preimages" \
-        --rollup "$JSTZ_ROLLUP_ADDRESS" \
-        --logs "$logs_dir" \
-        --addr "0.0.0.0"
-    
-    exit_status=$?
-
-    if [ $exit_status -eq 0 ]; then
-        echo "jstz-rollup node started successfully."
-    else
-        echo "Failed to start jstz-rollup node. Exit status: $exit_status"
-        exit $exit_status
-    fi
+  if [ -z "$(ls -A $installer_dir)" ]; then
+    make-installer
+  fi
+
+  mkdir -p "$logs_dir"
+
+  jstz-rollup run \
+    --preimages "$installer_dir/preimages" \
+    --rollup "$JSTZ_ROLLUP_ADDRESS" \
+    --logs "$logs_dir" \
+    --addr "0.0.0.0"
+
+  exit_status=$?
+
+  if [ $exit_status -eq 0 ]; then
+    echo "jstz-rollup node started successfully."
+  else
+    echo "Failed to start jstz-rollup node. Exit status: $exit_status"
+    exit $exit_status
+  fi
 }
 
 deploy() {
-    JSTZ_ROLLUP_BRIDGE_ADDRESS=$(deploy-bridge | grep -oE 'KT1[a-zA-Z0-9]{33}' | uniq | tr -d '\n')
-    echo "Bridge address: $JSTZ_ROLLUP_BRIDGE_ADDRESS"
-
-    jstz-rollup deploy \
-        --kernel "$kernel_path" \
-        --bridge "$JSTZ_ROLLUP_BRIDGE_ADDRESS" \
-        --output "$installer_dir" \
-        --operator "$OPERATOR_ADDRESS"
+  JSTZ_ROLLUP_BRIDGE_ADDRESS=$(deploy-bridge | grep -oE 'KT1[a-zA-Z0-9]{33}' | uniq | tr -d '\n')
+  echo "Bridge address: $JSTZ_ROLLUP_BRIDGE_ADDRESS"
+
+  jstz-rollup deploy \
+    --kernel "$kernel_path" \
+    --bridge "$JSTZ_ROLLUP_BRIDGE_ADDRESS" \
+    --output "$installer_dir" \
+    --operator "$OPERATOR_ADDRESS"
 }
 
 main() {
-    command="$1"
-    shift 1
-
-    case $command in
-        "run")
-            run
-            ;;
-        "deploy")
-            deploy
-            ;;
-        "deploy-bridge")
-            deploy-bridge
-            ;;
-        "deploy-installer")
-            deploy-installer
-            ;;
-        "make-installer")
-            make-installer
-            ;;
-        *)
-            cat <<EOF
+  command="$1"
+  shift 1
+
+  case $command in
+  "run")
+    run
+    ;;
+  "deploy")
+    deploy
+    ;;
+  "deploy-bridge")
+    deploy-bridge
+    ;;
+  "deploy-installer")
+    deploy-installer
+    ;;
+  "make-installer")
+    make-installer
+    ;;
+  *)
+    cat <<EOF
 Usage: $0 <COMMAND>
 
 Commands: 
@@ -115,11 +115,11 @@ Commands:
     deploy-installer
     make-installer
 EOF
-            exit 1
-            ;;
-    esac
+    exit 1
+    ;;
+  esac
 }
 
 if [ "$0" == "${BASH_SOURCE[0]}" ]; then
-    main "$@"
+  main "$@"
 fi