github/reth
1
1
Fork 0
mirror of https://github.com/paradigmxyz/reth.git synced 2026-01-30 17:48:03 -05:00
Code Issues Packages Projects Releases Wiki Activity

chore(stages): use helper function for checkpoint.unwrap_or_default() (#2858)

Browse Source
This commit is contained in:
Alexey Shekhirin
2023-05-26 16:22:25 +04:00
committed by GitHub
parent 10b577096b
commit 01d264c9ae
10 changed files with 21 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crates/stages/src/stage.rs
View File

@@ -45,7 +45,7 @@ impl ExecInput {
&self,
threshold: u64,
) -> (RangeInclusive<BlockNumber>, 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;

9
crates/stages/src/stages/bodies.rs
View File

@@ -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<SealedBlock>;
fn seed_execution(&mut self, input: ExecInput) -> Result<Self::Seed, TestRunnerError> {
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)

2
crates/stages/src/stages/finish.rs
View File

@@ -69,7 +69,7 @@ mod tests {
type Seed = Vec<SealedHeader>;
fn seed_execution(&mut self, input: ExecInput) -> Result<Self::Seed, TestRunnerError> {
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))?;

2
crates/stages/src/stages/hashing_account.rs
View File

@@ -481,7 +481,7 @@ mod tests {
output: Option<ExecOutput>,
) -> 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(())

4
crates/stages/src/stages/hashing_storage.rs
View File

@@ -395,7 +395,7 @@ mod tests {
type Seed = Vec<SealedBlock>;
fn seed_execution(&mut self, input: ExecInput) -> Result<Self::Seed, TestRunnerError> {
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<ExecOutput>,
) -> 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(())

6
crates/stages/src/stages/headers.rs
View File

@@ -195,7 +195,7 @@ where
tx: &mut Transaction<'_, DB>,
input: ExecInput,
) -> Result<ExecOutput, StageError> {
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<SealedHeader>;
fn seed_execution(&mut self, input: ExecInput) -> Result<Self::Seed, TestRunnerError> {
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<ExecOutput>,
) -> 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| {

2
crates/stages/src/stages/merkle.rs
View File

@@ -376,7 +376,7 @@ mod tests {
type Seed = Vec<SealedBlock>;
fn seed_execution(&mut self, input: ExecInput) -> Result<Self::Seed, TestRunnerError> {
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;

8
crates/stages/src/stages/sender_recovery.rs
View File

@@ -316,7 +316,7 @@ mod tests {
type Seed = Vec<SealedBlock>;
fn seed_execution(&mut self, input: ExecInput) -> Result<Self::Seed, TestRunnerError> {
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(())

6
crates/stages/src/stages/total_difficulty.rs
View File

@@ -63,7 +63,7 @@ impl<DB: Database> Stage<DB> for TotalDifficultyStage {
let mut cursor_headers = tx.cursor_read::<tables::Headers>()?;
// 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<SealedHeader>;
fn seed_execution(&mut self, input: ExecInput) -> Result<Self::Seed, TestRunnerError> {
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<ExecOutput>,
) -> 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| {

8
crates/stages/src/stages/tx_lookup.rs
View File

@@ -338,7 +338,7 @@ mod tests {
type Seed = Vec<SealedBlock>;
fn seed_execution(&mut self, input: ExecInput) -> Result<Self::Seed, TestRunnerError> {
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(())
}