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

sync: make it more idiomatic rust (#5938)

Browse Source
This commit is contained in:
Guanqun Lu 2017-06-28 00:23:53 +08:00 committed by Arkadiy Paronyan
parent 196c3e7e9b
commit 547031aa0e
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sync/src/snapshot.rs
View File

@ -92,14 +92,10 @@ impl Snapshot {
/// Find a chunk to download /// Find a chunk to download
pub fn needed_chunk(&mut self) -> Option<H256> { pub fn needed_chunk(&mut self) -> Option<H256> {
// check state chunks first // check state chunks first
let mut chunk = self.pending_state_chunks.iter() let chunk = self.pending_state_chunks.iter()
.chain(self.pending_block_chunks.iter())
.find(|&h| !self.downloading_chunks.contains(h) && !self.completed_chunks.contains(h)) .find(|&h| !self.downloading_chunks.contains(h) && !self.completed_chunks.contains(h))
.cloned(); .cloned();
if chunk.is_none() {
chunk = self.pending_block_chunks.iter()
.find(|&h| !self.downloading_chunks.contains(h) && !self.completed_chunks.contains(h))
.cloned();
}
if let Some(hash) = chunk { if let Some(hash) = chunk {
self.downloading_chunks.insert(hash.clone()); self.downloading_chunks.insert(hash.clone());