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

Do not drop the peer with None difficulty #10772

Merged
merged 2 commits into from
Jun 27, 2019
Merged

Do not drop the peer with None difficulty #10772

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b32c92
Treat peer with None difficulty as legit
grbIzl Jun 24, 2019
17e5d8c
Temporarily enable release binary build - REMOVE BEFORE MERGE
grbIzl Jun 24, 2019
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
2 changes: 1 addition & 1 deletion .gitlab-ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ build-android:

build-linux:
<<: *build-on-linux
only: *releaseable_branches
# only: *releaseable_branches

build-linux-i386:
<<: *build-on-linux
Expand Down
2 changes: 1 addition & 1 deletion ethcore/sync/src/chain/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -994,7 +994,7 @@ impl ChainSync {
}

// Only ask for old blocks if the peer has an equal or higher difficulty
let equal_or_higher_difficulty = peer_difficulty.map_or(false, |pd| pd >= syncing_difficulty);
let equal_or_higher_difficulty = peer_difficulty.map_or(true, |pd| pd >= syncing_difficulty);

if force || equal_or_higher_difficulty {
if let Some(request) = self.old_blocks.as_mut().and_then(|d| d.request_blocks(peer_id, io, num_active_peers)) {
Expand Down