Merge branch 'master' into softforktrigger

This commit is contained in:
Gav Wood
2016-06-20 00:37:40 +02:00
87 changed files with 4055 additions and 2699 deletions

View File

@@ -458,12 +458,13 @@ impl ChainSync {
// Disable the peer for this syncing round if it gives invalid chain
if !valid_response {
trace!(target: "sync", "{} Deactivated for invalid headers response", peer_id);
self.deactivate_peer(io, peer_id);
self.deactivate_peer(io, peer_id);
}
if headers.is_empty() {
// Peer does not have any new subchain heads, deactivate it nd try with another
trace!(target: "sync", "{} Deactivated for no data", peer_id);
self.deactivate_peer(io, peer_id);
self.deactivate_peer(io, peer_id);
}
match self.state {
SyncState::ChainHead => {