refactor: minor refactors

megaeth-labs · Mar 13, 2024 · 336b622 · 336b622
1 parent 18d03d3
commit 336b622
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/crates/primitives/src/state.rs b/crates/primitives/src/state.rs
@@ -16,7 +16,6 @@ pub type Storage = HashMap<
     U256,
     StorageSlot,
     hashbrown::hash_map::DefaultHashBuilder,
-    // tracking_allocator::TrackingAllocator,
     revm_utils::TrackingAllocator,
 >;
 
@@ -67,7 +66,6 @@ impl Account {
             #[cfg(not(feature = "enable_cache_record"))]
             storage: HashMap::new(),
             #[cfg(feature = "enable_cache_record")]
-            // storage: HashMap::new_in(tracking_allocator::TrackingAllocator),
             storage: HashMap::new_in(revm_utils::TrackingAllocator),
             status: AccountStatus::LoadedAsNotExisting,
         }
@@ -145,7 +143,6 @@ impl From<AccountInfo> for Account {
             #[cfg(not(feature = "enable_cache_record"))]
             storage: HashMap::new(),
             #[cfg(feature = "enable_cache_record")]
-            // storage: HashMap::new_in(tracking_allocator::TrackingAllocator),
             storage: HashMap::new_in(revm_utils::TrackingAllocator),
             status: AccountStatus::Loaded,
         }

diff --git a/crates/revm/src/evm.rs b/crates/revm/src/evm.rs
@@ -159,10 +159,8 @@ impl<EXT, DB: Database> Evm<'_, EXT, DB> {
     #[inline]
     pub fn transact(&mut self) -> EVMResult<DB::Error> {
         #[cfg(feature = "enable_transact_measure")]
-        {
-            revm_utils::metrics::transact_start_record();
-            revm_utils::metrics::transact_sub_record();
-        }
+        revm_utils::metrics::transact_record();
+
         self.handler.validation().env(&self.context.evm.env)?;
         let initial_gas_spend = self
             .handler