chore: factor out more types.

l-monninger · l-monninger · commit ff3e1b7477d5 · 2025-05-28T11:22:16.000+09:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/checks/migrator/util/types/Cargo.toml b/checks/migrator/util/types/Cargo.toml
@@ -18,6 +18,7 @@ movement-client = { workspace = true }
 aptos-rest-client = { workspace = true }
 thiserror = { workspace = true }
 tokio = { workspace = true }
+mtma-types = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/checks/migrator/util/types/src/criterion.rs b/checks/migrator/util/types/src/criterion.rs
@@ -1,5 +1,5 @@
-use aptos_rest_client::Client as MovementAptosRestClient;
 use movement_client::rest_client::Client as MovementRestClient;
+use mtma_types::movement_aptos::aptos_rest_client::Client as MovementAptosRestClient;
 
 /// The MovementAptos executor as would be presented in the criterion.
 #[derive(Debug)]
diff --git a/checks/node/citeria/global-storage-includes/Cargo.toml b/checks/node/citeria/global-storage-includes/Cargo.toml
@@ -10,6 +10,7 @@ rust-version = { workspace = true }
 
 [dependencies]
 mtma-node-test-types = { workspace = true }
+mtma-types = { workspace = true }
 anyhow = { workspace = true }
 tracing = { workspace = true }
 
diff --git a/checks/node/citeria/global-storage-includes/src/lib.rs b/checks/node/citeria/global-storage-includes/src/lib.rs
@@ -3,7 +3,7 @@ use mtma_node_test_types::criterion::movement_executor::TStateView as _;
 use mtma_node_test_types::criterion::{
 	Criterion, CriterionError, Criterionish, MovementAptosNode, MovementNode,
 };
-use mtma_node_test_types::criterion::movement_aptos_executor::aptos_types::state_store::state_key::StateKey as MovementAptosStateKey;
+use mtma_types::movement_aptos::aptos_types::state_store::state_key::StateKey as MovementAptosStateKey;
 use tracing::debug;
 pub struct GlobalStorageIncludes;
 
diff --git a/checks/node/citeria/global-storage-injective/Cargo.toml b/checks/node/citeria/global-storage-injective/Cargo.toml
@@ -10,6 +10,7 @@ rust-version = { workspace = true }
 
 [dependencies]
 mtma-node-test-types = { workspace = true }
+mtma-types = { workspace = true }
 anyhow = { workspace = true }
 tracing = { workspace = true }
 
diff --git a/checks/node/citeria/global-storage-injective/src/lib.rs b/checks/node/citeria/global-storage-injective/src/lib.rs
@@ -3,7 +3,7 @@ use mtma_node_test_types::criterion::movement_executor::TStateView as _;
 use mtma_node_test_types::criterion::{
 	Criterion, CriterionError, Criterionish, MovementAptosNode, MovementNode,
 };
-use mtma_node_test_types::criterion::movement_aptos_executor::aptos_types::state_store::state_key::StateKey as MovementAptosStateKey;
+use mtma_types::movement_aptos::aptos_types::state_store::state_key::StateKey as MovementAptosStateKey;
 use tracing::debug;
 pub struct GlobalStorageInjective;
 
diff --git a/checks/node/util/types/Cargo.toml b/checks/node/util/types/Cargo.toml
@@ -21,6 +21,7 @@ aptos-storage-interface = { workspace = true }
 either = { workspace = true }
 mtma-node-types = { workspace = true }
 chrono = { workspace = true }
+mtma-types = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/checks/node/util/types/src/prelude.rs b/checks/node/util/types/src/prelude.rs
@@ -1,6 +1,6 @@
 use crate::criterion::MovementNode;
