Skip to content
This repository has been archived by the owner on Nov 15, 2023. It is now read-only.

Don't request old obsolete blocks #4084

Merged
merged 1 commit into from
Nov 11, 2019
Merged

Don't request old obsolete blocks #4084

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 12 additions & 1 deletion core/network/src/protocol/sync.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -597,7 +597,14 @@ impl<B: BlockT> ChainSync<B> {
peer.state = PeerSyncState::DownloadingStale(hash);
have_requests = true;
Some((id.clone(), req))
} else if let Some((range, req)) = peer_block_request(id, peer, blocks, attrs, max_parallel) {
} else if let Some((range, req)) = peer_block_request(
id,
peer,
blocks,
attrs,
max_parallel,
last_finalized
) {
peer.state = PeerSyncState::DownloadingNew(range.start);
trace!(
target: "sync",
Expand Down Expand Up @@ -1236,7 +1243,11 @@ fn peer_block_request<B: BlockT>(
blocks: &mut BlockCollection<B>,
attrs: &message::BlockAttributes,
max_parallel_downloads: u32,
finalized: NumberFor<B>,
) -> Option<(Range<NumberFor<B>>, BlockRequest<B>)> {
if peer.common_number < finalized {
return None;
}
if let Some(range) = blocks.needed_blocks(
id.clone(),
MAX_BLOCKS_TO_REQUEST,
Expand Down