Skip to content

Commit a96faf3

Browse files
update_logs_in_stwo_run_and_prove
1 parent 97fb983 commit a96faf3

File tree

3 files changed

+15
-9
lines changed

3 files changed

+15
-9
lines changed

.github/workflows/upload_artifacts_workflow.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name: Upload-Artifacts
33
on:
44
push:
55
branches:
6-
- main
6+
- nitsan/update_logs_in_stwo_run_and_prove
77

88
jobs:
99
artifacts-push:

crates/stwo_run_and_prove/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ cairo-vm.workspace = true
88
clap.workspace = true
99
thiserror.workspace = true
1010
cairo-program-runner-lib.workspace = true
11+
log.workspace = true
1112
stwo-cairo-adapter.workspace = true
1213
stwo_cairo_prover.workspace = true
1314
stwo_cairo_utils.workspace = true

crates/stwo_run_and_prove/src/main.rs

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,10 @@ use clap::Parser;
1313
#[cfg(test)]
1414
use mockall::automock;
1515
use serde::Serialize;
16-
use std::env;
1716
use std::fs;
1817
use std::io::Write;
1918
use std::path::PathBuf;
19+
use std::process::ExitCode;
2020
use stwo_cairo_adapter::ProverInput;
2121
use stwo_cairo_adapter::adapter::adapter;
2222
use stwo_cairo_adapter::vm_import::VmImportError;
@@ -32,9 +32,10 @@ use stwo_cairo_prover::stwo::prover::ProvingError;
3232
use stwo_cairo_prover::stwo::prover::backend::BackendForChannel;
3333
use stwo_cairo_prover::stwo::prover::backend::simd::SimdBackend;
3434
use stwo_cairo_serialize::CairoSerialize;
35+
use stwo_cairo_utils::binary_utils::run_binary;
3536
use stwo_cairo_utils::file_utils::{IoErrorWithPath, create_file, read_to_string};
3637
use thiserror::Error;
37-
use tracing::{error, info, warn};
38+
use tracing::{Level, error, info, span, warn};
3839

3940
static PROOF_PREFIX: &str = "proof_";
4041
static SUCCESS_SUFFIX: &str = "_success";
@@ -71,7 +72,7 @@ struct Args {
7172
// "n_queries": 70
7273
// }
7374
// },
74-
// "preprocessed_trace": "canonical_without_pedersen"
75+
// "preprocessed_trace": "canonical"
7576
// }
7677
//
7778
// Default parameters are chosen to ensure 96 bits of security.
@@ -174,11 +175,15 @@ struct ProveConfig {
174175
prover_params_json: Option<PathBuf>,
175176
}
176177

177-
fn main() -> Result<(), StwoRunAndProveError> {
178-
let args = match Args::try_parse_from(env::args()) {
179-
Ok(args) => args,
180-
Err(err) => err.exit(),
181-
};
178+
fn main() -> ExitCode {
179+
run_binary(run, "stwo_run_and_prove")
180+
}
181+
182+
fn run(args: impl Iterator<Item = String>) -> Result<(), StwoRunAndProveError> {
183+
let _span = span!(Level::INFO, "stwo run and prove").entered();
184+
log::info!("log::info!"); // TODO: remove
185+
info!("info!"); // TODO: remove
186+
let args = Args::try_parse_from(args)?;
182187
let prove_config = ProveConfig {
183188
verify: args.verify,
184189
proofs_dir: args.proofs_dir,

0 commit comments

Comments
 (0)