refactor a bit (#7918)

* refactor a bit

* remove arc from VM

* Fix is_resource_group

* fix build error

* temp

* tmp

* refactor

* add utils

* remove generic type params

* remove unused

* revert

* fmt

* Add new macro

* undo changes

* improve map_err

* remove map_err

Cargo.toml

@@ -32,6 +32,7 @@ members = [
     "aptos-move/vm-genesis",
     "aptos-move/writeset-transaction-generator",
     "aptos-node",
+    "aptos-utils",
     "config",
     "config/global-constants",
     "consensus",
@@ -358,6 +359,7 @@ aptos-transaction-emitter-lib = { path = "crates/transaction-emitter-lib" }
 aptos-transaction-generator-lib = { path = "crates/transaction-generator-lib" }
 aptos-transactional-test-harness = { path = "aptos-move/aptos-transactional-test-harness" }
 aptos-types = { path = "types" }
+aptos-utils = { path = "aptos-utils" }
 aptos-validator-interface = { path = "aptos-move/aptos-validator-interface" }
 aptos-vault-client = { path = "secure/storage/vault" }
 aptos-vm = { path = "aptos-move/aptos-vm" }

aptos-move/aptos-debugger/src/lib.rs

@@ -220,7 +220,7 @@ impl AptosDebugger {
 
     pub fn run_session_at_version<F>(&self, version: Version, f: F) -> Result<ChangeSet>
     where
-        F: FnOnce(&mut SessionExt<StorageAdapter<DebuggerStateView>>) -> VMResult<()>,
+        F: FnOnce(&mut SessionExt) -> VMResult<()>,
     {
         let state_view = DebuggerStateView::new(self.debugger.clone(), version);
         let state_view_storage = StorageAdapter::new(&state_view);

aptos-move/aptos-vm/Cargo.toml

@@ -27,6 +27,7 @@ aptos-move-stdlib = { workspace = true }
 aptos-mvhashmap = { workspace = true }
 aptos-state-view = { workspace = true }
 aptos-types = { workspace = true }
+aptos-utils = { workspace = true }
 aptos-vm-logging = { workspace = true }
 bcs = { workspace = true }
 dashmap = { workspace = true }

aptos-move/aptos-vm/src/adapter_common.rs

@@ -18,15 +18,15 @@ use aptos_vm_logging::log_schema::AdapterLogSchema;
 
 /// This trait describes the VM adapter's interface.
 /// TODO: bring more of the execution logic in aptos_vm into this file.
-pub trait VMAdapter {
+pub(crate) trait VMAdapter {
     /// Creates a new Session backed by the given storage.
     /// TODO: this doesn't belong in this trait. We should be able to remove
     /// this after redesigning cache ownership model.
-    fn new_session<'r, R: MoveResolverExt>(
+    fn new_session<'r>(
         &self,
-        remote: &'r R,
+        remote: &'r impl MoveResolverExt,
         session_id: SessionId,
-    ) -> SessionExt<'r, '_, R>;
+    ) -> SessionExt<'r, '_>;
 
     /// Checks the signature of the given signed transaction and returns
     /// `Ok(SignatureCheckedTransaction)` if the signature is valid.
@@ -36,10 +36,10 @@ pub trait VMAdapter {
     fn check_transaction_format(&self, txn: &SignedTransaction) -> Result<(), VMStatus>;
 
     /// Runs the prologue for the given transaction.
-    fn run_prologue<S: MoveResolverExt, SS: MoveResolverExt>(
+    fn run_prologue(
         &self,
-        session: &mut SessionExt<SS>,
-        storage: &S,
+        session: &mut SessionExt,
+        storage: &impl MoveResolverExt,
         transaction: &SignatureCheckedTransaction,
         log_context: &AdapterLogSchema,
     ) -> Result<(), VMStatus>;
@@ -48,17 +48,17 @@ pub trait VMAdapter {
     fn should_restart_execution(output: &TransactionOutput) -> bool;
 
     /// Execute a single transaction.
-    fn execute_single_transaction<S: MoveResolverExt>(
+    fn execute_single_transaction(
         &self,
         txn: &PreprocessedTransaction,
-        data_cache: &S,
+        data_cache: &impl MoveResolverExt,
         log_context: &AdapterLogSchema,
     ) -> Result<(VMStatus, TransactionOutputExt, Option<String>), VMStatus>;
 
-    fn validate_signature_checked_transaction<S: MoveResolverExt, SS: MoveResolverExt>(
+    fn validate_signature_checked_transaction(
         &self,
-        session: &mut SessionExt<SS>,
-        storage: &S,
+        session: &mut SessionExt,
+        storage: &impl MoveResolverExt,
         transaction: &SignatureCheckedTransaction,
         allow_too_new: bool,
         log_context: &AdapterLogSchema,