[draft] Better states and encapsulation

Cargo.toml

@@ -16,7 +16,6 @@ members = [
     "aptos-move/aptos-gas-profiling",
     "aptos-move/aptos-gas-schedule",
     "aptos-move/aptos-gas-schedule-updator",
-    "aptos-move/aptos-global-cache-manager",
     "aptos-move/aptos-memory-usage-tracker",
     "aptos-move/aptos-native-interface",
     "aptos-move/aptos-release-builder",
@@ -358,7 +357,6 @@ aptos-gas-schedule = { path = "aptos-move/aptos-gas-schedule" }
 aptos-gas-schedule-updator = { path = "aptos-move/aptos-gas-schedule-updator" }
 aptos-genesis = { path = "crates/aptos-genesis" }
 aptos-github-client = { path = "crates/aptos-github-client" }
-aptos-global-cache-manager = { path = "aptos-move/aptos-global-cache-manager" }
 aptos-global-constants = { path = "config/global-constants" }
 aptos-id-generator = { path = "crates/aptos-id-generator" }
 aptos-indexer = { path = "crates/indexer" }

aptos-move/aptos-debugger/Cargo.toml

@@ -18,7 +18,6 @@ aptos-block-executor = { workspace = true }
 aptos-consensus = { workspace = true }
 aptos-crypto = { workspace = true }
 aptos-gas-profiling = { workspace = true }
-aptos-global-cache-manager = { workspace = true }
 aptos-logger = { workspace = true }
 aptos-rest-client = { workspace = true }
 aptos-types = { workspace = true }

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

@@ -4,7 +4,6 @@
 use anyhow::{bail, format_err, Result};
 use aptos_block_executor::txn_commit_hook::NoOpTransactionCommitHook;
 use aptos_gas_profiling::{GasProfiler, TransactionGasLog};
-use aptos_global_cache_manager::GlobalCacheManager;
 use aptos_rest_client::Client;
 use aptos_types::{
     account_address::AccountAddress,
@@ -429,26 +428,15 @@ fn execute_block_no_limit(
     state_view: &DebuggerStateView,
     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,
+        None,
         BlockExecutorConfig {
-            local: BlockExecutorLocalConfig {
-                concurrency_level,
-                allow_fallback: true,
-                discard_failed_blocks: false,
-            },
+            local: BlockExecutorLocalConfig::default_with_concurrency_level(concurrency_level),
             onchain: BlockExecutorConfigFromOnchain::new_no_block_limit(),
         },
         None,
     )
-    .map(BlockOutput::into_transaction_outputs_forced);
-    global_cache_manager.mark_block_execution_end(None)?;
-    result
+    .map(BlockOutput::into_transaction_outputs_forced)
 }

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 }