Skip to content

Commit

Permalink
[refactoring] Small nits
Browse files Browse the repository at this point in the history
  - Removed module_arc, module_ref APIs because we have Deref
  - Panic error on removing valid entry from cross-block module cache
  - Tests
  - Generic implementations of global cache and captured reads with mocked tests
  • Loading branch information
georgemitenkov committed Oct 22, 2024
1 parent 6c22515 commit bc42dfd
Show file tree
Hide file tree
Showing 20 changed files with 603 additions and 428 deletions.
8 changes: 4 additions & 4 deletions aptos-move/aptos-vm/src/block_executor/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ use aptos_aggregator::{
delayed_change::DelayedChange, delta_change_set::DeltaOp, resolver::TAggregatorV1View,
};
use aptos_block_executor::{
cross_block_caches::CachedAptosEnvironment, errors::BlockExecutionError,
executor::BlockExecutor, task::TransactionOutput as BlockExecutorTransactionOutput,
cross_block_caches::get_environment_with_delayed_field_optimization_enabled,
errors::BlockExecutionError, executor::BlockExecutor,
task::TransactionOutput as BlockExecutorTransactionOutput,
txn_commit_hook::TransactionCommitHook, types::InputOutputKey,
};
use aptos_infallible::Mutex;
Expand Down Expand Up @@ -416,8 +417,7 @@ impl BlockAptosVM {
ExecutableTestType,
>::new(config, executor_thread_pool, transaction_commit_listener);

let environment =
CachedAptosEnvironment::get_with_delayed_field_optimization_enabled(state_view)?;
let environment = get_environment_with_delayed_field_optimization_enabled(state_view)?;
let ret = executor.execute_block(environment, signature_verified_block, state_view);
match ret {
Ok(block_output) => {
Expand Down
Loading

0 comments on commit bc42dfd

Please sign in to comment.