Skip to content
This repository has been archived by the owner on Aug 28, 2024. It is now read-only.

Commit

Permalink
fix: zk-toolbox integration tests ci (matter-labs#2226)
Browse files Browse the repository at this point in the history
## What ❔

- Improves zk-toolbox integration tests CI adding missing arguments from
typescript core CI


## Why ❔

<!-- Why are these changes done? What goal do they contribute to? What
are the principles behind them? -->
<!-- Example: PR templates ensure PR reviewers, observers, and future
iterators are in context about the evolution of repos. -->

## Checklist

<!-- Check your PR fulfills the following items. -->
<!-- For draft PRs check the boxes as you complete them. -->

- [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`.
  • Loading branch information
aon authored and gabrieldemian committed Jun 21, 2024
1 parent 4e86dfc commit 0d35161
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 2 deletions.
4 changes: 3 additions & 1 deletion .github/workflows/ci-zk-toolbox-reusable.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ jobs:
- name: Start services
run: |
ci_localnet_up
ci_run sccache --start-server
- name: Build
run: |
Expand Down Expand Up @@ -75,6 +76,7 @@ jobs:
- name: Start services
run: |
ci_localnet_up
ci_run sccache --start-server
- name: Initialize ecosystem
run: |
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,17 @@
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 {
#[clap(long, help = MSG_SERVER_COMPONENTS_HELP)]
pub components: Option<Vec<String>>,
#[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<String>,
}
2 changes: 2 additions & 0 deletions zk_toolbox/crates/zk_inception/src/messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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...";
Expand Down

0 comments on commit 0d35161

Please sign in to comment.