From 0d35161bbff160789ab567bad6ec9f73bd3b6a0e Mon Sep 17 00:00:00 2001 From: Agustin Aon <21188659+aon@users.noreply.github.com> Date: Mon, 17 Jun 2024 04:52:41 -0400 Subject: [PATCH] fix: zk-toolbox integration tests ci (#2226) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ - Improves zk-toolbox integration tests CI adding missing arguments from typescript core CI ## Why ❔ ## Checklist - [x] PR title corresponds to the body of PR (we generate changelog entries from PRs). - [x] Tests for the changes have been added / updated. - [x] Documentation comments have been added / updated. - [x] Code has been formatted via `zk fmt` and `zk lint`. - [x] Spellcheck has been run via `zk spellcheck`. --- .github/workflows/ci-zk-toolbox-reusable.yml | 4 +++- .../crates/zk_inception/src/commands/args/run_server.rs | 7 ++++++- zk_toolbox/crates/zk_inception/src/messages.rs | 2 ++ 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.github/workflows/ci-zk-toolbox-reusable.yml b/.github/workflows/ci-zk-toolbox-reusable.yml index c3ef46453f13..f3238566eeec 100644 --- a/.github/workflows/ci-zk-toolbox-reusable.yml +++ b/.github/workflows/ci-zk-toolbox-reusable.yml @@ -28,6 +28,7 @@ jobs: - name: Start services run: | ci_localnet_up + ci_run sccache --start-server - name: Build run: | @@ -75,6 +76,7 @@ jobs: - name: Start services run: | ci_localnet_up + ci_run sccache --start-server - name: Initialize ecosystem run: | @@ -88,7 +90,7 @@ jobs: - name: Run server run: | - ci_run zk_inception server --ignore-prerequisites &>server.log & + ci_run zk_inception server --ignore-prerequisites -a --use-node-framework --verbose &>server.log & ci_run sleep 5 - name: Run integration tests diff --git a/zk_toolbox/crates/zk_inception/src/commands/args/run_server.rs b/zk_toolbox/crates/zk_inception/src/commands/args/run_server.rs index 47ab8dc75c5d..1ec211c25f6d 100644 --- a/zk_toolbox/crates/zk_inception/src/commands/args/run_server.rs +++ b/zk_toolbox/crates/zk_inception/src/commands/args/run_server.rs @@ -1,7 +1,9 @@ use clap::Parser; use serde::{Deserialize, Serialize}; -use crate::messages::{MSG_SERVER_COMPONENTS_HELP, MSG_SERVER_GENESIS_HELP}; +use crate::messages::{ + MSG_SERVER_ADDITIONAL_ARGS_HELP, MSG_SERVER_COMPONENTS_HELP, MSG_SERVER_GENESIS_HELP, +}; #[derive(Debug, Serialize, Deserialize, Parser)] pub struct RunServerArgs { @@ -9,4 +11,7 @@ pub struct RunServerArgs { pub components: Option>, #[clap(long, help = MSG_SERVER_GENESIS_HELP)] pub genesis: bool, + #[clap(long, short)] + #[arg(trailing_var_arg = true, allow_hyphen_values = true, hide = false, help = MSG_SERVER_ADDITIONAL_ARGS_HELP)] + additional_args: Vec, } diff --git a/zk_toolbox/crates/zk_inception/src/messages.rs b/zk_toolbox/crates/zk_inception/src/messages.rs index 7221f030d415..21f051470555 100644 --- a/zk_toolbox/crates/zk_inception/src/messages.rs +++ b/zk_toolbox/crates/zk_inception/src/messages.rs @@ -148,6 +148,8 @@ pub(super) const MSG_DEPLOYING_PAYMASTER: &str = "Deploying paymaster"; /// Run server related messages pub(super) const MSG_SERVER_COMPONENTS_HELP: &str = "Components of server to run"; pub(super) const MSG_SERVER_GENESIS_HELP: &str = "Run server in genesis mode"; +pub(super) const MSG_SERVER_ADDITIONAL_ARGS_HELP: &str = + "Additional arguments that can be passed through the CLI"; /// Accept ownership related messages pub(super) const MSG_ACCEPTING_GOVERNANCE_SPINNER: &str = "Accepting governance...";