Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(zk_toolbox): Add zk_supervisor test l1 contracts command #2613

Merged
merged 4 commits into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,9 @@ impl EcosystemCreateArgs {
}
});

let l1_network = self.l1_network.unwrap_or_else(|| {
PromptSelect::new(MSG_L1_NETWORK_PROMPT, L1Network::iter()).ask()
});
let l1_network = self
.l1_network
.unwrap_or_else(|| PromptSelect::new(MSG_L1_NETWORK_PROMPT, L1Network::iter()).ask());
// Make the only chain as a default one
self.chain.set_as_default = Some(true);

Expand Down
18 changes: 18 additions & 0 deletions zk_toolbox/crates/zk_supervisor/src/commands/test/l1_contracts.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
use common::{cmd::Cmd, logger};
use config::EcosystemConfig;
use xshell::{cmd, Shell};

use crate::messages::MSG_L1_CONTRACTS_TEST_SUCCESS;

pub fn run(shell: &Shell) -> anyhow::Result<()> {
let ecosystem = EcosystemConfig::from_file(shell)?;
let _dir_guard = shell.push_dir(&ecosystem.link_to_code);

Cmd::new(cmd!(shell, "yarn l1-contracts test"))
.with_force_run()
.run()?;

logger::outro(MSG_L1_CONTRACTS_TEST_SUCCESS);

Ok(())
}
8 changes: 6 additions & 2 deletions zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@ use clap::Subcommand;
use xshell::Shell;

use crate::messages::{
MSG_INTEGRATION_TESTS_ABOUT, MSG_PROVER_TEST_ABOUT, MSG_RECOVERY_TEST_ABOUT,
MSG_REVERT_TEST_ABOUT, MSG_UPGRADE_TEST_ABOUT,
MSG_INTEGRATION_TESTS_ABOUT, MSG_L1_CONTRACTS_ABOUT, MSG_PROVER_TEST_ABOUT,
MSG_RECOVERY_TEST_ABOUT, MSG_REVERT_TEST_ABOUT, MSG_UPGRADE_TEST_ABOUT,
};

mod args;
mod integration;
mod l1_contracts;
mod prover;
mod recovery;
mod revert;
Expand All @@ -24,6 +25,8 @@ pub enum TestCommands {
Recovery(RecoveryArgs),
#[clap(about = MSG_UPGRADE_TEST_ABOUT, alias = "u")]
Upgrade,
#[clap(about = MSG_L1_CONTRACTS_ABOUT, alias = "l1")]
L1Contracts,
#[clap(about = MSG_PROVER_TEST_ABOUT, alias = "p")]
Prover,
}
Expand All @@ -34,6 +37,7 @@ pub fn run(shell: &Shell, args: TestCommands) -> anyhow::Result<()> {
TestCommands::Revert(args) => revert::run(shell, args),
TestCommands::Recovery(args) => recovery::run(shell, args),
TestCommands::Upgrade => upgrade::run(shell),
TestCommands::L1Contracts => l1_contracts::run(shell),
TestCommands::Prover => prover::run(shell),
}
}
2 changes: 2 additions & 0 deletions zk_toolbox/crates/zk_supervisor/src/messages.rs
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ pub(super) const MSG_UPGRADE_TEST_ABOUT: &str = "Run upgrade tests";
pub(super) const MSG_TESTS_EXTERNAL_NODE_HELP: &str = "Run tests for external node";
pub(super) const MSG_TESTS_RECOVERY_SNAPSHOT_HELP: &str =
"Run recovery from a snapshot instead of genesis";
pub(super) const MSG_L1_CONTRACTS_ABOUT: &str = "Run L1 contracts tests";
pub(super) const MSG_L1_CONTRACTS_TEST_SUCCESS: &str = "L1 contracts tests ran successfully";
pub(super) const MSG_PROVER_TEST_ABOUT: &str = "Run prover tests";
pub(super) const MSG_PROVER_TEST_SUCCESS: &str = "Prover tests ran successfully";

Expand Down
Loading