-use maptos_opt_executor::aptos_crypto::HashValue;
-use maptos_opt_executor::aptos_types::{
+use mtma_types::movement::aptos_crypto::HashValue;
+use mtma_types::movement::aptos_types::{
 	block_executor::partitioner::{ExecutableBlock, ExecutableTransactions},
 	block_metadata::BlockMetadata,
 	transaction::signature_verified_transaction::into_signature_verified_block,
diff --git a/migration/core/migrator/mtma-null/Cargo.toml b/migration/core/migrator/mtma-null/Cargo.toml
@@ -27,5 +27,7 @@ chrono = { workspace = true }
 walkdir = { workspace = true }
 uuid = { workspace = true }
 tracing = { workspace = true }
+mtma-types = { workspace = true }
+
 [lints]
 workspace = true
diff --git a/migration/core/migrator/mtma-null/src/migrate/migrate.rs b/migration/core/migrator/mtma-null/src/migrate/migrate.rs
@@ -1,10 +1,10 @@
-use aptos_config::config::StorageDirPaths;
-use aptos_db::AptosDB;
-use aptos_storage_interface::DbReaderWriter;
 use mtma_node_types::executor::{
 	movement_aptos_executor::MovementAptosBlockExecutor, MovementAptosNode, MovementNode,
 };
 use mtma_node_types::migration::{MigrationError, Migrationish};
+use mtma_types::movement_aptos::aptos_config::config::StorageDirPaths;
+use mtma_types::movement_aptos::aptos_db::AptosDB;
+use mtma_types::movement_aptos::aptos_storage_interface::DbReaderWriter;
 
 use anyhow::Context;
 use std::fs;
diff --git a/migration/core/node/mtma-null/Cargo.toml b/migration/core/node/mtma-null/Cargo.toml
@@ -27,5 +27,6 @@ chrono = { workspace = true }
 walkdir = { workspace = true }
 uuid = { workspace = true }
 tracing = { workspace = true }
+mtma-types = { workspace = true }
 [lints]
 workspace = true
diff --git a/migration/core/node/mtma-null/src/migrate/migrate.rs b/migration/core/node/mtma-null/src/migrate/migrate.rs
@@ -1,10 +1,10 @@
-use aptos_config::config::StorageDirPaths;
-use aptos_db::AptosDB;
-use aptos_storage_interface::DbReaderWriter;
 use mtma_node_types::executor::{
 	movement_aptos_executor::MovementAptosBlockExecutor, MovementAptosNode, MovementNode,
 };
 use mtma_node_types::migration::{MigrationError, Migrationish};
+use mtma_types::movement_aptos::aptos_config::config::StorageDirPaths;
+use mtma_types::movement_aptos::aptos_db::AptosDB;
+use mtma_types::movement_aptos::aptos_storage_interface::DbReaderWriter;
 
 use anyhow::Context;
 use std::fs;
diff --git a/migration/util/migrator-types/Cargo.toml b/migration/util/migrator-types/Cargo.toml
@@ -27,6 +27,7 @@ kestrel = { workspace = true }
 movement-client = { workspace = true }
 aptos-rest-client = { workspace = true }
 aptos-config = { workspace = true }
+mtma-types = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/migration/util/migrator-types/src/migrator/movement_aptos_migrator.rs b/migration/util/migrator-types/src/migrator/movement_aptos_migrator.rs
@@ -1,9 +1,9 @@
 use anyhow::Context;
-use aptos_config::config::NodeConfig;
-use aptos_rest_client::Client as MovementAptosRestClient;
 use kestrel::WaitCondition;
 use movement_aptos_core::{runtime, MovementAptos};
 use mtma_node_types::executor::MovementAptosNode;
+use mtma_types::movement_aptos::aptos_config::config::NodeConfig;
+use mtma_types::movement_aptos::aptos_rest_client::Client as MovementAptosRestClient;
 
 /// An enum supporting different types of runners.
 ///
diff --git a/migration/util/migrator-types/src/migrator/movement_migrator.rs b/migration/util/migrator-types/src/migrator/movement_migrator.rs
@@ -1,10 +1,10 @@
 use anyhow::Context;
 use kestrel::WaitCondition;
 pub use maptos_opt_executor;
-pub use maptos_opt_executor::aptos_types::{chain_id::ChainId, state_store::TStateView};
-use mtma_node_types::executor::MovementNode;
 use movement_client::rest_client::Client as MovementRestClient;
 use movement_core::Movement;
+use mtma_node_types::executor::MovementNode;
+pub use mtma_types::movement::aptos_types::{chain_id::ChainId, state_store::TStateView};
 
 /// An enum supporting different types of runners.
 ///
diff --git a/migration/util/node-types/Cargo.toml b/migration/util/node-types/Cargo.toml
@@ -24,6 +24,7 @@ movement-aptos-core = { workspace = true }
 futures-channel = { workspace = true }
 tokio = { workspace = true }
 movement-util = { workspace = true }
+mtma-types = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/migration/util/node-types/src/executor/movement_aptos_executor.rs b/migration/util/node-types/src/executor/movement_aptos_executor.rs
@@ -1,16 +1,16 @@
-pub use aptos_executor::block_executor::BlockExecutor as MovementAptosBlockExecutor;
-use aptos_storage_interface::{
+use either::Either;
+pub use mtma_types::movement_aptos::aptos_executor::block_executor::BlockExecutor as MovementAptosBlockExecutor;
+use mtma_types::movement_aptos::aptos_storage_interface::{
 	state_store::state_view::db_state_view::{DbStateView, DbStateViewAtVersion},
 	DbReader,
 };
-use aptos_types::state_store::state_key::StateKey;
-pub use aptos_vm::aptos_vm::AptosVMBlockExecutor;
-use either::Either;
+use mtma_types::movement_aptos::aptos_types::state_store::state_key::StateKey;
+pub use mtma_types::movement_aptos::aptos_vm::aptos_vm::AptosVMBlockExecutor;
 use std::sync::Arc;
 
-pub use aptos_executor::block_executor;
-pub use aptos_types;
-pub use aptos_types::state_store::TStateView;
+pub use mtma_types::movement_aptos::aptos_executor::block_executor;
+pub use mtma_types::movement_aptos::aptos_types;
+pub use mtma_types::movement_aptos::aptos_types::state_store::TStateView;
 use std::path::PathBuf;
 
 use movement_aptos_core::{Config as MovementAptosConfig, NodeConfig};
diff --git a/migration/util/node-types/src/executor/movement_executor.rs b/migration/util/node-types/src/executor/movement_executor.rs
@@ -1,14 +1,14 @@
 use either::Either;
-use maptos_opt_executor::aptos_storage_interface::state_view::DbStateView;
-use maptos_opt_executor::aptos_storage_interface::DbReader;
-use maptos_opt_executor::aptos_types::state_store::state_key::StateKey;
 pub use maptos_opt_executor::Executor as MovementOptExecutor;
 use movement_util::common_args::MovementArgs;
+use mtma_types::movement::aptos_storage_interface::state_view::DbStateView;
+use mtma_types::movement::aptos_storage_interface::DbReader;
+use mtma_types::movement::aptos_types::state_store::state_key::StateKey;
 use std::sync::Arc;
 
 use anyhow::Context;
 pub use maptos_opt_executor;
-pub use maptos_opt_executor::aptos_types::{chain_id::ChainId, state_store::TStateView};
+pub use mtma_types::movement::aptos_types::{chain_id::ChainId, state_store::TStateView};
 use std::path::PathBuf;
 use tracing::debug;
 /// The Movement executor as would be presented in the criterion.
diff --git a/util/movement-aptos/movement-aptos-core/Cargo.toml b/util/movement-aptos/movement-aptos-core/Cargo.toml
@@ -29,6 +29,7 @@ chrono = { workspace = true }
 uuid = { workspace = true }
 serde_yaml = { workspace = true }
 tracing = { workspace = true }
+mtma-types = { workspace = true }
 
 [dev-dependencies]
 uuid = { workspace = true }
diff --git a/util/movement-aptos/movement-aptos-core/src/config.rs b/util/movement-aptos/movement-aptos-core/src/config.rs
@@ -1,14 +1,14 @@
-pub use aptos_config::config::NodeConfig;
 use clap::Parser;
 use jsonlvar::Jsonl;
+pub use mtma_types::movement_aptos::aptos_config::config::NodeConfig;
 use orfile::Orfile;
 use serde::{Deserialize, Serialize};
 use std::fs::File;
 use std::path::PathBuf;
 use std::str::FromStr;
 
 use crate::movement_aptos::{runtime, MovementAptos};
-use aptos_node::create_single_node_test_config;
+use mtma_types::movement_aptos::aptos_node::create_single_node_test_config;
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
 pub struct NodeConfigWrapper(pub(crate) NodeConfig);
diff --git a/util/movement-aptos/movement-aptos-core/src/movement_aptos.rs b/util/movement-aptos/movement-aptos-core/src/movement_aptos.rs
@@ -1,5 +1,5 @@
-use aptos_config::config::NodeConfig;
 use kestrel::State;
+use mtma_types::movement_aptos::aptos_config::config::NodeConfig;
 use std::path::PathBuf;
 pub mod rest_api;
 use kestrel::process::{command::Command, ProcessOperations};
@@ -187,7 +187,7 @@ where
 #[cfg(test)]
 mod tests {
 	use super::*;
-	use aptos_node::create_single_node_test_config;
+	use mtma_types::movement_aptos::aptos_node::create_single_node_test_config;
 	use rand::thread_rng;
 	use std::path::Path;
 
diff --git a/util/movement-aptos/movement-aptos-util/Cargo.toml b/util/movement-aptos/movement-aptos-util/Cargo.toml
@@ -14,6 +14,11 @@ aptos-types = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-config = { workspace = true }
 aptos-node = { workspace = true }
+aptos-executor = { workspace = true }
+aptos-storage-interface = { workspace = true }
+aptos-vm = { workspace = true }
+aptos-rest-client = { workspace = true }
+aptos-db = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/util/movement-aptos/movement-aptos-util/src/lib.rs b/util/movement-aptos/movement-aptos-util/src/lib.rs
@@ -1,5 +1,10 @@
 pub use aptos_config;
 pub use aptos_crypto;
+pub use aptos_db;
+pub use aptos_executor;
 pub use aptos_node;
+pub use aptos_rest_client;
 pub use aptos_sdk;
+pub use aptos_storage_interface;
 pub use aptos_types;
+pub use aptos_vm;
diff --git a/util/movement/movement-util/Cargo.toml b/util/movement/movement-util/Cargo.toml
@@ -11,6 +11,7 @@ rust-version = { workspace = true }
 [dependencies]
 movement-util = { workspace = true }
 movement-client = { workspace = true }
+maptos-opt-executor = { workspace = true }
 
 [lints]
 workspace = true
diff --git a/util/movement/movement-util/src/lib.rs b/util/movement/movement-util/src/lib.rs
@@ -1,3 +1,4 @@
+pub use maptos_opt_executor::*;
 pub use movement_client::*;
 pub use movement_util::*;
 
