From 01d264c9ae16033cb3f8bd9554ee5abd26afb872 Mon Sep 17 00:00:00 2001 From: Alexey Shekhirin Date: Fri, 26 May 2023 16:22:25 +0400 Subject: [PATCH] chore(stages): use helper function for `checkpoint.unwrap_or_default()` (#2858) --- crates/stages/src/stage.rs | 2 +- crates/stages/src/stages/bodies.rs | 9 +++------ crates/stages/src/stages/finish.rs | 2 +- crates/stages/src/stages/hashing_account.rs | 2 +- crates/stages/src/stages/hashing_storage.rs | 4 ++-- crates/stages/src/stages/headers.rs | 6 +++--- crates/stages/src/stages/merkle.rs | 2 +- crates/stages/src/stages/sender_recovery.rs | 8 +++----- crates/stages/src/stages/total_difficulty.rs | 6 +++--- crates/stages/src/stages/tx_lookup.rs | 8 +++----- 10 files changed, 21 insertions(+), 28 deletions(-) diff --git a/crates/stages/src/stage.rs b/crates/stages/src/stage.rs index 812c7ea55c..3ff3f48b71 100644 --- a/crates/stages/src/stage.rs +++ b/crates/stages/src/stage.rs @@ -45,7 +45,7 @@ impl ExecInput { &self, threshold: u64, ) -> (RangeInclusive, bool) { - let current_block = self.checkpoint.unwrap_or_default(); + let current_block = self.checkpoint(); // +1 is to skip present block and always start from block number 1, not 0. let start = current_block.block_number + 1; let target = self.previous_stage_checkpoint().block_number; diff --git a/crates/stages/src/stages/bodies.rs b/crates/stages/src/stages/bodies.rs index 7ba2901d04..e8c87594ad 100644 --- a/crates/stages/src/stages/bodies.rs +++ b/crates/stages/src/stages/bodies.rs @@ -362,10 +362,7 @@ mod tests { ); let checkpoint = output.unwrap().checkpoint; runner - .validate_db_blocks( - input.checkpoint.unwrap_or_default().block_number, - checkpoint.block_number, - ) + .validate_db_blocks(input.checkpoint().block_number, checkpoint.block_number) .expect("Written block data invalid"); // Delete a transaction @@ -502,7 +499,7 @@ mod tests { type Seed = Vec; fn seed_execution(&mut self, input: ExecInput) -> Result { - let start = input.checkpoint.unwrap_or_default().block_number; + let start = input.checkpoint().block_number; let end = input.previous_stage_checkpoint().block_number; let blocks = random_block_range(start..=end, GENESIS_HASH, 0..2); self.tx.insert_headers_with_td(blocks.iter().map(|block| &block.header))?; @@ -547,7 +544,7 @@ mod tests { ) -> Result<(), TestRunnerError> { let highest_block = match output.as_ref() { Some(output) => output.checkpoint, - None => input.checkpoint.unwrap_or_default(), + None => input.checkpoint(), } .block_number; self.validate_db_blocks(highest_block, highest_block) diff --git a/crates/stages/src/stages/finish.rs b/crates/stages/src/stages/finish.rs index a867a26e28..d7e436f9a1 100644 --- a/crates/stages/src/stages/finish.rs +++ b/crates/stages/src/stages/finish.rs @@ -69,7 +69,7 @@ mod tests { type Seed = Vec; fn seed_execution(&mut self, input: ExecInput) -> Result { - let start = input.checkpoint.unwrap_or_default().block_number; + let start = input.checkpoint().block_number; let head = random_header(start, None); self.tx.insert_headers_with_td(std::iter::once(&head))?; diff --git a/crates/stages/src/stages/hashing_account.rs b/crates/stages/src/stages/hashing_account.rs index ba58dc530e..a043a6a1e3 100644 --- a/crates/stages/src/stages/hashing_account.rs +++ b/crates/stages/src/stages/hashing_account.rs @@ -481,7 +481,7 @@ mod tests { output: Option, ) -> Result<(), TestRunnerError> { if let Some(output) = output { - let start_block = input.checkpoint.unwrap_or_default().block_number + 1; + let start_block = input.checkpoint().block_number + 1; let end_block = output.checkpoint.block_number; if start_block > end_block { return Ok(()) diff --git a/crates/stages/src/stages/hashing_storage.rs b/crates/stages/src/stages/hashing_storage.rs index a5fa4fdab7..5b74f5d0f9 100644 --- a/crates/stages/src/stages/hashing_storage.rs +++ b/crates/stages/src/stages/hashing_storage.rs @@ -395,7 +395,7 @@ mod tests { type Seed = Vec; fn seed_execution(&mut self, input: ExecInput) -> Result { - let stage_progress = input.checkpoint.unwrap_or_default().block_number + 1; + let stage_progress = input.checkpoint().block_number + 1; let end = input.previous_stage_checkpoint().block_number; let n_accounts = 31; @@ -476,7 +476,7 @@ mod tests { output: Option, ) -> Result<(), TestRunnerError> { if let Some(output) = output { - let start_block = input.checkpoint.unwrap_or_default().block_number + 1; + let start_block = input.checkpoint().block_number + 1; let end_block = output.checkpoint.block_number; if start_block > end_block { return Ok(()) diff --git a/crates/stages/src/stages/headers.rs b/crates/stages/src/stages/headers.rs index d5b3de5fe0..1b144d8bd0 100644 --- a/crates/stages/src/stages/headers.rs +++ b/crates/stages/src/stages/headers.rs @@ -195,7 +195,7 @@ where tx: &mut Transaction<'_, DB>, input: ExecInput, ) -> Result { - let current_checkpoint = input.checkpoint.unwrap_or_default(); + let current_checkpoint = input.checkpoint(); // Lookup the head and tip of the sync range let gap = self.get_sync_gap(tx, current_checkpoint.block_number).await?; @@ -421,7 +421,7 @@ mod tests { type Seed = Vec; fn seed_execution(&mut self, input: ExecInput) -> Result { - let start = input.checkpoint.unwrap_or_default().block_number; + let start = input.checkpoint().block_number; let head = random_header(start, None); self.tx.insert_headers(std::iter::once(&head))?; // patch td table for `update_head` call @@ -446,7 +446,7 @@ mod tests { input: ExecInput, output: Option, ) -> Result<(), TestRunnerError> { - let initial_checkpoint = input.checkpoint.unwrap_or_default().block_number; + let initial_checkpoint = input.checkpoint().block_number; match output { Some(output) if output.checkpoint.block_number > initial_checkpoint => { self.tx.query(|tx| { diff --git a/crates/stages/src/stages/merkle.rs b/crates/stages/src/stages/merkle.rs index 7ea594aa89..513983a4dd 100644 --- a/crates/stages/src/stages/merkle.rs +++ b/crates/stages/src/stages/merkle.rs @@ -376,7 +376,7 @@ mod tests { type Seed = Vec; fn seed_execution(&mut self, input: ExecInput) -> Result { - let stage_progress = input.checkpoint.unwrap_or_default().block_number; + let stage_progress = input.checkpoint().block_number; let start = stage_progress + 1; let end = input.previous_stage_checkpoint().block_number; diff --git a/crates/stages/src/stages/sender_recovery.rs b/crates/stages/src/stages/sender_recovery.rs index 6c95a69be9..ad37986b16 100644 --- a/crates/stages/src/stages/sender_recovery.rs +++ b/crates/stages/src/stages/sender_recovery.rs @@ -316,7 +316,7 @@ mod tests { type Seed = Vec; fn seed_execution(&mut self, input: ExecInput) -> Result { - let stage_progress = input.checkpoint.unwrap_or_default().block_number; + let stage_progress = input.checkpoint().block_number; let end = input.previous_stage_checkpoint().block_number; let blocks = random_block_range(stage_progress..=end, H256::zero(), 0..2); @@ -331,7 +331,7 @@ mod tests { ) -> Result<(), TestRunnerError> { match output { Some(output) => self.tx.query(|tx| { - let start_block = input.checkpoint.unwrap_or_default().block_number + 1; + let start_block = input.checkpoint().block_number + 1; let end_block = output.checkpoint.block_number; if start_block > end_block { @@ -355,9 +355,7 @@ mod tests { Ok(()) })?, - None => self.ensure_no_senders_by_block( - input.checkpoint.unwrap_or_default().block_number, - )?, + None => self.ensure_no_senders_by_block(input.checkpoint().block_number)?, }; Ok(()) diff --git a/crates/stages/src/stages/total_difficulty.rs b/crates/stages/src/stages/total_difficulty.rs index 732c75b511..b06f839bfa 100644 --- a/crates/stages/src/stages/total_difficulty.rs +++ b/crates/stages/src/stages/total_difficulty.rs @@ -63,7 +63,7 @@ impl Stage for TotalDifficultyStage { let mut cursor_headers = tx.cursor_read::()?; // Get latest total difficulty - let last_header_number = input.checkpoint.unwrap_or_default().block_number; + let last_header_number = input.checkpoint().block_number; let last_entry = cursor_td .seek_exact(last_header_number)? .ok_or(ProviderError::TotalDifficultyNotFound { number: last_header_number })?; @@ -194,7 +194,7 @@ mod tests { type Seed = Vec; fn seed_execution(&mut self, input: ExecInput) -> Result { - let start = input.checkpoint.unwrap_or_default().block_number; + let start = input.checkpoint().block_number; let head = random_header(start, None); self.tx.insert_headers(std::iter::once(&head))?; self.tx.commit(|tx| { @@ -226,7 +226,7 @@ mod tests { input: ExecInput, output: Option, ) -> Result<(), TestRunnerError> { - let initial_stage_progress = input.checkpoint.unwrap_or_default().block_number; + let initial_stage_progress = input.checkpoint().block_number; match output { Some(output) if output.checkpoint.block_number > initial_stage_progress => { self.tx.query(|tx| { diff --git a/crates/stages/src/stages/tx_lookup.rs b/crates/stages/src/stages/tx_lookup.rs index 112e9d0da8..0ee8689c27 100644 --- a/crates/stages/src/stages/tx_lookup.rs +++ b/crates/stages/src/stages/tx_lookup.rs @@ -338,7 +338,7 @@ mod tests { type Seed = Vec; fn seed_execution(&mut self, input: ExecInput) -> Result { - let stage_progress = input.checkpoint.unwrap_or_default().block_number; + let stage_progress = input.checkpoint().block_number; let end = input.previous_stage_checkpoint().block_number; let blocks = random_block_range(stage_progress..=end, H256::zero(), 0..2); @@ -353,7 +353,7 @@ mod tests { ) -> Result<(), TestRunnerError> { match output { Some(output) => self.tx.query(|tx| { - let start_block = input.checkpoint.unwrap_or_default().block_number + 1; + let start_block = input.checkpoint().block_number + 1; let end_block = output.checkpoint.block_number; if start_block > end_block { @@ -377,9 +377,7 @@ mod tests { Ok(()) })?, - None => { - self.ensure_no_hash_by_block(input.checkpoint.unwrap_or_default().block_number)? - } + None => self.ensure_no_hash_by_block(input.checkpoint().block_number)?, }; Ok(()) }