[draft] Better states and encapsulation

aptos-labs · Nov 8, 2024 · 9f14964 · 9f14964
1 parent 61a1002
commit 9f14964
Show file tree

Hide file tree

Showing 26 changed files with 543 additions and 668 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/aptos-move/aptos-debugger/src/aptos_debugger.rs b/aptos-move/aptos-debugger/src/aptos_debugger.rs
@@ -430,11 +430,7 @@ fn execute_block_no_limit(
     concurrency_level: usize,
 ) -> Result<Vec<TransactionOutput>, VMStatus> {
     let global_cache_manager = GlobalCacheManager::new_with_default_config();
-    global_cache_manager.mark_block_execution_start(state_view, None)?;
-    let result = BlockAptosVM::execute_block::<
-        _,
-        NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>,
-    >(
+    BlockAptosVM::execute_block::<_, NoOpTransactionCommitHook<AptosTransactionOutput, VMStatus>>(
         sig_verified_txns,
         state_view,
         &global_cache_manager,
@@ -448,7 +444,5 @@ fn execute_block_no_limit(
         },
         None,
     )
-    .map(BlockOutput::into_transaction_outputs_forced);
-    global_cache_manager.mark_block_execution_end(None)?;
-    result
+    .map(BlockOutput::into_transaction_outputs_forced)
 }
diff --git a/aptos-move/aptos-e2e-comparison-testing/Cargo.toml b/aptos-move/aptos-e2e-comparison-testing/Cargo.toml
@@ -13,7 +13,6 @@ default-run = "aptos-comparison-testing"
 [dependencies]
 anyhow = { workspace = true }
 aptos-framework = { workspace = true }
-aptos-global-cache-manager = { workspace = true }
 aptos-language-e2e-tests = { workspace = true }
 aptos-rest-client = { workspace = true }
 aptos-types = { workspace = true }

diff --git a/aptos-move/aptos-global-cache-manager/Cargo.toml b/aptos-move/aptos-global-cache-manager/Cargo.toml
@@ -13,14 +13,13 @@ repository = { workspace = true }
 rust-version = { workspace = true }
 
 [dependencies]
+anyhow = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-types = { workspace = true }
 aptos-vm-environment = { workspace = true }
-aptos-vm-types = { workspace = true }
 move-binary-format = { workspace = true }
 move-core-types = { workspace = true }
 move-vm-runtime = { workspace = true }
-move-vm-types = { workspace = true }
 parking_lot = { workspace = true }
 
 [dev-dependencies]