Skip to content

Commit b4674ea

Browse files
azteca1998azteca1998
authored
Fix stuff that would break after merging cairo-rs #609. (#141)
* Fix stuff that would break after merging cairo-rs #609. * Update `Cargo.toml` with commit from `main`.
1 parent 733bfe4 commit b4674ea

File tree

6 files changed

+38
-32
lines changed

6 files changed

+38
-32
lines changed

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ default = ["pyo3/num-bigint", "pyo3/auto-initialize"]
1313

1414
[dependencies]
1515
pyo3 = { version = "0.16.5" }
16-
cairo-rs = { git = "https://github.com/lambdaclass/cairo-rs.git", rev = "3a2deadd580eef6c370a3d261379bece9731bfcf" }
16+
cairo-rs = { git = "https://github.com/lambdaclass/cairo-rs.git", rev = "4f36aaf46dea8cac158d0da5e80537388e048c01" }
1717
num-bigint = "0.4"
1818
lazy_static = "1.4.0"
1919

‎src/cairo_runner.rs‎

Lines changed: 18 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -439,7 +439,7 @@ impl PyCairoRunner {
439439
pub fn insert(&self, key: &PyRelocatable, value: PyMaybeRelocatable) -> PyResult<()> {
440440
(*self.pyvm.vm)
441441
.borrow_mut()
442-
.insert_value(key, value)
442+
.insert_value(&key.into(), value)
443443
.map_err(to_py_error)
444444
}
445445

@@ -527,7 +527,7 @@ impl PyCairoRunner {
527527
.pyvm
528528
.vm
529529
.borrow()
530-
.get_continuous_range(key, size)
530+
.get_continuous_range(&MaybeRelocatable::RelocatableValue(key.into()), size)
531531
.map_err(to_py_error)?
532532
.into_iter()
533533
.map(PyMaybeRelocatable::from)
@@ -1109,7 +1109,7 @@ mod test {
11091109
assert_eq!(
11101110
(*runner.pyvm.get_vm())
11111111
.borrow()
1112-
.get_continuous_range((0, 0), 3),
1112+
.get_continuous_range(&(0, 0).into(), 3),
11131113
Ok(vec![
11141114
bigint!(3).into(),
11151115
bigint!(4).into(),
@@ -1138,7 +1138,7 @@ mod test {
11381138
assert_eq!(
11391139
(*runner.pyvm.get_vm())
11401140
.borrow()
1141-
.get_continuous_range((0, 0), 2),
1141+
.get_continuous_range(&(0, 0).into(), 2),
11421142
Ok(vec![bigint!(3).into(), bigint!(4).into(),]),
11431143
);
11441144
}
@@ -1268,7 +1268,7 @@ mod test {
12681268

12691269
assert_eq!(
12701270
vm_ref
1271-
.get_maybe((0, 0))
1271+
.get_maybe(&Relocatable::from((0, 0)))
12721272
.unwrap()
12731273
.unwrap()
12741274
.get_int_ref()
@@ -1277,7 +1277,7 @@ mod test {
12771277
);
12781278
assert_eq!(
12791279
vm_ref
1280-
.get_maybe((0, 1))
1280+
.get_maybe(&Relocatable::from((0, 1)))
12811281
.unwrap()
12821282
.unwrap()
12831283
.get_int_ref()
@@ -1286,7 +1286,7 @@ mod test {
12861286
);
12871287

12881288
let relocatable = vm_ref
1289-
.get_maybe((0, 2))
1289+
.get_maybe(&Relocatable::from((0, 2)))
12901290
.unwrap()
12911291
.unwrap()
12921292
.get_relocatable()
@@ -1304,17 +1304,17 @@ mod test {
13041304
);
13051305
assert_eq!(
13061306
vm_ref
1307-
.get_maybe(&relocatable + 1)
1307+
.get_maybe(&(&relocatable + 1))
13081308
.unwrap()
13091309
.unwrap()
13101310
.get_int_ref()
13111311
.unwrap(),
13121312
&bigint!(4),
13131313
);
1314-
assert!(vm_ref.get_maybe(&relocatable + 2).unwrap().is_none());
1314+
assert!(vm_ref.get_maybe(&(&relocatable + 2)).unwrap().is_none());
13151315

13161316
let relocatable = vm_ref
1317-
.get_maybe((0, 3))
1317+
.get_maybe(&Relocatable::from((0, 3)))
13181318
.unwrap()
13191319
.unwrap()
13201320
.get_relocatable()
@@ -1332,16 +1332,19 @@ mod test {
13321332
);
13331333
assert_eq!(
13341334
vm_ref
1335-
.get_maybe(&relocatable + 1)
1335+
.get_maybe(&(&relocatable + 1))
13361336
.unwrap()
13371337
.unwrap()
13381338
.get_int_ref()
13391339
.unwrap(),
13401340
&bigint!(6),
13411341
);
1342-
assert!(vm_ref.get_maybe(&relocatable + 2).unwrap().is_none());
1342+
assert!(vm_ref.get_maybe(&(&relocatable + 2)).unwrap().is_none());
13431343

1344-
assert!(vm_ref.get_maybe((0, 4)).unwrap().is_none());
1344+
assert!(vm_ref
1345+
.get_maybe(&Relocatable::from((0, 4)))
1346+
.unwrap()
1347+
.is_none());
13451348
});
13461349
}
13471350

@@ -1455,8 +1458,8 @@ mod test {
14551458
let mut vm = (*runner.pyvm.vm).borrow_mut();
14561459
let ptr = vm.add_memory_segment();
14571460
vm.load_data(
1458-
&ptr,
1459-
[
1461+
&(&ptr).into(),
1462+
vec![
14601463
bigint!(1).into(),
14611464
bigint!(2).into(),
14621465
bigint!(3).into(),

‎src/ids.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ impl PyTypedId {
167167
let vm = self.vm.borrow();
168168
Ok(match member.cairo_type.as_str() {
169169
"felt" | "felt*" => vm
170-
.get_maybe(&self.hint_value + member.offset)
170+
.get_maybe(&(&self.hint_value + member.offset))
171171
.map_err(to_py_error)?
172172
.map(|x| PyMaybeRelocatable::from(x).to_object(py))
173173
.unwrap_or_else(|| py.None()),
@@ -375,11 +375,11 @@ memory[fp+2] = ids.CONST
375375
assert_eq!(py_result.map_err(to_vm_error), Ok(()));
376376
//Check ids.a is now at memory[fp]
377377
assert_eq!(
378-
vm.vm.borrow().get_maybe((1, 0)),
378+
vm.vm.borrow().get_maybe(&Relocatable::from((1, 0))),
379379
Ok(Some(MaybeRelocatable::from(Into::<BigInt>::into(2_i32))))
380380
);
381381
assert_eq!(
382-
vm.vm.borrow().get_maybe((1, 2)),
382+
vm.vm.borrow().get_maybe(&Relocatable::from((1, 2))),
383383
Ok(Some(MaybeRelocatable::from(Into::<BigInt>::into(3))))
384384
);
385385
});
@@ -439,7 +439,7 @@ memory[fp+2] = ids.CONST
439439
assert_eq!(py_result.map_err(to_vm_error), Ok(()));
440440
//Check ids.a now contains memory[fp]
441441
assert_eq!(
442-
vm.vm.borrow().get_maybe((1, 1)),
442+
vm.vm.borrow().get_maybe(&Relocatable::from((1, 1))),
443443
Ok(Some(MaybeRelocatable::from(bigint!(2))))
444444
);
445445
});

‎src/memory.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ impl PyMemory {
6262
Ok(self
6363
.vm
6464
.borrow()
65-
.get_continuous_range(MaybeRelocatable::from(addr), size)
65+
.get_continuous_range(&MaybeRelocatable::from(addr), size)
6666
.map_err(|_| PyTypeError::new_err(MEMORY_GET_RANGE_ERROR_MSG))?
6767
.into_iter()
6868
.map(Into::<PyMaybeRelocatable>::into)

‎src/memory_segments.rs‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ impl PySegmentManager {
102102
mod test {
103103
use super::PySegmentManager;
104104
use crate::{memory::PyMemory, relocatable::PyMaybeRelocatable, vm_core::PyVM};
105-
use cairo_rs::bigint;
105+
use cairo_rs::{bigint, types::relocatable::Relocatable};
106106
use num_bigint::{BigInt, Sign};
107107
use pyo3::{Python, ToPyObject};
108108

@@ -142,7 +142,7 @@ mod test {
142142

143143
assert_eq!(
144144
vm_ref
145-
.get_maybe((0, 0))
145+
.get_maybe(&Relocatable::from((0, 0)))
146146
.unwrap()
147147
.unwrap()
148148
.get_int_ref()
@@ -151,7 +151,7 @@ mod test {
151151
);
152152
assert_eq!(
153153
vm_ref
154-
.get_maybe((0, 1))
154+
.get_maybe(&Relocatable::from((0, 1)))
155155
.unwrap()
156156
.unwrap()
157157
.get_int_ref()
@@ -160,7 +160,7 @@ mod test {
160160
);
161161

162162
let relocatable = vm_ref
163-
.get_maybe((0, 2))
163+
.get_maybe(&Relocatable::from((0, 2)))
164164
.unwrap()
165165
.unwrap()
166166
.get_relocatable()
@@ -178,17 +178,17 @@ mod test {
178178
);
179179
assert_eq!(
180180
vm_ref
181-
.get_maybe(&relocatable + 1)
181+
.get_maybe(&(&relocatable + 1))
182182
.unwrap()
183183
.unwrap()
184184
.get_int_ref()
185185
.unwrap(),
186186
&bigint!(4),
187187
);
188-
assert!(vm_ref.get_maybe(&relocatable + 2).unwrap().is_none());
188+
assert!(vm_ref.get_maybe(&(&relocatable + 2)).unwrap().is_none());
189189

190190
let relocatable = vm_ref
191-
.get_maybe((0, 3))
191+
.get_maybe(&Relocatable::from((0, 3)))
192192
.unwrap()
193193
.unwrap()
194194
.get_relocatable()
@@ -206,16 +206,19 @@ mod test {
206206
);
207207
assert_eq!(
208208
vm_ref
209-
.get_maybe(&relocatable + 1)
209+
.get_maybe(&(&relocatable + 1))
210210
.unwrap()
211211
.unwrap()
212212
.get_int_ref()
213213
.unwrap(),
214214
&bigint!(6),
215215
);
216-
assert!(vm_ref.get_maybe(&relocatable + 2).unwrap().is_none());
216+
assert!(vm_ref.get_maybe(&(&relocatable + 2)).unwrap().is_none());
217217

218-
assert!(vm_ref.get_maybe((0, 4)).unwrap().is_none());
218+
assert!(vm_ref
219+
.get_maybe(&Relocatable::from((0, 4)))
220+
.unwrap()
221+
.is_none());
219222
});
220223
}
221224

‎src/vm_core.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ mod test {
358358
Ok(())
359359
);
360360
assert_eq!(
361-
vm.vm.borrow().get_maybe((1, 2)),
361+
vm.vm.borrow().get_maybe(&Relocatable::from((1, 2))),
362362
Ok(Some(MaybeRelocatable::from(bigint!(2))))
363363
);
364364
}

0 commit comments

Comments
 (0)