Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Set dynamic params as null by default on air public input #1716

Merged
merged 6 commits into from
Apr 22, 2024
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

#### Upcoming Changes

* BREAKING: Set dynamic params as null by default on air public input [#1716](https://github.com/lambdaclass/cairo-vm/pull/1716)
* `PublicInput` field `layout_params` renamed to `dynamic_params` & type changed from`&'a CairoLayout` to `()`.

* refactor(BREAKING): Use an enum to represent layout name[#1715](https://github.com/lambdaclass/cairo-vm/pull/1715)
* Add enum `LayoutName` to represent cairo layout names.
* `CairoRunConfig`, `Cairo1RunConfig` & `CairoRunner` field `layout` type changed from `String` to `LayoutName`.
Expand Down
11 changes: 2 additions & 9 deletions vm/src/air_public_input.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ use crate::{
collections::HashMap,
prelude::{String, Vec},
},
types::layout::CairoLayout,
vm::{
errors::{trace_errors::TraceError, vm_errors::VirtualMachineError},
trace::trace_entry::RelocatedTraceEntry,
Expand Down Expand Up @@ -98,16 +97,14 @@ pub struct PublicInput<'a> {
pub n_steps: usize,
pub memory_segments: HashMap<&'a str, MemorySegmentAddresses>,
pub public_memory: Vec<PublicMemoryEntry>,
#[serde(rename = "dynamic_params")]
#[serde(skip_deserializing)] // This is set to None by default so we can skip it
layout_params: Option<&'a CairoLayout>,
dynamic_params: (),
}

impl<'a> PublicInput<'a> {
pub fn new(
memory: &[Option<Felt252>],
layout: &'a str,
dyn_layout_params: Option<&'a CairoLayout>,
public_memory_addresses: &[(usize, usize)],
memory_segment_addresses: HashMap<&'static str, (usize, usize)>,
trace: &[RelocatedTraceEntry],
Expand Down Expand Up @@ -136,7 +133,7 @@ impl<'a> PublicInput<'a> {

Ok(PublicInput {
layout,
layout_params: dyn_layout_params,
dynamic_params: (),
rc_min,
rc_max,
n_steps: trace.len(),
Expand Down Expand Up @@ -220,9 +217,5 @@ mod tests {
public_input.public_memory,
deserialized_public_input.public_memory
);
assert!(
public_input.layout_params.is_none()
&& deserialized_public_input.layout_params.is_none()
);
}
}
6 changes: 0 additions & 6 deletions vm/src/vm/runners/cairo_runner.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1444,15 +1444,9 @@ impl CairoRunner {
&self,
vm: &VirtualMachine,
) -> Result<PublicInput, PublicInputError> {
let dyn_layout = match self.layout.name {
LayoutName::dynamic => Some(self.get_layout()),
_ => None,
};

PublicInput::new(
&self.relocated_memory,
self.layout.name.to_str(),
dyn_layout,
&vm.get_public_memory_addresses()?,
self.get_memory_segment_addresses(vm)?,
self.relocated_trace
Expand Down
Loading