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

fix: simplify SyncState and fix wrong update (#2256)

Browse Source
This commit is contained in:
Matthias Seitz
2023-04-15 01:31:09 +02:00
committed by GitHub
parent c67c944a1f
commit 154ece7665
6 changed files with 22 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,4 +1,4 @@
use crate::stages::{BODIES, HEADERS};
use crate::stages::{BODIES, FINISH, HEADERS};
use reth_db::{
tables::SyncStage,
transaction::{DbTx, DbTxMut},
@ -20,11 +20,16 @@ impl Display for StageId {
}
impl StageId {
/// Returns a flag indicating if it's a downloading stage
/// Returns true if it's a downloading stage [HEADERS] or [BODIES
pub fn is_downloading_stage(&self) -> bool {
*self == HEADERS || *self == BODIES
}
/// Returns true indicating if it's the finish stage [FINISH]
pub fn is_finish(&self) -> bool {
*self == FINISH
}
/// Get the last committed progress of this stage.
pub fn get_progress<'db>(&self, tx: &impl DbTx<'db>) -> Result<Option<BlockNumber>, DbError> {
tx.get::<SyncStage>(self.0.to_string())

23
crates/stages/src/pipeline/mod.rs
View File

@ -212,8 +212,11 @@ where
// Update sync state
if let Some(ref updater) = self.sync_state_updater {
let state = self.progress.current_sync_state(stage_id.is_downloading_stage());
updater.update_sync_state(state);
if stage_id.is_finish() {
updater.update_sync_state(SyncState::Idle);
} else {
updater.update_sync_state(SyncState::Syncing);
}
}
trace!(target: "sync::pipeline", stage = %stage_id, "Executing stage");
@ -234,7 +237,7 @@ where
ControlFlow::Unwind { target, bad_block } => {
// reset the sync state
if let Some(ref updater) = self.sync_state_updater {
updater.update_sync_state(SyncState::Downloading { target_block: target });
updater.update_sync_state(SyncState::Syncing);
}
self.unwind(db.as_ref(), target, bad_block).await?;
return Ok(ControlFlow::Unwind { target, bad_block })
@ -432,20 +435,6 @@ mod tests {
assert_eq!(progress.maximum_progress, Some(20));
}
#[test]
fn sync_states() {
let mut progress = PipelineProgress::default();
// no progress, so we're idle
assert_eq!(progress.current_sync_state(false), SyncState::Idle);
assert_eq!(progress.current_sync_state(true), SyncState::Idle);
// progress and downloading/executing
progress.update(1);
assert_eq!(progress.current_sync_state(true), SyncState::Downloading { target_block: 1 });
assert_eq!(progress.current_sync_state(false), SyncState::Executing { target_block: 1 });
}
#[test]
fn progress_ctrl_flow() {
let mut progress = PipelineProgress::default();

10
crates/stages/src/pipeline/progress.rs
View File

@ -1,6 +1,5 @@
use super::ctrl::ControlFlow;
use crate::util::opt;
use reth_interfaces::sync::SyncState;
use reth_primitives::BlockNumber;
#[derive(Debug, Default)]
@ -20,15 +19,6 @@ impl PipelineProgress {
self.maximum_progress = opt::max(self.maximum_progress, progress);
}
/// Create a sync state from pipeline progress.
pub(crate) fn current_sync_state(&self, downloading: bool) -> SyncState {
match self.progress {
Some(progress) if downloading => SyncState::Downloading { target_block: progress },
Some(progress) => SyncState::Executing { target_block: progress },
None => SyncState::Idle,
}
}
/// Get next control flow step
pub(crate) fn next_ctrl(&self) -> ControlFlow {
match self.progress {