Skip to content

Commit cde7b3f

Browse files
committed
remove prover input info struct and add getters instead
1 parent 1a224f8 commit cde7b3f

File tree

4 files changed

+79
-196
lines changed

4 files changed

+79
-196
lines changed

cairo-vm-cli/src/main.rs

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ 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;
87
#[cfg(feature = "with_tracer")]
98
use cairo_vm::serde::deserialize_program::DebugInfo;
109
use cairo_vm::types::layout::CairoLayoutParams;
@@ -70,10 +69,6 @@ struct Args {
7069
conflicts_with_all = ["proof_mode", "air_private_input", "air_public_input"]
7170
)]
7271
cairo_pie_output: Option<String>,
73-
#[arg(long = "prover_input_info", requires_all = ["proof_mode"])]
74-
prover_input_info: Option<String>,
75-
#[arg(long = "prover_input_info_json", requires_all = ["proof_mode"])]
76-
prover_input_info_json: Option<String>,
7772
#[arg(long = "merge_extra_segments")]
7873
merge_extra_segments: bool,
7974
#[arg(long = "allow_missing_builtins")]
@@ -107,8 +102,6 @@ enum Error {
107102
#[error(transparent)]
108103
PublicInput(#[from] PublicInputError),
109104
#[error(transparent)]
110-
ProveInputInfo(#[from] ProverInputInfoError),
111-
#[error(transparent)]
112105
#[cfg(feature = "with_tracer")]
113106
TraceData(#[from] TraceDataError),
114107
}
@@ -175,10 +168,7 @@ fn start_tracer(cairo_runner: &CairoRunner) -> Result<(), TraceDataError> {
175168
fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
176169
let args = Args::try_parse_from(args)?;
177170

178-
let trace_enabled = args.trace_file.is_some()
179-
|| args.air_public_input.is_some()
180-
|| args.prover_input_info.is_some()
181-
|| args.prover_input_info_json.is_some();
171+
let trace_enabled = args.trace_file.is_some() || args.air_public_input.is_some();
182172

183173
let cairo_layout_params = match args.cairo_layout_params_file {
184174
Some(file) => Some(CairoLayoutParams::from_file(&file)?),
@@ -195,8 +185,7 @@ fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
195185
secure_run: args.secure_run,
196186
allow_missing_builtins: args.allow_missing_builtins,
197187
dynamic_layout_params: cairo_layout_params,
198-
disable_trace_padding: args.prover_input_info.is_some()
199-
|| args.prover_input_info_json.is_some(),
188+
disable_trace_padding: false,
200189
};
201190

202191
let mut cairo_runner = match if args.run_from_cairo_pie {
@@ -247,18 +236,6 @@ fn run(args: impl Iterator<Item = String>) -> Result<(), Error> {
247236
memory_writer.flush()?;
248237
}
249238

250-
if let Some(path) = args.prover_input_info {
251-
let prover_input_info = cairo_runner.get_prover_input_info()?;
252-
let bytes = prover_input_info.serialize()?;
253-
std::fs::write(path, bytes)?;
254-
}
255-
256-
if let Some(path) = args.prover_input_info_json {
257-
let prover_input_info = cairo_runner.get_prover_input_info()?;
258-
let json = prover_input_info.serialize_json()?;
259-
std::fs::write(path, json)?;
260-
}
261-
262239
if let Some(file_path) = args.air_public_input {
263240
let json = cairo_runner.get_air_public_input()?.serialize_json()?;
264241
std::fs::write(file_path, json)?;
@@ -382,7 +359,6 @@ mod tests {
382359
#[values(false, true)] air_public_input: bool,
383360
#[values(false, true)] air_private_input: bool,
384361
#[values(false, true)] cairo_pie_output: bool,
385-
#[values(false, true)] prover_input_info: bool,
386362
) {
387363
let mut args = vec!["cairo-vm-cli".to_string()];
388364
if let Some(layout) = layout {
@@ -413,15 +389,11 @@ mod tests {
413389
if print_output {
414390
args.extend_from_slice(&["--print_output".to_string()]);
415391
}
416-
if prover_input_info {
417-
args.extend_from_slice(&["--prover_input_info".to_string(), "/dev/null".to_string()]);
418-
}
419392

420393
args.push("../cairo_programs/proof_programs/fibonacci.json".to_string());
421394
if air_public_input && !proof_mode
422395
|| (air_private_input && (!proof_mode || !trace_file || !memory_file))
423396
|| cairo_pie_output && proof_mode
424-
|| prover_input_info && !proof_mode
425397
{
426398
assert_matches!(run(args.into_iter()), Err(_));
427399
} else {

vm/src/lib.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ pub mod cairo_run;
6060
pub mod hint_processor;
6161
pub mod math_utils;
6262
pub mod program_hash;
63-
pub mod prover_input_info;
6463
pub mod serde;
6564
pub mod typed_operations;
6665
pub mod types;

vm/src/prover_input_info.rs

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)