Merge pull request #42 from movementlabsxyz/l-monninger/inddexer-db-statekeys-enabled

Shows setting state keys enabled does not work

Author: l-monninger

Cargo.toml

@@ -92,7 +92,7 @@ either = "1.8.1"
 maptos-opt-executor = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
 movement-client = { git = "https://github.com/movementlabsxyz/movement.git", rev = "aa1ffed1a113441a65662792d15682ad52406108" }
 
-# maptos-core
+# aptos-core
 aptos-executor = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
 aptos-vm = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
 aptos-rest-client = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
@@ -101,6 +101,7 @@ aptos-types = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev =
 aptos-db = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
 aptos_schemadb = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
 aptos-config = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
+aptos-db-indexer = { git = "https://github.com/movementlabsxyz/aptos-core.git", rev = "2941ee2b5876ab93cfb8010154c9466d7d593ed9" }
 # model checking and verification
 
 

checks/executor/checks/sketchpad/src/global_storage_includes.rs

@@ -4,14 +4,12 @@ pub mod test {
 	use migration_executor_preludes::basic::BasicPrelude;
 	use migration_executor_test_global_storage_includes_criterion::GlobalStorageIncludes;
 	use migration_executor_test_types::{
-		check::{checked_migration, CheckError},
+		check::checked_migration,
 		criterion::movement_executor::{MovementExecutor, MovementOptExecutor},
 		prelude::PreludeGenerator,
 	};
 	use mtma_null_core::config::Config as MtmaNullConfig;
 
-	use tracing::info;
-
 	#[tokio::test]
 	#[tracing_test::traced_test]
 	async fn test_global_storage_includess_null() -> Result<(), anyhow::Error> {
@@ -30,25 +28,13 @@ pub mod test {
 		let migration = migration_config.build()?;
 
 		// run the checked migration
-		match checked_migration(
+		checked_migration(
 			&mut movement_executor,
 			&prelude,
 			&migration,
 			vec![Box::new(GlobalStorageIncludes::new())],
 		)
-		.await
-		{
-			Ok(_) => {
-				return Err(anyhow::anyhow!("Migration should have failed"));
-			}
-			Err(err) => match err {
-				CheckError::Criteria(e) => info!("Migration failed as expected: {:?}", e),
-				e => {
-					return Err(e.into());
-				}
-			},
-		}
-
+		.await?;
 		Ok(())
 	}
 }

checks/executor/checks/sketchpad/src/global_storage_injective.rs

@@ -4,12 +4,11 @@ pub mod test {
 	use migration_executor_preludes::basic::BasicPrelude;
 	use migration_executor_test_global_storage_injective_criterion::GlobalStorageInjective;
 	use migration_executor_test_types::{
-		check::{checked_migration, CheckError},
+		check::checked_migration,
 		criterion::movement_executor::{MovementExecutor, MovementOptExecutor},
 		prelude::PreludeGenerator,
 	};
 	use mtma_null_core::config::Config as MtmaNullConfig;
-	use tracing::info;
 
 	#[tokio::test]
 	async fn test_global_storage_injective_null() -> Result<(), anyhow::Error> {
@@ -28,24 +27,13 @@ pub mod test {
 		let migration = migration_config.build()?;
 
 		// run the checked migration
-		match checked_migration(
+		checked_migration(
 			&mut movement_executor,
 			&prelude,
 			&migration,
 			vec![Box::new(GlobalStorageInjective::new())],
 		)
-		.await
-		{
-			Ok(_) => {
-				return Err(anyhow::anyhow!("Migration should have failed"));
-			}
-			Err(err) => match err {
-				CheckError::Criteria(e) => info!("Migration failed as expected: {:?}", e),
-				e => {
-					return Err(e.into());
-				}
-			},
-		}
+		.await?;
 
 		Ok(())
 	}

checks/executor/checks/sketchpad/src/global_storage_not_empty.rs

@@ -4,12 +4,11 @@ pub mod test {
 	use migration_executor_preludes::basic::BasicPrelude;
 	use migration_executor_test_global_storage_not_empty_criterion::GlobalStorageNotEmpty;
 	use migration_executor_test_types::{
-		check::{checked_migration, CheckError},
+		check::checked_migration,
 		criterion::movement_executor::{MovementExecutor, MovementOptExecutor},
 		prelude::PreludeGenerator,
 	};
 	use mtma_null_core::config::Config as MtmaNullConfig;
-	use tracing::info;
 
 	#[tokio::test]
 	async fn test_global_storage_injective_null() -> Result<(), anyhow::Error> {
@@ -28,24 +27,13 @@ pub mod test {
 		let migration = migration_config.build()?;
 
 		// run the checked migration
-		match checked_migration(
+		checked_migration(
 			&mut movement_executor,
 			&prelude,
 			&migration,
 			vec![Box::new(GlobalStorageNotEmpty::new())],
 		)
-		.await
-		{
-			Ok(_) => {
-				return Err(anyhow::anyhow!("Migration should have failed"));
-			}
-			Err(err) => match err {
-				CheckError::Criteria(e) => info!("Migration failed as expected: {:?}", e),
-				e => {
-					return Err(e.into());
-				}
-			},
-		}
+		.await?;
 
 		Ok(())
 	}

migration/core/mtma-null/src/migrate/migrate.rs

@@ -62,8 +62,7 @@ impl Migrationish for Migrate {
 			unique_id.to_string().split('-').next().unwrap()
 		));
 		let src = Path::new(old_db_dir);
-		let dst = db_dir.join("db");
-		copy_dir_recursive(src, &dst).map_err(|e| MigrationError::Internal(e.into()))?;
+		copy_dir_recursive(src, &db_dir).map_err(|e| MigrationError::Internal(e.into()))?;
 
 		// Open the aptos db.
 		let aptos_db = AptosDB::open(