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

get rid of the function

Browse Source
This commit is contained in:
Nikolay Volf 2016-03-17 15:09:08 +01:00
parent 7929af67c8
commit 85b08e6e7b
1 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sync/src/chain.rs
View File

@ -625,13 +625,6 @@ impl ChainSync {
self.state = SyncState::Waiting; self.state = SyncState::Waiting;
} }
fn can_sync(&self) -> bool {
match self.state {
SyncState::Idle | SyncState::NotSynced => true,
_ => false
}
}
/// Find something to do for a peer. Called for a new peer or when a peer is done with it's task. /// Find something to do for a peer. Called for a new peer or when a peer is done with it's task.
fn sync_peer(&mut self, io: &mut SyncIo, peer_id: PeerId, force: bool) { fn sync_peer(&mut self, io: &mut SyncIo, peer_id: PeerId, force: bool) {
let (peer_latest, peer_difficulty) = { let (peer_latest, peer_difficulty) = {
@ -651,7 +644,7 @@ impl ChainSync {
if force || peer_difficulty > syncing_difficulty { if force || peer_difficulty > syncing_difficulty {
// start sync // start sync
self.syncing_difficulty = peer_difficulty; self.syncing_difficulty = peer_difficulty;
if self.can_sync() { if self.state == SyncState::Idle || self.state == SyncState::NotSynced {
self.state = SyncState::Blocks; self.state = SyncState::Blocks;
} }
trace!(target: "sync", "Starting sync with better chain"); trace!(target: "sync", "Starting sync with better chain");
@ -1662,7 +1655,6 @@ mod tests {
assert_eq!(sync.miner.status().transactions_in_pending_queue, 1); assert_eq!(sync.miner.status().transactions_in_pending_queue, 1);
sync.chain_new_blocks(&mut io, &good_blocks, &[], &[], &retracted_blocks); sync.chain_new_blocks(&mut io, &good_blocks, &[], &[], &retracted_blocks);
// then // then
let status = sync.miner.status(); let status = sync.miner.status();
assert_eq!(status.transactions_in_pending_queue, 1); assert_eq!(status.transactions_in_pending_queue, 1);