Skip to content

Commit c98a4da

Browse files
authored
chore: return memory tests back (#1950)
This resolves INT-4550. Merkle tests checked that, when we touch some memory, - the finalized root that is obtained by "build a tree on initial memory, then update with the touched memory" is the same as if we just built the tree on the final memory, - the merkle trace does the interactions we want it to. I updated them so that they check the same but use the new architecture. The general memory tests checked that we can do all kinds of accesses (persistent/volatile, native/rv32 address space, etc etc) and nothing breaks. Apparently, I did the same in `online.rs`, so I just moved my tests to that file, where I think they indeed belong.
1 parent f21b19e commit c98a4da

File tree

8 files changed

+257
-546
lines changed

8 files changed

+257
-546
lines changed

crates/vm/src/system/memory/adapter/mod.rs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,6 @@ use crate::{
4141
mod air;
4242
mod columns;
4343
pub mod records;
44-
#[cfg(test)]
45-
mod tests;
4644

4745
#[derive(Setters)]
4846
pub struct AccessAdapterInventory<F> {

crates/vm/src/system/memory/adapter/tests.rs

Lines changed: 0 additions & 1 deletion
This file was deleted.

crates/vm/src/system/memory/merkle/mod.rs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,8 @@ pub use columns::*;
2121
pub(super) use trace::SerialReceiver;
2222
pub use tree::*;
2323

24-
// TODO: add back
25-
// #[cfg(test)]
26-
// mod tests;
24+
#[cfg(test)]
25+
mod tests;
2726

2827
pub struct MemoryMerkleChip<const CHUNK: usize, F> {
2928
pub air: MemoryMerkleAir<CHUNK>,

0 commit comments

Comments
 (0)