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

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

Author: sebtomba

Cargo.lock

@@ -192,6 +192,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

@@ -9,20 +9,12 @@ publish = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-mtma-types = { workspace = true }
 mtma-migrator-types = { workspace = true }
 mtma-migrator-test-types = { workspace = true }
 anyhow = { 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 }
-mtma-node-test-global-storage-not-empty-criterion = { workspace = true }
 mtma-migrator-test-balances-equal-criterion = { workspace = true }
-mtma-node-preludes = { workspace = true }
 mtma-node-null-core = { workspace = true }
 tokio = { workspace = true }
-chrono = { workspace = true }
-rand = { workspace = true }
 kestrel = { workspace = true }
 mtma-node-test-types = { workspace = true }
 

checks/migrator/checks/balances-equal/Cargo.toml

@@ -68,6 +68,6 @@ pub mod test {
 		// exit the test is fine when you only have one test per crate because when cargo test is run across a workspace, it actually multi-processes the tests by crate
 		std::process::exit(0);
 
-		Ok(())
+		// Ok(())
 	}
 }

checks/migrator/checks/balances-equal/src/balances_equal.rs

@@ -0,0 +1,26 @@
+[package]
+name = "mtma-migrator-matching-feature-flags"
+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-types = { workspace = true }
+mtma-migrator-test-types = { workspace = true }
+anyhow = { workspace = true }
+mtma-migrator-test-matching-feature-flags-criterion = { workspace = true }
+mtma-node-null-core = { workspace = true }
+tokio = { workspace = true }
+kestrel = { workspace = true }
+mtma-node-test-types = { workspace = true }
+
+[dev-dependencies]
+tracing-test = { workspace = true }
+tracing = { workspace = true }
+
+[lints]
+workspace = true

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

@@ -0,0 +1,2 @@
+# Migration Executor Checks Sketchpad
+A sketchpad for playing around with checks on the testpad. 

checks/migrator/checks/matching-feature-flags/README.md

@@ -0,0 +1 @@
+pub mod matching_feature_flags;

checks/migrator/checks/matching-feature-flags/src/lib.rs

@@ -0,0 +1,51 @@
+#[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]
+	#[ignore = "activate when runtime problems are solved"]
+	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/matching-feature-flags/src/matching_feature_flags.rs

@@ -9,28 +9,19 @@ publish = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
-mtma-types = { workspace = true }
 mtma-migrator-types = { workspace = true }
 mtma-migrator-test-types = { workspace = true }
 anyhow = { 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 }
-mtma-node-test-global-storage-not-empty-criterion = { workspace = true }
 mtma-migrator-test-accounts-equal-criterion = { workspace = true }
-mtma-node-preludes = { workspace = true }
 mtma-node-null-core = { workspace = true }
 tokio = { workspace = true }
-chrono = { workspace = true }
-rand = { workspace = true }
 kestrel = { workspace = true }
 mtma-node-test-types = { workspace = true }
 mtma-migrator-pre-l1-merge-core = { workspace = true }
 
 [dev-dependencies]
 tracing-test = { workspace = true }
 tracing = { workspace = true }
-tempfile = { workspace = true }
 
 [lints]
 workspace = true

checks/migrator/checks/sketchpad/Cargo.toml

@@ -68,6 +68,6 @@ pub mod test {
 		// exit the test is fine when you only have one test per crate because when cargo test is run across a workspace, it actually multi-processes the tests by crate
 		std::process::exit(0);
 
-		Ok(())
+		// Ok(())
 	}
 }