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

chore: remove prune_modes from BlockWriter (#9231)

Browse Source
This commit is contained in:
Dan Cline
2024-07-02 15:40:07 -04:00
committed by GitHub
parent e95c6dba9d
commit 405b730455
19 changed files with 105 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,6 +104,8 @@ pub struct DatabaseProvider<TX> {
chain_spec: Arc<ChainSpec>,
/// Static File provider
static_file_provider: StaticFileProvider,
/// Pruning configuration
prune_modes: PruneModes,
}
impl<TX> DatabaseProvider<TX> {
@ -119,8 +121,9 @@ impl<TX: DbTxMut> DatabaseProvider<TX> {
tx: TX,
chain_spec: Arc<ChainSpec>,
static_file_provider: StaticFileProvider,
prune_modes: PruneModes,
) -> Self {
Self { tx, chain_spec, static_file_provider }
Self { tx, chain_spec, static_file_provider, prune_modes }
}
}
@ -174,7 +177,6 @@ impl<TX: DbTxMut + DbTx> DatabaseProvider<TX> {
pub fn insert_historical_block(
&self,
block: SealedBlockWithSenders,
prune_modes: Option<&PruneModes>,
) -> ProviderResult<StoredBlockBodyIndices> {
let ttd = if block.number == 0 {
block.difficulty
@ -198,7 +200,7 @@ impl<TX: DbTxMut + DbTx> DatabaseProvider<TX> {
writer.append_header(block.header.as_ref().clone(), ttd, block.hash())?;
self.insert_block(block, prune_modes)
self.insert_block(block)
}
}
@ -256,8 +258,9 @@ impl<TX: DbTx> DatabaseProvider<TX> {
tx: TX,
chain_spec: Arc<ChainSpec>,
static_file_provider: StaticFileProvider,
prune_modes: PruneModes,
) -> Self {
Self { tx, chain_spec, static_file_provider }
Self { tx, chain_spec, static_file_provider, prune_modes }
}
/// Consume `DbTx` or `DbTxMut`.
@ -2621,7 +2624,6 @@ impl<TX: DbTxMut + DbTx> BlockWriter for DatabaseProvider<TX> {
fn insert_block(
&self,
block: SealedBlockWithSenders,
prune_modes: Option<&PruneModes>,
) -> ProviderResult<StoredBlockBodyIndices> {
let block_number = block.number;
@ -2678,8 +2680,10 @@ impl<TX: DbTxMut + DbTx> BlockWriter for DatabaseProvider<TX> {
for (transaction, sender) in block.block.body.into_iter().zip(block.senders.iter()) {
let hash = transaction.hash();
if prune_modes
.and_then(|modes| modes.sender_recovery)
if self
.prune_modes
.sender_recovery
.as_ref()
.filter(|prune_mode| prune_mode.is_full())
.is_none()
{
@ -2703,8 +2707,9 @@ impl<TX: DbTxMut + DbTx> BlockWriter for DatabaseProvider<TX> {
}
transactions_elapsed += elapsed;
if prune_modes
.and_then(|modes| modes.transaction_lookup)
if self
.prune_modes
.transaction_lookup
.filter(|prune_mode| prune_mode.is_full())
.is_none()
{
@ -2765,7 +2770,6 @@ impl<TX: DbTxMut + DbTx> BlockWriter for DatabaseProvider<TX> {
execution_outcome: ExecutionOutcome,
hashed_state: HashedPostState,
trie_updates: TrieUpdates,
prune_modes: Option<&PruneModes>,
) -> ProviderResult<()> {
if blocks.is_empty() {
debug!(target: "providers::db", "Attempted to append empty block range");
@ -2781,7 +2785,7 @@ impl<TX: DbTxMut + DbTx> BlockWriter for DatabaseProvider<TX> {
// Insert the blocks
for block in blocks {
self.insert_block(block, prune_modes)?;
self.insert_block(block)?;
durations_recorder.record_relative(metrics::Action::InsertBlock);
}