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

Fixing mark_as_bad implementation

Browse Source
This commit is contained in:
Tomasz Drwięga 2016-02-24 17:01:29 +01:00
parent d914a27bdf
commit 08647282df
2 changed files with 15 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ethcore/res/ethereum/tests

@ -1 +1 @@
Subproject commit f32954b3ddb5af2dc3dc9ec6d9a28bee848fdf70 Subproject commit 3116f85a499ceaf4dfdc46726060fc056e2d7829

17
ethcore/src/block_queue.rs
View File

@ -287,22 +287,25 @@ impl BlockQueue {
/// Mark given block and all its children as bad. Stops verification. /// Mark given block and all its children as bad. Stops verification.
pub fn mark_as_bad(&mut self, hashes: &[H256]) { pub fn mark_as_bad(&mut self, hashes: &[H256]) {
let mut verification_lock = self.verification.lock().unwrap(); let mut verification_lock = self.verification.lock().unwrap();
let mut verification = verification_lock.deref_mut(); let mut processing = self.processing.write().unwrap();
let mut new_verified = VecDeque::new();
let mut verification = verification_lock.deref_mut();
verification.bad.reserve(hashes.len());
for hash in hashes { for hash in hashes {
verification.bad.insert(hash.clone()); verification.bad.insert(hash.clone());
self.processing.write().unwrap().remove(&hash); processing.remove(&hash);
}
let mut new_verified = VecDeque::new();
for block in verification.verified.drain(..) { for block in verification.verified.drain(..) {
if verification.bad.contains(&block.header.parent_hash) { if verification.bad.contains(&block.header.parent_hash) {
verification.bad.insert(block.header.hash()); verification.bad.insert(block.header.hash());
self.processing.write().unwrap().remove(&block.header.hash()); processing.remove(&block.header.hash());
} } else {
else {
new_verified.push_back(block); new_verified.push_back(block);
} }
} }
}
verification.verified = new_verified; verification.verified = new_verified;
} }