fix conflicts

lambdaclass · Nov 9, 2023 · 5e73400 · 5e73400
1 parent b405d95
commit 5e73400
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 13 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -15,15 +15,15 @@ exclude = ["ensure-no_std"]
 resolver = "2"
 
 [workspace.package]
-version = "0.8.2"
+version = "0.8.7"
 edition = "2021"
 license = "Apache-2.0"
 repository = "https://github.com/lambdaclass/cairo-vm/"
 readme = "README.md"
 keywords = ["starknet", "cairo", "vm", "wasm", "no_std"]
 
 [workspace.dependencies]
-felt = { package = "cairo-felt", path = "./felt", version = "0.8.2", default-features = false, features = [
+felt = { package = "cairo-felt", path = "./felt", version = "0.8.7", default-features = false, features = [
     "alloc",
 ] }
 cairo-vm = { path = "./vm", version = "0.8.2", default-features = false }

diff --git a/cairo1-run/src/main.rs b/cairo1-run/src/main.rs
@@ -202,7 +202,7 @@ fn run(args: impl Iterator<Item = String>) -> Result<Vec<MaybeRelocatable>, Erro
     let footer = create_code_footer();
 
     let check_gas_usage = true;
-    let metadata = calc_metadata(&sierra_program, Default::default())?;
+    let metadata = calc_metadata(&sierra_program, Default::default(), false)?;
     let casm_program = compile(&sierra_program, &metadata, check_gas_usage)?;
 
     let instructions = chain!(
@@ -537,7 +537,7 @@ fn create_metadata(
     metadata_config: Option<MetadataComputationConfig>,
 ) -> Result<Metadata, VirtualMachineError> {
     if let Some(metadata_config) = metadata_config {
-        calc_metadata(sierra_program, metadata_config).map_err(|err| match err {
+        calc_metadata(sierra_program, metadata_config, false).map_err(|err| match err {
             MetadataError::ApChangeError(_) => VirtualMachineError::Unexpected,
             MetadataError::CostError(_) => VirtualMachineError::Unexpected,
         })