From 0fe173bd8b337637f457542e0d675cf42b6ecc65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mat=C3=ADas=20Ignacio=20Gonz=C3=A1lez?= Date: Mon, 12 Aug 2024 12:48:19 +0300 Subject: [PATCH] feat(zk_toolbox): Add zk_supervisor test prover command (#2614) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## What ❔ Add zk_supervisor test prover command --- .../zk_supervisor/src/commands/test/mod.rs | 8 ++++++-- .../zk_supervisor/src/commands/test/prover.rs | 17 +++++++++++++++++ zk_toolbox/crates/zk_supervisor/src/messages.rs | 2 ++ 3 files changed, 25 insertions(+), 2 deletions(-) create mode 100644 zk_toolbox/crates/zk_supervisor/src/commands/test/prover.rs diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs index b66a7eaefc4c..de374c91bb94 100644 --- a/zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs +++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/mod.rs @@ -3,12 +3,13 @@ use clap::Subcommand; use xshell::Shell; use crate::messages::{ - MSG_INTEGRATION_TESTS_ABOUT, MSG_RECOVERY_TEST_ABOUT, MSG_REVERT_TEST_ABOUT, - MSG_UPGRADE_TEST_ABOUT, + MSG_INTEGRATION_TESTS_ABOUT, MSG_PROVER_TEST_ABOUT, MSG_RECOVERY_TEST_ABOUT, + MSG_REVERT_TEST_ABOUT, MSG_UPGRADE_TEST_ABOUT, }; mod args; mod integration; +mod prover; mod recovery; mod revert; mod upgrade; @@ -23,6 +24,8 @@ pub enum TestCommands { Recovery(RecoveryArgs), #[clap(about = MSG_UPGRADE_TEST_ABOUT, alias = "u")] Upgrade, + #[clap(about = MSG_PROVER_TEST_ABOUT, alias = "p")] + Prover, } pub fn run(shell: &Shell, args: TestCommands) -> anyhow::Result<()> { @@ -31,5 +34,6 @@ 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::Prover => prover::run(shell), } } diff --git a/zk_toolbox/crates/zk_supervisor/src/commands/test/prover.rs b/zk_toolbox/crates/zk_supervisor/src/commands/test/prover.rs new file mode 100644 index 000000000000..3d8131a180c3 --- /dev/null +++ b/zk_toolbox/crates/zk_supervisor/src/commands/test/prover.rs @@ -0,0 +1,17 @@ +use common::{cmd::Cmd, logger}; +use config::EcosystemConfig; +use xshell::{cmd, Shell}; + +use crate::messages::MSG_PROVER_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.join("prover")); + + Cmd::new(cmd!(shell, "cargo test --release --workspace --locked")) + .with_force_run() + .run()?; + + logger::outro(MSG_PROVER_TEST_SUCCESS); + Ok(()) +} diff --git a/zk_toolbox/crates/zk_supervisor/src/messages.rs b/zk_toolbox/crates/zk_supervisor/src/messages.rs index 116775072594..7bb056acb0db 100644 --- a/zk_toolbox/crates/zk_supervisor/src/messages.rs +++ b/zk_toolbox/crates/zk_supervisor/src/messages.rs @@ -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_PROVER_TEST_ABOUT: &str = "Run prover tests"; +pub(super) const MSG_PROVER_TEST_SUCCESS: &str = "Prover tests ran successfully"; // Integration tests related messages pub(super) fn msg_integration_tests_run(external_node: bool) -> String {