From 38bc7a14a34654a20b8de678bd325ec992733d0d Mon Sep 17 00:00:00 2001 From: joshieDo <93316087+joshieDo@users.noreply.github.com> Date: Wed, 17 Jul 2024 18:41:22 +0200 Subject: [PATCH] chore: use each prune segment method on `remove_blocks_above` (#9568) --- crates/engine/tree/src/static_files.rs | 16 +++++----------- .../provider/src/providers/static_file/writer.rs | 2 +- 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/crates/engine/tree/src/static_files.rs b/crates/engine/tree/src/static_files.rs index 90860ab348..fcdf0292bd 100644 --- a/crates/engine/tree/src/static_files.rs +++ b/crates/engine/tree/src/static_files.rs @@ -185,17 +185,11 @@ where let mut receipts_writer = sf_provider.get_writer(block_num, StaticFileSegment::Receipts)?; // finally actually truncate, these internally commit - receipts_writer.truncate(StaticFileSegment::Receipts, total_txs, Some(block_num))?; - transactions_writer.truncate( - StaticFileSegment::Transactions, - total_txs, - Some(block_num), - )?; - header_writer.truncate( - StaticFileSegment::Headers, - highest_static_file_block.saturating_sub(block_num), - None, - )?; + receipts_writer.prune_receipts(total_txs, block_num)?; + transactions_writer.prune_transactions(total_txs, block_num)?; + header_writer.prune_headers(highest_static_file_block.saturating_sub(block_num))?; + + sf_provider.commit()?; Ok(()) } diff --git a/crates/storage/provider/src/providers/static_file/writer.rs b/crates/storage/provider/src/providers/static_file/writer.rs index 96e8d98243..df4417ace2 100644 --- a/crates/storage/provider/src/providers/static_file/writer.rs +++ b/crates/storage/provider/src/providers/static_file/writer.rs @@ -338,7 +338,7 @@ impl StaticFileProviderRW { /// /// # Note /// Commits to the configuration file at the end. - pub fn truncate( + fn truncate( &mut self, segment: StaticFileSegment, num_rows: u64,