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

proper status setting

Browse Source
This commit is contained in:
Nikolay Volf 2016-02-04 04:11:27 +03:00
parent a20600c9d1
commit c3d0ed6e69
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sync/src/chain.rs
View File

@ -292,7 +292,7 @@ impl ChainSync {
trace!(target: "sync", "Ignored unexpected block headers"); trace!(target: "sync", "Ignored unexpected block headers");
return Ok(()); return Ok(());
} }
if io.chain().queue_info().full { if self.state == SyncState::Waiting {
trace!(target: "sync", "Ignored block headers while waiting"); trace!(target: "sync", "Ignored block headers while waiting");
return Ok(()); return Ok(());
} }
@ -376,7 +376,7 @@ impl ChainSync {
trace!(target: "sync", "Ignored unexpected block bodies"); trace!(target: "sync", "Ignored unexpected block bodies");
return Ok(()); return Ok(());
} }
if io.chain().queue_info().full { if self.state == SyncState::Waiting {
trace!(target: "sync", "Ignored block bodies while waiting"); trace!(target: "sync", "Ignored block bodies while waiting");
return Ok(()); return Ok(());
} }
@ -987,6 +987,11 @@ impl ChainSync {
/// Handle peer timeouts /// Handle peer timeouts
pub fn maintain_peers(&self, io: &mut SyncIo) { pub fn maintain_peers(&self, io: &mut SyncIo) {
let tick = time::precise_time_s(); let tick = time::precise_time_s();
if !io.chain().queue_info().full {
self.state == SyncState::Idle;
}
for (peer_id, peer) in &self.peers { for (peer_id, peer) in &self.peers {
if peer.asking != PeerAsking::Nothing && (tick - peer.ask_time) > CONNECTION_TIMEOUT_SEC { if peer.asking != PeerAsking::Nothing && (tick - peer.ask_time) > CONNECTION_TIMEOUT_SEC {
io.disconnect_peer(*peer_id); io.disconnect_peer(*peer_id);