Skip to content

Commit 69c3271

Browse files
committed
add trace not enabled error
1 parent 99e1a1c commit 69c3271

File tree

3 files changed

+9
-13
lines changed

3 files changed

+9
-13
lines changed

cairo-vm-cli/src/main.rs

+4-9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ use bincode::enc::write::Writer;
44
use cairo_vm::air_public_input::PublicInputError;
55
use cairo_vm::cairo_run::{self, EncodeTraceError};
66
use cairo_vm::hint_processor::builtin_hint_processor::builtin_hint_processor_definition::BuiltinHintProcessor;
7+
use cairo_vm::prover_input_info::ProverInputInfoError;
78
#[cfg(feature = "with_tracer")]
89
use cairo_vm::serde::deserialize_program::DebugInfo;
910
use cairo_vm::types::layout::CairoLayoutParams;
@@ -14,7 +15,7 @@ use cairo_vm::vm::errors::vm_errors::VirtualMachineError;
1415
use cairo_vm::vm::runners::cairo_pie::CairoPie;
1516
#[cfg(feature = "with_tracer")]
1617
use cairo_vm::vm::runners::cairo_runner::CairoRunner;
17-
use cairo_vm::vm::runners::cairo_runner::{ProverInputInfoError, RunResources};
18+
use cairo_vm::vm::runners::cairo_runner::RunResources;
1819
#[cfg(feature = "with_tracer")]
1920
use cairo_vm_tracer::error::trace_data_errors::TraceDataError;
2021
#[cfg(feature = "with_tracer")]
@@ -246,19 +247,13 @@ fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
246247
}
247248

248249
if let Some(path) = args.prover_input_info {
249-
let prover_input_info = cairo_runner.get_prover_input_info().map_err(|error| {
250-
eprintln!("{error}");
251-
CairoRunError::Runner(error)
252-
})?;
250+
let prover_input_info = cairo_runner.get_prover_input_info()?;
253251
let bytes = prover_input_info.serialize()?;
254252
std::fs::write(path, bytes)?;
255253
}
256254

257255
if let Some(path) = args.prover_input_info_json {
258-
let prover_input_info = cairo_runner.get_prover_input_info().map_err(|error| {
259-
eprintln!("{error}");
260-
CairoRunError::Runner(error)
261-
})?;
256+
let prover_input_info = cairo_runner.get_prover_input_info()?;
262257
let json = prover_input_info.serialize_json()?;
263258
std::fs::write(path, json)?;
264259
}

vm/src/prover_input_info.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,12 @@ impl ProverInputInfo {
3333
}
3434
}
3535

36-
// TODO(Stav): add TraceNotEnabled error.
3736
#[derive(Debug, Error)]
3837
pub enum ProverInputInfoError {
3938
#[error("Failed to (de)serialize data using bincode")]
4039
SerdeBincode(#[from] bincode::error::EncodeError),
4140
#[error("Failed to (de)serialize data using json")]
4241
SerdeJson(#[from] serde_json::Error),
42+
#[error("Trace was not enabled")]
43+
TraceNotEnabled,
4344
}

vm/src/vm/runners/cairo_runner.rs

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ use crate::{
1818

1919
use crate::{
2020
hint_processor::hint_processor_definition::{HintProcessor, HintReference},
21-
prover_input_info::ProverInputInfo,
21+
prover_input_info::{ProverInputInfo, ProverInputInfoError},
2222
types::{
2323
errors::{math_errors::MathError, program_errors::ProgramError},
2424
exec_scope::ExecutionScopes,
@@ -1491,12 +1491,12 @@ impl CairoRunner {
14911491

14921492
/// Collects relevant information for the prover from the runner, including the
14931493
/// relocatable form of the trace, memory, public memory, and built-ins.
1494-
pub fn get_prover_input_info(&self) -> Result<ProverInputInfo, RunnerError> {
1494+
pub fn get_prover_input_info(&self) -> Result<ProverInputInfo, ProverInputInfoError> {
14951495
let relocatable_trace = self
14961496
.vm
14971497
.trace
14981498
.as_ref()
1499-
.ok_or(RunnerError::Trace(TraceError::TraceNotEnabled))?
1499+
.ok_or(ProverInputInfoError::TraceNotEnabled)?
15001500
.clone();
15011501

15021502
let relocatable_memory = self

0 commit comments

Comments
 (0)