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

refactoring of report functions, some comments

Browse Source
This commit is contained in:
Nikolay Volf 2016-02-08 03:14:39 -08:00
parent 70d59e4a52
commit deffb271bc
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sync/src/chain.rs
View File

@ -596,7 +596,7 @@ impl ChainSync {
fn request_blocks(&mut self, io: &mut SyncIo, peer_id: PeerId) { fn request_blocks(&mut self, io: &mut SyncIo, peer_id: PeerId) {
self.clear_peer_download(peer_id); self.clear_peer_download(peer_id);
if io.chain().queue_info().full { if io.chain().queue_info().is_full() {
self.pause_sync(); self.pause_sync();
return; return;
} }
@ -1044,7 +1044,7 @@ impl ChainSync {
} }
fn check_resume(&mut self, io: &mut SyncIo) { fn check_resume(&mut self, io: &mut SyncIo) {
if !io.chain().queue_info().full && self.state == SyncState::Waiting { if !io.chain().queue_info().is_full() && self.state == SyncState::Waiting {
self.state = SyncState::Idle; self.state = SyncState::Idle;
self.continue_sync(io); self.continue_sync(io);
} }
@ -1445,6 +1445,8 @@ mod tests {
assert!(result.is_ok()); assert!(result.is_ok());
} }
// idea is that what we produce when propagading latest hashes should be accepted in
// on_peer_new_hashes in our code as well
#[test] #[test]
fn hashes_rlp_mutually_acceptable() { fn hashes_rlp_mutually_acceptable() {
let mut client = TestBlockChainClient::new(); let mut client = TestBlockChainClient::new();
@ -1460,6 +1462,8 @@ mod tests {
assert!(result.is_ok()); assert!(result.is_ok());
} }
// idea is that what we produce when propagading latest block should be accepted in
// on_peer_new_block in our code as well
#[test] #[test]
fn block_rlp_mutually_acceptable() { fn block_rlp_mutually_acceptable() {
let mut client = TestBlockChainClient::new(); let mut client = TestBlockChainClient::new();

2
sync/src/tests/helpers.rs
View File

@ -229,11 +229,9 @@ impl BlockChainClient for TestBlockChainClient {
fn queue_info(&self) -> BlockQueueInfo { fn queue_info(&self) -> BlockQueueInfo {
BlockQueueInfo { BlockQueueInfo {
full: false,
verified_queue_size: 0, verified_queue_size: 0,
unverified_queue_size: 0, unverified_queue_size: 0,
verifying_queue_size: 0, verifying_queue_size: 0,
empty: false,
} }
} }