Merge branch 'l-monninger/accounts-citerion-redux' into l-monninger/pre-l1-merge-redux

Author: andygolay

.github/workflows/nix-command.yml

@@ -19,7 +19,7 @@ on:
 
 jobs:
   run-command:
-    runs-on: buildjet-16vcpu-ubuntu-2204
+    runs-on: movement-runner
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main

Cargo.lock

@@ -84,6 +84,7 @@ libp2p = { version = "0.55.0", features = ["tcp", "quic"] }
 chrono = "0.4.31"
 rand = "0.7.3"
 uuid = "1.10.0"
+glob = "0.3.2"
 
 poem = { version = "=3.1.3", features = ["anyhow", "compression", "rustls"] }
 poem-openapi = { version = "=5.1.2", features = ["swagger-ui", "url"] }

Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "mtma-migrator-checks-sketchpad"
+name = "migrator-sketchpad"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }
@@ -30,6 +30,7 @@ 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

@@ -1,43 +1,72 @@
 #[cfg(test)]
 pub mod test {
 
+	use anyhow::Context;
 	use mtma_migrator_test_accounts_equal_criterion::AccountsEqual;
 	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;
+	use tracing::info;
 
-	#[tokio::test]
+	#[tokio::test(flavor = "multi_thread")]
 	#[tracing_test::traced_test]
 	async fn test_accounts_equal() -> Result<(), anyhow::Error> {
-		// Form the migrator.
-		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 accounts_equal = AccountsEqual::new();
-		checked_migration(&mut movement_migrator, &prelude, &migration, vec![accounts_equal])
-			.await?;
+		// use a scope to ensure everything is dropped
+		{
+			// Form the migrator.
+			let mut movement_migrator = MovementMigrator::try_temp()?;
+			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>(())
+			});
+
+			// wait for the rest client to be ready
+			// once we have this, there should also be a config, so we can then kill off the migrator and proceed
+			movement_migrator
+			.wait_for_rest_client_ready(tokio::time::Duration::from_secs(600)) // we wait for up to ten minutes because the nix flake in .vendors/movementcan be a bit slow the first time
+			.await
+			.context(
+				"failed to wait for movement migrator rest client while running accounts equal manual prelude",
+			)?;
+
+			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 accounts_equal = AccountsEqual::new();
+			info!("Running migration");
+			match checked_migration(
+				&mut movement_migrator,
+				&prelude,
+				&migration,
+				vec![accounts_equal],
+			)
+			.await
+			{
+				Ok(()) => {}
+				Err(e) => {
+					info!("Migration failed: {:?}", e);
+					return Err(anyhow::anyhow!("Migration failed: {:?}", e));
+				}
+			}
+			info!("Migration succeeded");
+		}
+
+		// 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(())
 	}

checks/migrator/checks/sketchpad/config.yaml

@@ -13,7 +13,8 @@ mtma-migrator-test-types = { workspace = true }
 bcs = { workspace = true }
 bcs-ext = { workspace = true }
 tokio = { workspace = true }
-
+anyhow = { workspace = true }
+tracing = { workspace = true }
 
 [lints]
 workspace = true

checks/migrator/checks/sketchpad/src/accounts_equal.rs

@@ -1,7 +1,9 @@
+use anyhow::Context;
 use bcs_ext::{comparison::BcsEq, conversion::BcsInto};
 use mtma_migrator_test_types::criterion::{
 	Criterion, CriterionError, Criterionish, MovementAptosMigrator, MovementMigrator,
 };
+use tracing::info;
 
 pub struct AccountsEqual;
 
@@ -24,22 +26,36 @@ impl Criterionish for AccountsEqual {
 		let movement_rest_client = movement_migrator
 			.wait_for_rest_client_ready(tokio::time::Duration::from_secs(30))
 			.await
+			.context(
+				"failed to wait for movement migrator rest client while checking accounts equal",
+			)
 			.map_err(|e| CriterionError::Internal(e.into()))?;
 		let movement_aptos_rest_client = movement_aptos_migrator
 			.wait_for_rest_client_ready(tokio::time::Duration::from_secs(30))
 			.await
+			.context("failed to wait for movement aptos migrator rest client while checking accounts equal")
 			.map_err(|e| CriterionError::Internal(e.into()))?;
 
 		let movement_node =
 			movement_migrator.node().await.map_err(|e| CriterionError::Internal(e.into()))?;
 
-		for account_address in movement_node
+		info!("Iterating over movement node accounts");
+		for account_address_res in movement_node
 			.iter_account_addresses(0)
 			.map_err(|e| CriterionError::Internal(e.into()))?
 		{
-			let account_address =
-				account_address.map_err(|e| CriterionError::Internal(e.into()))?;
+			let account_address = match account_address_res
+				.context("account address is none")
+				.map_err(|e| CriterionError::Internal(e.into()))
+			{
+				Ok(account_address) => account_address,
+				Err(e) => {
+					info!("Transaction has no sender: {:?}", e);
+					continue;
+				}
+			};
 
+			info!("Getting movement resource");
 			let movement_resource = movement_rest_client
 				.get_account_bcs(account_address)
 				.await
@@ -48,9 +64,11 @@ impl Criterionish for AccountsEqual {
 				})?
 				.into_inner();
 
+			info!("Getting movement aptos address");
 			let movement_aptos_account_address =
 				account_address.bcs_into().map_err(|e| CriterionError::Internal(e.into()))?;
 
+			info!("Getting movement aptos account resource");
 			let aptos_resource = movement_aptos_rest_client
 				.get_account_bcs(movement_aptos_account_address)
 				.await
@@ -59,9 +77,12 @@ impl Criterionish for AccountsEqual {
 				})?
 				.into_inner();
 
+			info!("Comparing resources");
 			movement_resource
 				.bcs_eq(&aptos_resource)
 				.map_err(|e| CriterionError::Unsatisfied(e.into()))?;
+
+			info!("Finished processing block");
 		}
 
 		Ok(())

checks/migrator/citeria/accounts-equal/Cargo.toml

@@ -21,6 +21,8 @@ thiserror = { workspace = true }
 tokio = { workspace = true }
 bcs = { workspace = true }
 mtma-types = { workspace = true }
+kestrel = { workspace = true }
+tracing = { workspace = true }
 
 [lints]
 workspace = true