fix: move test db; we may still have to remove debug home calls which could be annoying, but temp should be fine as an alternative.

Author: l-monninger

Cargo.lock

@@ -1,5 +1,5 @@
 [package]
-name = "mtma-migrator-checks-sketchpad"
+name = "migrator-sketchpad"
 version = { workspace = true }
 edition = { workspace = true }
 license = { workspace = true }

checks/migrator/checks/sketchpad/Cargo.toml

@@ -29,7 +29,7 @@ pub mod test {
 			// 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(120))
+			.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",

checks/migrator/checks/sketchpad/config.yaml

@@ -1,3 +1,4 @@
+//! We implement this with the same logic as `mtma-node-null-core` because that `mtma_node_types::Migrationish` has a blanket implementation for `Migrationish` that we can use.
 use mtma_node_types::executor::{
 	movement_aptos_executor::MovementAptosBlockExecutor, MovementAptosNode, MovementNode,
 };

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

@@ -7,7 +7,7 @@ pub use crate::migrator::movement_aptos_migrator::{
 pub use crate::migrator::movement_migrator::MovementMigrator;
 use std::future::Future;
 
-use mtma_node_types::migration::Migrationish as ExecutorMigrationish;
+use mtma_node_types::migration::Migrationish as NodeMigrationish;
 
 /// Errors thrown when working with the [Config].
 #[derive(Debug, thiserror::Error)]
@@ -50,15 +50,15 @@ where
 
 impl<T> Migrationish for T
 where
-	T: ExecutorMigrationish,
+	T: NodeMigrationish,
 {
 	async fn migrate(
 		&self,
 		movement_executor: &MovementMigrator,
 	) -> Result<MovementAptosMigrator, MigrationError> {
 		let executor =
 			movement_executor.node().await.map_err(|e| MigrationError::Internal(e.into()))?;
-		let movement_aptos_executor = ExecutorMigrationish::migrate(self, &executor)
+		let movement_aptos_executor = NodeMigrationish::migrate(self, &executor)
 			.await
 			.map_err(|e| MigrationError::Internal(e.into()))?;
 		let movement_aptos = movement_aptos_executor

flake.lock

@@ -74,7 +74,7 @@ impl Config {
 	pub fn test_node_config(db_dir: &PathBuf) -> Result<Self, ConfigError> {
 		let rng = rand::thread_rng();
 
-		let node_config = create_single_node_test_config(
+		let mut node_config = create_single_node_test_config(
 			&None,
 			&None,
 			db_dir.as_path(),
@@ -86,6 +86,8 @@ impl Config {
 		)
 		.map_err(|e| ConfigError::Internal(e.into()))?;
 
+		node_config.base.working_dir = Some(db_dir.clone());
+
 		Ok(Config { node_config: NodeConfigWrapper(node_config), log_file: None })
 	}