From c7d1f61817ae9888c2676f37f3fce92d1533f15f Mon Sep 17 00:00:00 2001 From: kamalbuilds Date: Mon, 25 Aug 2025 15:24:55 +0530 Subject: [PATCH] revert changes --- .../src/providers/database/provider.rs | 21 ++++--------------- 1 file changed, 4 insertions(+), 17 deletions(-) diff --git a/crates/storage/provider/src/providers/database/provider.rs b/crates/storage/provider/src/providers/database/provider.rs index 109e83805..67c73595a 100644 --- a/crates/storage/provider/src/providers/database/provider.rs +++ b/crates/storage/provider/src/providers/database/provider.rs @@ -2278,16 +2278,7 @@ impl StateWriter let mut block_receipts = Vec::with_capacity(block_body.tx_count as usize); for num in block_body.tx_num_range() { if receipts_iter.peek().is_some_and(|(n, _)| *n == num) { - // Safe to unwrap here since we just peeked and confirmed it exists - // However, for maximum safety in database operations, we still handle it - if let Some((_, receipt)) = receipts_iter.next() { - block_receipts.push(receipt); - } else { - // This should never happen based on peek(), but handle gracefully - return Err(ProviderError::Database(reth_db::DatabaseError::Other( - "Receipt iterator state mismatch during state reconstruction".into() - ))); - } + block_receipts.push(receipts_iter.next().unwrap().1); } } receipts.push(block_receipts); @@ -3079,13 +3070,9 @@ impl BlockWrite return Ok(()); } - // Safe to unwrap after empty check, but use defensive programming for critical DB ops - let first_number = blocks.first() - .expect("Blocks vector guaranteed non-empty after length check") - .number(); + let first_number = blocks.first().unwrap().number(); - let last = blocks.last() - .expect("Blocks vector guaranteed non-empty after length check"); + let last = blocks.last().unwrap(); let last_block_number = last.number(); let mut durations_recorder = metrics::DurationsRecorder::default(); @@ -3215,4 +3202,4 @@ impl DBProvider for DatabaseProvider fn prune_modes_ref(&self) -> &PruneModes { self.prune_modes_ref() } -} +} \ No newline at end of file