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

style: replace next_sync_target Receiver loop with call to wait_for (#3618)

Browse Source
This commit is contained in:
ChosunOne
2023-07-11 01:15:40 +09:00
committed by GitHub
parent ad2a8a5a17
commit 4b261cef45
1 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -119,27 +119,25 @@ where
// reverse from there. Else, it should use whatever the forkchoice state reports.
let target = match next_header {
Some(header) if checkpoint + 1 != header.number => SyncTarget::Gap(header),
None => self.next_sync_target(head_num).await,
None => self
.next_sync_target(head_num)
.await
.ok_or(StageError::StageCheckpoint(checkpoint))?,
_ => return Err(StageError::StageCheckpoint(checkpoint)),
};
Ok(SyncGap { local_head, target })
}
async fn next_sync_target(&mut self, head: BlockNumber) -> SyncTarget {
async fn next_sync_target(&mut self, head: BlockNumber) -> Option<SyncTarget> {
match self.mode {
HeaderSyncMode::Tip(ref mut rx) => {
loop {
let _ = rx.changed().await; // TODO: remove this await?
let tip = rx.borrow();
if !tip.is_zero() {
return SyncTarget::Tip(*tip)
}
}
let tip = rx.wait_for(|tip| !tip.is_zero()).await.ok()?;
Some(SyncTarget::Tip(*tip))
}
HeaderSyncMode::Continuous => {
tracing::trace!(target: "sync::stages::headers", head, "No next header found, using continuous sync strategy");
SyncTarget::TipNum(head + 1)
trace!(target: "sync::stages::headers", head, "No next header found, using continuous sync strategy");
Some(SyncTarget::TipNum(head + 1))
}
}
}