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

serialize program and shared data #3

Merged
merged 6 commits into from
Nov 27, 2023
Merged
Changes from 1 commit
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
Prev Previous commit
Next Next commit
fix lint and change log
  • Loading branch information
greged93 committed Nov 27, 2023
commit 9550841970a8b602673b4842d2aa8d2017859e14
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Cairo-VM Changelog

* feat: add Serialize and Deserialize derivation for Program.

#### Upcoming Changes

* BREAKING: Partially Revert `Optimize trace relocation #906` [#1492](https://github.com/lambdaclass/cairo-vm/pull/1492)
18 changes: 6 additions & 12 deletions vm/src/serde/deserialize_program.rs
Original file line number Diff line number Diff line change
@@ -225,15 +225,13 @@ fn felt_from_number<'de, D>(deserializer: D) -> Result<Option<Felt252>, D::Error
where
D: Deserializer<'de>,
{


// This value can be of 3 possible types
// Felt252, Number, None
#[derive(Serialize, Deserialize)]
#[serde(untagged)]
enum Tmp{
enum Tmp {
Felt252(Option<Number>),
SerializedFelt252(Felt252)
SerializedFelt252(Felt252),
}

let n: Tmp = Tmp::deserialize(deserializer)?;
@@ -256,18 +254,14 @@ where
"felt_from_number parse error",
)))
}
}
}
},
None => {
Ok(None)
}
None => Ok(None),
}
}
},
Tmp::SerializedFelt252 (value ) => {
Ok(Some(value))
Tmp::SerializedFelt252(value) => Ok(Some(value)),
}
}
}

fn deserialize_scientific_notation(n: Number) -> Option<Felt252> {
match n.as_f64() {