grassrootseconomics/openethereum
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't fetch snapshot chunks at random (#9088)

Browse Source
This commit is contained in:
Nicolas Gotchac 2018-07-11 13:04:31 +02:00 committed by Afri Schoedon
parent 494eb4ab6b
commit c082af6f74
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ethcore/sync/src/snapshot.rs
View File

@ -17,7 +17,6 @@
use ethcore::snapshot::{ManifestData, SnapshotService}; use ethcore::snapshot::{ManifestData, SnapshotService};
use ethereum_types::H256; use ethereum_types::H256;
use hash::keccak; use hash::keccak;
use rand::{thread_rng, Rng};
use std::collections::HashSet; use std::collections::HashSet;
use std::iter::FromIterator; use std::iter::FromIterator;
@ -114,35 +113,32 @@ impl Snapshot {
Err(()) Err(())
} }
/// Find a random chunk to download /// Find a chunk to download
pub fn needed_chunk(&mut self) -> Option<H256> { pub fn needed_chunk(&mut self) -> Option<H256> {
// Find all random chunks: first blocks, then state // Find next needed chunk: first block, then state chunks
let needed_chunks = { let chunk = {
let chunk_filter = |h| !self.downloading_chunks.contains(h) && !self.completed_chunks.contains(h); let chunk_filter = |h| !self.downloading_chunks.contains(h) && !self.completed_chunks.contains(h);
let needed_block_chunks = self.pending_block_chunks.iter() let needed_block_chunk = self.pending_block_chunks.iter()
.filter(|&h| chunk_filter(h)) .filter(|&h| chunk_filter(h))
.map(|h| *h) .map(|h| *h)
.collect::<Vec<H256>>(); .next();
// If no block chunks to download, get the state chunks // If no block chunks to download, get the state chunks
if needed_block_chunks.len() == 0 { if needed_block_chunk.is_none() {
self.pending_state_chunks.iter() self.pending_state_chunks.iter()
.filter(|&h| chunk_filter(h)) .filter(|&h| chunk_filter(h))
.map(|h| *h) .map(|h| *h)
.collect::<Vec<H256>>() .next()
} else { } else {
needed_block_chunks needed_block_chunk
} }
}; };
// Get a random chunk
let chunk = thread_rng().choose(&needed_chunks);
if let Some(hash) = chunk { if let Some(hash) = chunk {
self.downloading_chunks.insert(hash.clone()); self.downloading_chunks.insert(hash.clone());
} }
chunk.map(|h| *h) chunk
} }
pub fn clear_chunk_download(&mut self, hash: &H256) { pub fn clear_chunk_download(&mut self, hash: &H256) {