From f8b58e4fff31da70a895817619a5bbee46301375 Mon Sep 17 00:00:00 2001 From: Arsenii Kulikov Date: Thu, 6 Mar 2025 00:01:35 +0400 Subject: [PATCH 1/2] fix: use correct HashMap import --- crates/database/src/in_memory_db.rs | 6 +----- crates/optimism/src/handler.rs | 2 +- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/crates/database/src/in_memory_db.rs b/crates/database/src/in_memory_db.rs index 5705e5f745..44282cbd38 100644 --- a/crates/database/src/in_memory_db.rs +++ b/crates/database/src/in_memory_db.rs @@ -1,10 +1,6 @@ use core::convert::Infallible; use database_interface::{Database, DatabaseCommit, DatabaseRef, EmptyDB}; -use primitives::{ - address, - hash_map::{Entry, HashMap}, - Address, Log, B256, KECCAK_EMPTY, U256, -}; +use primitives::{address, hash_map::Entry, Address, HashMap, Log, B256, KECCAK_EMPTY, U256}; use state::{Account, AccountInfo, Bytecode}; use std::vec::Vec; diff --git a/crates/optimism/src/handler.rs b/crates/optimism/src/handler.rs index cbbee17776..76e0ad3e26 100644 --- a/crates/optimism/src/handler.rs +++ b/crates/optimism/src/handler.rs @@ -23,7 +23,7 @@ use revm::{ Frame, FrameResult, Handler, MainnetHandler, }, interpreter::{interpreter::EthInterpreter, FrameInput, Gas}, - primitives::{hash_map::HashMap, U256}, + primitives::{HashMap, U256}, specification::hardfork::SpecId, state::{Account, EvmState}, Database, From 6d51b47d883d65a0c5ca14ef5c67365fdba681c7 Mon Sep 17 00:00:00 2001 From: Arsenii Kulikov Date: Thu, 6 Mar 2025 00:06:38 +0400 Subject: [PATCH 2/2] fix --- crates/database/src/in_memory_db.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/database/src/in_memory_db.rs b/crates/database/src/in_memory_db.rs index 44282cbd38..ce0288d4af 100644 --- a/crates/database/src/in_memory_db.rs +++ b/crates/database/src/in_memory_db.rs @@ -28,7 +28,7 @@ pub struct Cache { impl Default for Cache { fn default() -> Self { - let mut contracts = HashMap::new(); + let mut contracts = HashMap::default(); contracts.insert(KECCAK_EMPTY, Bytecode::default()); contracts.insert(B256::ZERO, Bytecode::default());