Merge branch 'master' into tx_queue

This commit is contained in:
Tomasz Drwięga 2016-03-17 10:20:21 +01:00
commit 10c309fccb

View File

@ -402,6 +402,12 @@ impl ChainSync {
debug!(target: "sync", "Mismatched block header {}", number + 1); debug!(target: "sync", "Mismatched block header {}", number + 1);
self.remove_downloaded_blocks(number + 1); self.remove_downloaded_blocks(number + 1);
} }
if self.have_common_block && number < self.current_base_block() + 1 {
// unkown header
debug!(target: "sync", "Old block header {:?} ({}) is unknown, restarting sync", hash, number);
self.restart(io);
return Ok(());
}
} }
let hdr = Header { let hdr = Header {
data: try!(r.at(i)).as_raw().to_vec(), data: try!(r.at(i)).as_raw().to_vec(),