Merge pull request #1705 from matter-labs/il-refactor-prover-cli-stat…

…us-cmd

prover/prover_cli/src/cli.rs

@@ -1,6 +1,6 @@
 use clap::{command, Parser, Subcommand};
 
-use crate::commands::{get_file_info, jobs_status};
+use crate::commands::{self, get_file_info, status};
 
 pub const VERSION_STRING: &str = env!("CARGO_PKG_VERSION");
 
@@ -14,14 +14,15 @@ struct ProverCLI {
 #[derive(Subcommand)]
 enum ProverCommand {
     FileInfo(get_file_info::Args),
-    StatusJobs(jobs_status::Args),
+    #[command(subcommand)]
+    Status(commands::StatusCommand),
 }
 
 pub async fn start() -> anyhow::Result<()> {
     let ProverCLI { command } = ProverCLI::parse();
     match command {
         ProverCommand::FileInfo(args) => get_file_info::run(args).await?,
-        ProverCommand::StatusJobs(args) => jobs_status::run(args).await?,
+        ProverCommand::Status(status_cmd) => status::run(status_cmd).await?,
     };
 
     Ok(())

prover/prover_cli/src/commands/mod.rs

@@ -1,2 +1,10 @@
+use clap::Subcommand;
+use status::jobs;
+
 pub(crate) mod get_file_info;
-pub(crate) mod jobs_status;
+pub(crate) mod status;
+
+#[derive(Subcommand)]
+pub(crate) enum StatusCommand {
+    Jobs(jobs::Args),
+}

prover/prover_cli/src/commands/jobs_status.rs → prover/prover_cli/src/commands/status/jobs.rs

@@ -13,27 +13,6 @@ pub(crate) struct Args {
     verbose: bool,
 }
 
-fn pretty_print_job_status(
-    l1_batch_number: &L1BatchNumber,
-    statistics: &JobCountStatistics,
-    verbose: bool,
-) {
-    let total_jobs =
-        statistics.queued + statistics.in_progress + statistics.failed + statistics.successful;
-    let progress = (statistics.successful as f32 / total_jobs as f32) * 100.0;
-    println!("Batch number: {}", l1_batch_number);
-    println!(
-        "Progress: {:.2}% ({}/{})",
-        progress, statistics.successful, total_jobs
-    );
-    if verbose {
-        println!("In progress: {}", statistics.in_progress);
-        println!("Queued: {}", statistics.in_progress);
-        println!("Successful: {}", statistics.in_progress);
-    }
-    println!("Failed: {}", statistics.failed);
-}
-
 pub(crate) async fn run(args: Args) -> anyhow::Result<()> {
     let postgres_config = PostgresConfig::from_env().context("PostgresConfig::from_env()")?;
 
@@ -61,3 +40,24 @@ pub(crate) async fn run(args: Args) -> anyhow::Result<()> {
     }
     Ok(())
 }
+
+fn pretty_print_job_status(
+    l1_batch_number: &L1BatchNumber,
+    statistics: &JobCountStatistics,
+    verbose: bool,
+) {
+    let total_jobs =
+        statistics.queued + statistics.in_progress + statistics.failed + statistics.successful;
+    let progress = (statistics.successful as f32 / total_jobs as f32) * 100.0;
+    println!("Batch number: {}", l1_batch_number);
+    println!(
+        "Progress: {:.2}% ({}/{})",
+        progress, statistics.successful, total_jobs
+    );
+    if verbose {
+        println!("In progress: {}", statistics.in_progress);
+        println!("Queued: {}", statistics.in_progress);
+        println!("Successful: {}", statistics.in_progress);
+    }
+    println!("Failed: {}", statistics.failed);
+}

prover/prover_cli/src/commands/status/mod.rs

@@ -0,0 +1,9 @@
+use super::StatusCommand;
+
+pub(crate) mod jobs;
+
+pub(crate) async fn run(status_cmd: StatusCommand) -> anyhow::Result<()> {
+    match status_cmd {
+        StatusCommand::Jobs(args) => jobs::run(args).await,
+    }
+}

prover/prover_cli/src/main.rs

@@ -3,6 +3,8 @@ use prover_cli::cli;
 #[tokio::main]
 async fn main() {
     env_logger::builder()
+        .filter_module("zksync_db_connection::connection_pool", log::LevelFilter::Off)
+        .filter_module("sqlx::query", log::LevelFilter::Off)
         .filter_level(log::LevelFilter::Debug)
         .init();