Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
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
32 changes: 23 additions & 9 deletions checks/executor/citeria/global-storage-includes/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,13 @@ impl GlobalStorageIncludes {
}
}

impl Criterionish for GlobalStorageIncludes {
fn satisfies(
impl GlobalStorageIncludes {
fn satisfies_for_version(
&self,
movement_executor: &MovementExecutor,
maptos_executor: &MovementAptosExecutor,
movement_ledger_version: u64,
) -> Result<(), CriterionError> {
// get the latest ledger version from the movement executor
let movement_ledger_version = movement_executor
.latest_ledger_version()
.map_err(|e| CriterionError::Internal(e.into()))?;

debug!("movement_ledger_version: {:?}", movement_ledger_version);

// get the latest state view from the movement executor
let movement_state_view = movement_executor
.state_view_at_version(Some(movement_ledger_version))
Expand Down Expand Up @@ -113,3 +107,23 @@ impl Criterionish for GlobalStorageIncludes {
Ok(())
}
}

impl Criterionish for GlobalStorageIncludes {
fn satisfies(
&self,
movement_executor: &MovementExecutor,
maptos_executor: &MovementAptosExecutor,
) -> Result<(), CriterionError> {
// get the latest ledger version from the movement executor
let movement_ledger_version = movement_executor
.latest_ledger_version()
.map_err(|e| CriterionError::Internal(e.into()))?;

for version in 0..=movement_ledger_version {
self.satisfies_for_version(movement_executor, maptos_executor, version)
.map_err(|e| CriterionError::Internal(e.into()))?;
}

Ok(())
}
}
30 changes: 23 additions & 7 deletions checks/executor/citeria/global-storage-injective/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,17 +17,13 @@ impl GlobalStorageInjective {
}
}

impl Criterionish for GlobalStorageInjective {
fn satisfies(
impl GlobalStorageInjective {
fn satisfies_for_version(
&self,
movement_executor: &MovementExecutor,
maptos_executor: &MovementAptosExecutor,
movement_ledger_version: u64,
) -> Result<(), CriterionError> {
// get the latest ledger version from the movement executor
let movement_ledger_version = movement_executor
.latest_ledger_version()
.map_err(|e| CriterionError::Internal(e.into()))?;

// get the latest state view from the movement executor
let movement_state_view = movement_executor
.state_view_at_version(Some(movement_ledger_version))
Expand Down Expand Up @@ -95,3 +91,23 @@ impl Criterionish for GlobalStorageInjective {
Ok(())
}
}

impl Criterionish for GlobalStorageInjective {
fn satisfies(
&self,
movement_executor: &MovementExecutor,
maptos_executor: &MovementAptosExecutor,
) -> Result<(), CriterionError> {
// get the latest ledger version from the movement executor
let movement_ledger_version = movement_executor
.latest_ledger_version()
.map_err(|e| CriterionError::Internal(e.into()))?;

for version in 0..=movement_ledger_version {
self.satisfies_for_version(movement_executor, maptos_executor, version)
.map_err(|e| CriterionError::Internal(e.into()))?;
}

Ok(())
}
}