move prover input info to a new seperate file

Author: Stavbe

cairo-vm-cli/src/main.rs

@@ -4,6 +4,7 @@ use bincode::enc::write::Writer;
 use cairo_vm::air_public_input::PublicInputError;
 use cairo_vm::cairo_run::{self, EncodeTraceError};
 use cairo_vm::hint_processor::builtin_hint_processor::builtin_hint_processor_definition::BuiltinHintProcessor;
+use cairo_vm::prover_input_info::ProverInputInfoError;
 #[cfg(feature = "with_tracer")]
 use cairo_vm::serde::deserialize_program::DebugInfo;
 use cairo_vm::types::layout::CairoLayoutParams;
@@ -14,7 +15,7 @@ use cairo_vm::vm::errors::vm_errors::VirtualMachineError;
 use cairo_vm::vm::runners::cairo_pie::CairoPie;
 #[cfg(feature = "with_tracer")]
 use cairo_vm::vm::runners::cairo_runner::CairoRunner;
-use cairo_vm::vm::runners::cairo_runner::{ProverInputInfoError, RunResources};
+use cairo_vm::vm::runners::cairo_runner::RunResources;
 #[cfg(feature = "with_tracer")]
 use cairo_vm_tracer::error::trace_data_errors::TraceDataError;
 #[cfg(feature = "with_tracer")]

vm/src/lib.rs

@@ -60,6 +60,7 @@ pub mod cairo_run;
 pub mod hint_processor;
 pub mod math_utils;
 pub mod program_hash;
+pub mod prover_input_info;
 pub mod serde;
 pub mod typed_operations;
 pub mod types;

vm/src/prover_input_info.rs

@@ -0,0 +1,43 @@
+use crate::stdlib::{collections::BTreeMap, prelude::*};
+use crate::types::builtin_name::BuiltinName;
+use crate::types::relocatable::MaybeRelocatable;
+use crate::vm::trace::trace_entry::TraceEntry;
+use serde::Deserialize;
+use serde::Serialize;
+use thiserror::Error;
+
+//* ----------------------
+//*   ProverInputInfo
+//* ----------------------
+/// This struct contains all relevant data for the prover.
+/// All addresses are relocatable.
+#[derive(Deserialize, Serialize, PartialEq)]
+pub struct ProverInputInfo {
+    /// A vector of trace entries, i.e. pc, ap, fp, where pc is relocatable.
+    pub relocatable_trace: Vec<TraceEntry>,
+    /// A vector of segments, where each segment is a vector of maybe relocatable values or holes (`None`).
+    pub relocatable_memory: Vec<Vec<Option<MaybeRelocatable>>>,
+    /// A map from segment index to a vector of offsets within the segment, representing the public memory addresses.
+    pub public_memory_offsets: BTreeMap<usize, Vec<usize>>,
+    /// A map from the builtin segment index into its name.
+    pub builtins_segments: BTreeMap<usize, BuiltinName>,
+}
+
+impl ProverInputInfo {
+    pub fn serialize_json(&self) -> Result<String, ProverInputInfoError> {
+        serde_json::to_string_pretty(&self).map_err(ProverInputInfoError::from)
+    }
+    pub fn serialize(&self) -> Result<Vec<u8>, ProverInputInfoError> {
+        bincode::serde::encode_to_vec(self, bincode::config::standard())
+            .map_err(ProverInputInfoError::from)
+    }
+}
+
+// TODO(Stav): add TraceNotEnabled error.
+#[derive(Debug, Error)]
+pub enum ProverInputInfoError {
+    #[error("Failed to (de)serialize data using bincode")]
+    SerdeBincode(#[from] bincode::error::EncodeError),
+    #[error("Failed to (de)serialize data using json")]
+    SerdeJson(#[from] serde_json::Error),
+}

vm/src/vm/runners/cairo_runner.rs

@@ -11,13 +11,14 @@ use crate::{
     types::{builtin_name::BuiltinName, layout::CairoLayoutParams, layout_name::LayoutName},
     vm::{
         runners::builtin_runner::SegmentArenaBuiltinRunner,
-        trace::trace_entry::{relocate_trace_register, RelocatedTraceEntry, TraceEntry},
+        trace::trace_entry::{relocate_trace_register, RelocatedTraceEntry},
     },
     Felt252,
 };
 
 use crate::{
     hint_processor::hint_processor_definition::{HintProcessor, HintReference},
+    prover_input_info::ProverInputInfo,
     types::{
         errors::{math_errors::MathError, program_errors::ProgramError},
         exec_scope::ExecutionScopes,
@@ -48,7 +49,6 @@ use crate::{
 use num_integer::div_rem;
 use num_traits::{ToPrimitive, Zero};
 use serde::{Deserialize, Serialize};
-use thiserror::Error;
 
 use super::{builtin_runner::ModBuiltinRunner, cairo_pie::CairoPieAdditionalData};
 use super::{
@@ -1545,43 +1545,6 @@ impl CairoRunner {
     }
 }
 
-// TODO(Stav): move to specified file.
-//* ----------------------
-//*   ProverInputInfo
-//* ----------------------
-/// This struct contains all relevant data for the prover.
-/// All addresses are relocatable.
-#[derive(Deserialize, Serialize, PartialEq)]
-pub struct ProverInputInfo {
-    /// A vector of trace entries, i.e. pc, ap, fp, where pc is relocatable.
-    pub relocatable_trace: Vec<TraceEntry>,
-    /// A vector of segments, where each segment is a vector of maybe relocatable values or holes (`None`).
-    pub relocatable_memory: Vec<Vec<Option<MaybeRelocatable>>>,
-    /// A map from segment index to a vector of offsets within the segment, representing the public memory addresses.
-    pub public_memory_offsets: BTreeMap<usize, Vec<usize>>,
-    /// A map from the builtin segment index into its name.
-    pub builtins_segments: BTreeMap<usize, BuiltinName>,
-}
-
-impl ProverInputInfo {
-    pub fn serialize_json(&self) -> Result<String, ProverInputInfoError> {
-        serde_json::to_string_pretty(&self).map_err(ProverInputInfoError::from)
-    }
-    pub fn serialize(&self) -> Result<Vec<u8>, ProverInputInfoError> {
-        bincode::serde::encode_to_vec(self, bincode::config::standard())
-            .map_err(ProverInputInfoError::from)
-    }
-}
-
-// TODO(Stav): add TraceNotEnabled error.
-#[derive(Debug, Error)]
-pub enum ProverInputInfoError {
-    #[error("Failed to (de)serialize data using bincode")]
-    SerdeBincode(#[from] bincode::error::EncodeError),
-    #[error("Failed to (de)serialize data using json")]
-    SerdeJson(#[from] serde_json::Error),
-}
-
 #[derive(Clone, Debug, Eq, PartialEq)]
 pub struct SegmentInfo {
     pub index: isize,