jleony/nanoreth
1
0
Fork 0
mirror of https://github.com/hl-archive-node/nanoreth.git synced 2025-12-06 10:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore(rpc): remove redundant LoadFee::cache (#12146)

Browse Source
This commit is contained in:
Emilia Hane
2024-10-29 00:51:45 +08:00
committed by GitHub
parent 0733da9e12
commit 473026f40a
3 changed files with 4 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
crates/rpc/rpc-eth-api/src/helpers/fee.rs
View File

@ -6,8 +6,8 @@ use futures::Future;
use reth_chainspec::EthChainSpec;
use reth_provider::{BlockIdReader, ChainSpecProvider, HeaderProvider};
use reth_rpc_eth_types::{
fee_history::calculate_reward_percentiles_for_block, EthApiError, EthStateCache,
FeeHistoryCache, FeeHistoryEntry, GasPriceOracle, RpcInvalidTransactionError,
fee_history::calculate_reward_percentiles_for_block, EthApiError, FeeHistoryCache,
FeeHistoryEntry, GasPriceOracle, RpcInvalidTransactionError,
};
use tracing::debug;
@ -172,7 +172,7 @@ pub trait EthFees: LoadFee {
// Percentiles were specified, so we need to collect reward percentile ino
if let Some(percentiles) = &reward_percentiles {
let (block, receipts) = LoadFee::cache(self)
let (block, receipts) = self.cache()
.get_block_and_receipts(header.hash())
.await
.map_err(Self::Error::from_eth_err)?
@ -242,11 +242,6 @@ pub trait EthFees: LoadFee {
///
/// Behaviour shared by several `eth_` RPC methods, not exclusive to `eth_` fees RPC methods.
pub trait LoadFee: LoadBlock {
/// Returns a handle for reading data from memory.
///
/// Data access in default (L1) trait method implementations.
fn cache(&self) -> &EthStateCache;
/// Returns a handle for reading gas price.
///
/// Data access in default (L1) trait method implementations.

7
crates/rpc/rpc/src/eth/helpers/fees.rs
View File

@ -3,7 +3,7 @@
use reth_chainspec::{EthChainSpec, EthereumHardforks};
use reth_provider::{BlockReaderIdExt, ChainSpecProvider, EvmEnvProvider, StateProviderFactory};
use reth_rpc_eth_api::helpers::{EthFees, LoadBlock, LoadFee};
use reth_rpc_eth_types::{EthStateCache, FeeHistoryCache, GasPriceOracle};
use reth_rpc_eth_types::{FeeHistoryCache, GasPriceOracle};
use crate::EthApi;
@ -20,11 +20,6 @@ where
+ ChainSpecProvider<ChainSpec: EthChainSpec + EthereumHardforks>
+ StateProviderFactory,
{
#[inline]
fn cache(&self) -> &EthStateCache {
self.inner.cache()
}
#[inline]
fn gas_oracle(&self) -> &GasPriceOracle<Self::Provider> {
self.inner.gas_oracle()