github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-28 16:48:13 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore: remove unused methods from EvmEnvProviders (#9148)

Browse Source
This commit is contained in:
joshieDo
2024-06-27 17:42:29 +02:00
committed by GitHub
parent 5aaf91dbcb
commit 5b2cd27a1a
6 changed files with 3 additions and 118 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
crates/evm/src/provider.rs
View File

@@ -52,20 +52,6 @@ pub trait EvmEnvProvider: Send + Sync {
where
EvmConfig: ConfigureEvmEnv;
/// Fills the [BlockEnv] fields with values specific to the given [BlockHashOrNumber].
fn fill_block_env_at(
&self,
block_env: &mut BlockEnv,
at: BlockHashOrNumber,
) -> ProviderResult<()>;
/// Fills the [BlockEnv] fields with values specific to the given [Header].
fn fill_block_env_with_header(
&self,
block_env: &mut BlockEnv,
header: &Header,
) -> ProviderResult<()>;
/// Fills the [`CfgEnvWithHandlerCfg`] fields with values specific to the given
/// [BlockHashOrNumber].
fn fill_cfg_env_at<EvmConfig>(

16
crates/storage/provider/src/providers/database/mod.rs
View File

@@ -519,22 +519,6 @@ impl<DB: Database> EvmEnvProvider for ProviderFactory<DB> {
self.provider()?.fill_env_with_header(cfg, block_env, header, evm_config)
}
fn fill_block_env_at(
&self,
block_env: &mut BlockEnv,
at: BlockHashOrNumber,
) -> ProviderResult<()> {
self.provider()?.fill_block_env_at(block_env, at)
}
fn fill_block_env_with_header(
&self,
block_env: &mut BlockEnv,
header: &Header,
) -> ProviderResult<()> {
self.provider()?.fill_block_env_with_header(block_env, header)
}
fn fill_cfg_env_at<EvmConfig>(
&self,
cfg: &mut CfgEnvWithHandlerCfg,

43
crates/storage/provider/src/providers/database/provider.rs
View File

@@ -32,10 +32,8 @@ use reth_evm::ConfigureEvmEnv;
use reth_execution_types::{Chain, ExecutionOutcome};
use reth_network_p2p::headers::downloader::SyncTarget;
use reth_primitives::{
keccak256,
revm::{config::revm_spec, env::fill_block_env},
Account, Address, Block, BlockHash, BlockHashOrNumber, BlockNumber, BlockWithSenders,
GotExpected, Head, Header, Receipt, Requests, SealedBlock, SealedBlockWithSenders,
keccak256, Account, Address, Block, BlockHash, BlockHashOrNumber, BlockNumber,
BlockWithSenders, GotExpected, Header, Receipt, Requests, SealedBlock, SealedBlockWithSenders,
SealedHeader, StaticFileSegment, StorageEntry, TransactionMeta, TransactionSigned,
TransactionSignedEcRecovered, TransactionSignedNoHash, TxHash, TxNumber, Withdrawal,
Withdrawals, B256, U256,
@@ -48,7 +46,7 @@ use reth_trie::{
updates::TrieUpdates,
HashedPostState, Nibbles, StateRoot,
};
use revm::primitives::{BlockEnv, CfgEnvWithHandlerCfg, SpecId};
use revm::primitives::{BlockEnv, CfgEnvWithHandlerCfg};
use std::{
cmp::Ordering,
collections::{hash_map, BTreeMap, BTreeSet, HashMap, HashSet},
@@ -2005,41 +2003,6 @@ impl<TX: DbTx> EvmEnvProvider for DatabaseProvider<TX> {
Ok(())
}
fn fill_block_env_at(
&self,
block_env: &mut BlockEnv,
at: BlockHashOrNumber,
) -> ProviderResult<()> {
let hash = self.convert_number(at)?.ok_or(ProviderError::HeaderNotFound(at))?;
let header = self.header(&hash)?.ok_or(ProviderError::HeaderNotFound(at))?;
self.fill_block_env_with_header(block_env, &header)
}
fn fill_block_env_with_header(
&self,
block_env: &mut BlockEnv,
header: &Header,
) -> ProviderResult<()> {
let total_difficulty = self
.header_td_by_number(header.number)?
.ok_or_else(|| ProviderError::HeaderNotFound(header.number.into()))?;
let spec_id = revm_spec(
&self.chain_spec,
Head {
number: header.number,
timestamp: header.timestamp,
difficulty: header.difficulty,
total_difficulty,
// Not required
hash: Default::default(),
},
);
let after_merge = spec_id >= SpecId::MERGE;
fill_block_env(block_env, &self.chain_spec, header, after_merge);
Ok(())
}
fn fill_cfg_env_at<EvmConfig>(
&self,
cfg: &mut CfgEnvWithHandlerCfg,

16
crates/storage/provider/src/providers/mod.rs
View File

@@ -538,22 +538,6 @@ where
self.database.provider()?.fill_env_with_header(cfg, block_env, header, evm_config)
}
fn fill_block_env_at(
&self,
block_env: &mut BlockEnv,
at: BlockHashOrNumber,
) -> ProviderResult<()> {
self.database.provider()?.fill_block_env_at(block_env, at)
}
fn fill_block_env_with_header(
&self,
block_env: &mut BlockEnv,
header: &Header,
) -> ProviderResult<()> {
self.database.provider()?.fill_block_env_with_header(block_env, header)
}
fn fill_cfg_env_at<EvmConfig>(
&self,
cfg: &mut CfgEnvWithHandlerCfg,

16
crates/storage/provider/src/test_utils/mock.rs
View File

@@ -599,22 +599,6 @@ impl EvmEnvProvider for MockEthProvider {
Ok(())
}
fn fill_block_env_at(
&self,
_block_env: &mut BlockEnv,
_at: BlockHashOrNumber,
) -> ProviderResult<()> {
Ok(())
}
fn fill_block_env_with_header(
&self,
_block_env: &mut BlockEnv,
_header: &Header,
) -> ProviderResult<()> {
Ok(())
}
fn fill_cfg_env_at<EvmConfig>(
&self,
_cfg: &mut CfgEnvWithHandlerCfg,

16
crates/storage/provider/src/test_utils/noop.rs
View File

@@ -358,22 +358,6 @@ impl EvmEnvProvider for NoopProvider {
Ok(())
}
fn fill_block_env_at(
&self,
_block_env: &mut BlockEnv,
_at: BlockHashOrNumber,
) -> ProviderResult<()> {
Ok(())
}
fn fill_block_env_with_header(
&self,
_block_env: &mut BlockEnv,
_header: &Header,
) -> ProviderResult<()> {
Ok(())
}
fn fill_cfg_env_at<EvmConfig>(
&self,
_cfg: &mut CfgEnvWithHandlerCfg,