Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Merged by Bors] - Temporary Sync Work-Around #1615

Closed
wants to merge 2 commits into from
Closed

[Merged by Bors] - Temporary Sync Work-Around #1615

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b3469c8
Hack to fix race condition
AgeManning Sep 11, 2020
51348d8
Clippy lint
AgeManning Sep 13, 2020
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
8 changes: 5 additions & 3 deletions beacon_node/network/src/sync/range_sync/chain_collection.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,15 +248,17 @@ impl<T: BeaconChainTypes> ChainCollection<T> {
// Check if any chains become the new syncing chain
if let Some(index) = self.finalized_syncing_index() {
// There is a current finalized chain syncing
let syncing_chain_peer_count = self.finalized_chains[index].peer_pool.len();
let _syncing_chain_peer_count = self.finalized_chains[index].peer_pool.len();

// search for a chain with more peers
if let Some((new_index, chain)) =
self.finalized_chains
.iter_mut()
.enumerate()
.find(|(iter_index, chain)| {
*iter_index != index && chain.peer_pool.len() > syncing_chain_peer_count
.find(|(_iter_index, _chain)| {
false
// && *iter_index != index
// && chain.peer_pool.len() > syncing_chain_peer_count
})
{
// A chain has more peers. Swap the syncing chain
Expand Down