Merge pull request #99 from movementlabsxyz/sebtomba/move-e2e-criteria

refactor(e2e): move e2e criterion GlobalFeatureCheck to checks/migrator

Author: andygolay

Cargo.lock

@@ -191,6 +191,9 @@ mtma-node-test-global-storage-not-empty-criterion = { path = "checks/node/citeri
 
 ### migrator
 mtma-migrator-test-types = { path = "checks/migrator/util/types" }
+mtma-migrator-test-empty-criterion = { path = "checks/migrator/citeria/empty" }
+mtma-migrator-test-matching-feature-flags-criterion = { path = "checks/migrator/citeria/matching-feature-flags" }
+mtma-migrator-test-transacting-criterion = { path = "checks/migrator/citeria/transacting" }
 mtma-migrator-test-accounts-equal-criterion = { path = "checks/migrator/citeria/accounts-equal" }
 mtma-migrator-test-balances-equal-criterion = { path = "checks/migrator/citeria/balances-equal" }
 

Cargo.toml

@@ -13,6 +13,9 @@ mtma-types = { workspace = true }
 mtma-migrator-types = { workspace = true }
 mtma-migrator-test-types = { workspace = true }
 anyhow = { workspace = true }
+mtma-migrator-test-matching-feature-flags-criterion = { workspace = true }
+mtma-migrator-test-transacting-criterion = { workspace = true }
+mtma-migrator-test-empty-criterion = { workspace = true }
 mtma-node-replay-core = { workspace = true }
 mtma-node-test-global-storage-injective-criterion = { workspace = true }
 mtma-node-test-global-storage-includes-criterion = { workspace = true }
@@ -25,6 +28,7 @@ chrono = { workspace = true }
 rand = { workspace = true }
 kestrel = { workspace = true }
 mtma-node-test-types = { workspace = true }
+aptos-sdk = { workspace = true }
 
 [dev-dependencies]
 tracing-test = { workspace = true }

checks/migrator/checks/sketchpad/Cargo.toml

@@ -1 +1,3 @@
+pub mod matching_feature_flags;
+pub mod transacting;
 pub mod accounts_equal;

checks/migrator/checks/sketchpad/src/lib.rs

@@ -0,0 +1,50 @@
+#[cfg(test)]
+pub mod test {
+	use mtma_migrator_test_matching_feature_flags_criterion::GlobalFeatureCheck;
+	use mtma_migrator_test_types::check::checked_migration;
+	use mtma_migrator_types::migrator::{movement_migrator::Overlays, MovementMigrator};
+	use mtma_node_null_core::config::Config as MtmaNullConfig;
+	use mtma_node_test_types::prelude::Prelude;
+
+	#[tokio::test]
+	#[tracing_test::traced_test]
+	async fn test_matching_feature_flags() -> Result<(), anyhow::Error> {
+		// Form the migrator.
+		let mut movement_migrator = MovementMigrator::try_temp()?;
+		// TODO: use `MovementMigrator::try_debug_home()`
+		// let mut movement_migrator = MovementMigrator::try_debug_home()?;
+		movement_migrator.set_overlays(Overlays::default());
+
+		// Start the migrator so that it's running in the background.
+		// In the future, some migrators may be for already running nodes.
+		let movement_migrator_for_task = movement_migrator.clone();
+		let movement_migrator_task = kestrel::task(async move {
+			movement_migrator_for_task.run().await?;
+			Ok::<_, anyhow::Error>(())
+		});
+
+		tokio::time::sleep(tokio::time::Duration::from_secs(30)).await;
+
+		kestrel::end!(movement_migrator_task)?;
+
+		// Form the prelude.
+		// todo: this needs to be updated to use the prelude generator
+		let prelude = Prelude::new_empty();
+
+		// Form the migration.
+		let migration_config = MtmaNullConfig::default();
+		let migration = migration_config.build()?;
+
+		// Run the checked migration.
+		let matching_feature_flags = GlobalFeatureCheck::new();
+		checked_migration(
+			&mut movement_migrator,
+			&prelude,
+			&migration,
+			vec![matching_feature_flags],
+		)
+		.await?;
+
+		Ok(())
+	}
+}

checks/migrator/checks/sketchpad/src/matching_feature_flags.rs

@@ -0,0 +1,46 @@
+#[cfg(test)]
+pub mod test {
+	use aptos_sdk::types::LocalAccount;
+	use mtma_migrator_test_transacting_criterion::MaptosTransferLifecycle;
+	use mtma_migrator_test_types::check::checked_migration;
+	use mtma_migrator_types::migrator::{movement_migrator::Overlays, MovementMigrator};
+	use mtma_node_null_core::config::Config as MtmaNullConfig;
+	use mtma_node_test_types::prelude::Prelude;
+
+	#[tokio::test]
+	#[tracing_test::traced_test]
+	async fn test_transacting() -> Result<(), anyhow::Error> {
+		// Form the migrator.
+		let mut movement_migrator = MovementMigrator::try_temp()?;
+		// TODO: use `MovementMigrator::try_debug_home()`
+		// let mut movement_migrator = MovementMigrator::try_debug_home()?;
+		movement_migrator.set_overlays(Overlays::default());
+
+		// Start the migrator so that it's running in the background.
+		// In the future, some migrators may be for already running nodes.
+		let movement_migrator_for_task = movement_migrator.clone();
+		let movement_migrator_task = kestrel::task(async move {
+			movement_migrator_for_task.run().await?;
+			Ok::<_, anyhow::Error>(())
+		});
+
+		tokio::time::sleep(tokio::time::Duration::from_secs(30)).await;
+
+		kestrel::end!(movement_migrator_task)?;
+
+		// Form the prelude.
+		// todo: this needs to be updated to use the prelude generator
+		let prelude = Prelude::new_empty();
+
+		// Form the migration.
+		let migration_config = MtmaNullConfig::default();
+		let migration = migration_config.build()?;
+
+		// Run the checked migration.
+		let local_account = LocalAccount::generate(&mut rand::rngs::OsRng);
+		let transacting = MaptosTransferLifecycle::new(local_account);
+		checked_migration(&mut movement_migrator, &prelude, &migration, vec![transacting]).await?;
+
+		Ok(())
+	}
+}

checks/migrator/checks/sketchpad/src/transacting.rs

@@ -9,8 +9,7 @@ publish = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-mtma-node-test-types = { workspace = true }
-
+mtma-migrator-test-types = { workspace = true }
 
 [lints]
 workspace = true

checks/migrator/citeria/empty/Cargo.toml

@@ -1,5 +1,5 @@
-use mtma_node_test_types::criterion::{
-	Criterion, CriterionError, Criterionish, MovementAptosNode, MovementNode,
+use mtma_migrator_test_types::criterion::{
+	Criterion, CriterionError, Criterionish, MovementAptosMigrator, MovementMigrator,
 };
 
 pub struct Empty;
@@ -15,10 +15,10 @@ impl Empty {
 }
 
 impl Criterionish for Empty {
-	fn satisfies(
+	async fn satisfies(
 		&self,
-		_movement_executor: &MovementNode,
-		_movement_aptos_executor: &MovementAptosNode,
+		_movement_migrator: &MovementMigrator,
+		_movement_aptos_migrator: &MovementAptosMigrator,
 	) -> Result<(), CriterionError> {
 		Ok(())
 	}

checks/migrator/citeria/empty/src/lib.rs

@@ -0,0 +1,19 @@
+[package]
+name = "mtma-migrator-test-matching-feature-flags-criterion"
+version = { workspace = true }
+edition = { workspace = true }
+license = { workspace = true }
+authors = { workspace = true }
+homepage = { workspace = true }
+publish = { workspace = true }
+rust-version = { workspace = true }
+
+[dependencies]
+mtma-migrator-test-types = { workspace = true }
+movement-client = { workspace = true }
+aptos-rest-client = { workspace = true }
+tokio = { workspace = true }
+serde_json = { workspace = true }
+
+[lints]
+workspace = true

checks/migrator/citeria/matching-feature-flags/Cargo.toml

@@ -0,0 +1,2 @@
+# Matching Feature Flags
+The Matching Feature Flags criterion reports feature flags differences between the new framework and the old framework. It asserts that the new framework has the same features as Aptos but for features 73 (Governed Gas Pool), which should be true.