Skip to content

Commit 91fa807

Browse files
authored
Revert "Make MemorySegmentManager's memory field private (#2164)" (#2176)
This reverts commit 579c323.
1 parent c6877af commit 91fa807

File tree

2 files changed

+1
-57
lines changed

2 files changed

+1
-57
lines changed

CHANGELOG.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44

55
* feat: Add `--fill-holes` CLI flag instead of relying on `--proof-mode` [#2165](https://github.com/lambdaclass/cairo-vm/pull/2165)
66

7-
* fix: make `MemorySegmentManager`'s `memory` field private [#2164](https://github.com/lambdaclass/cairo-vm/pull/2164)
8-
97
* feat: Use BTreeMap in PIE additional data [#2162](https://github.com/lambdaclass/cairo-vm/pull/2162)
108

119
* feat: Remove prover input info struct and add getters instead [#2149](https://github.com/lambdaclass/cairo-vm/pull/2149)

vm/src/vm/vm_memory/memory_segments.rs

Lines changed: 1 addition & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
use crate::stdlib::borrow::Cow;
21
use crate::stdlib::collections::HashSet;
32
use core::cmp::max;
43
use core::fmt;
@@ -24,7 +23,7 @@ use super::memory::MemoryCell;
2423
pub struct MemorySegmentManager {
2524
pub segment_sizes: HashMap<usize, usize>,
2625
pub segment_used_sizes: Option<Vec<usize>>,
27-
pub(crate) memory: Memory,
26+
pub memory: Memory,
2827
// A map from segment index to a list of pairs (offset, page_id) that constitute the
2928
// public memory. Note that the offset is absolute (not based on the page_id).
3029
pub public_memory_offsets: HashMap<usize, Vec<(usize, usize)>>,
@@ -329,16 +328,6 @@ impl MemorySegmentManager {
329328
}
330329
Ok(())
331330
}
332-
333-
pub fn get_integer(&self, key: Relocatable) -> Result<Felt252, MemoryError> {
334-
self.memory.get_integer(key).map(Cow::into_owned)
335-
}
336-
pub fn get_relocatable(&self, key: Relocatable) -> Result<Relocatable, MemoryError> {
337-
self.memory.get_relocatable(key)
338-
}
339-
pub fn get_maybe_relocatable(&self, key: Relocatable) -> Result<MaybeRelocatable, MemoryError> {
340-
self.memory.get_maybe_relocatable(key)
341-
}
342331
}
343332

344333
impl Default for MemorySegmentManager {
@@ -1128,47 +1117,4 @@ mod tests {
11281117
])
11291118
);
11301119
}
1131-
1132-
#[test]
1133-
fn test_get_integer() {
1134-
let mut memory_segment_manager = MemorySegmentManager::new();
1135-
memory_segment_manager.memory = memory![((0, 0), 10)];
1136-
assert_eq!(
1137-
memory_segment_manager
1138-
.get_integer(Relocatable::from((0, 0)))
1139-
.unwrap()
1140-
.as_ref(),
1141-
&Felt252::from(10)
1142-
);
1143-
}
1144-
1145-
#[test]
1146-
fn test_get_relocatable() {
1147-
let mut memory_segment_manager = MemorySegmentManager::new();
1148-
memory_segment_manager.memory = memory![((0, 0), (0, 1))];
1149-
assert_eq!(
1150-
memory_segment_manager
1151-
.get_relocatable(Relocatable::from((0, 0)))
1152-
.unwrap(),
1153-
relocatable!(0, 1)
1154-
);
1155-
}
1156-
1157-
#[test]
1158-
fn test_get_maybe_relocatable() {
1159-
let mut memory_segment_manager = MemorySegmentManager::new();
1160-
memory_segment_manager.memory = memory![((0, 0), (0, 1)), ((0, 1), 10)];
1161-
assert_eq!(
1162-
memory_segment_manager
1163-
.get_maybe_relocatable(relocatable!(0, 0))
1164-
.unwrap(),
1165-
mayberelocatable!(0, 1)
1166-
);
1167-
assert_eq!(
1168-
memory_segment_manager
1169-
.get_maybe_relocatable(relocatable!(0, 1))
1170-
.unwrap(),
1171-
mayberelocatable!(10)
1172-
);
1173-
}
11741120
}

0 commit comments

Comments
 (0)