zecfoundation
/
parity-zcash
mirror of https://github.com/ZcashFoundation/parity-zcash.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into db-up

This commit is contained in:
NikVolf 2016-10-27 12:13:31 +03:00
parent 247c3bd516 0ba681de8b
commit 3ca794ceca
2 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/src/test_storage.rs
View File

@ -117,7 +117,7 @@ impl Store for TestStorage {
},
Entry::Vacant(entry) => {
entry.insert(block.clone());
}
},
}
match data.best_block_number {
Some(best_block_number) => {
@ -127,7 +127,7 @@ impl Store for TestStorage {
None => {
data.best_block_number = Some(0);
data.heights.insert(0, hash);
}
},
}
Ok(())

40
sync/src/local_node.rs
View File

@ -176,10 +176,14 @@ impl LocalNode {
}).collect()
};
let connection = &mut *self.peers.get_mut(&peer_index).unwrap().lock();
trace!(target: "sync", "Querying {} unknown blocks from peer#{}", getdata.inventory.len(), peer_index);
connection.send_getdata(&getdata);
match self.peers.get_mut(&peer_index) {
Some(connection) => {
let connection = &mut *connection.lock();
trace!(target: "sync", "Querying {} unknown blocks from peer#{}", getdata.inventory.len(), peer_index);
connection.send_getdata(&getdata);
}
_ => (),
}
}
SynchronizationTask::RequestInventory(peer_index) => {
let block_locator_hashes = self.chain.read().block_locator_hashes();
@ -189,11 +193,15 @@ impl LocalNode {
hash_stop: H256::default(),
};
let connection = &mut *self.peers.get_mut(&peer_index).unwrap().lock();
trace!(target: "sync", "Querying full inventory from peer#{}", peer_index);
trace!(target: "sync", "Synchronization state: sync = {:?}", self.sync.information());
connection.send_getblocks(&getblocks);
match self.peers.get_mut(&peer_index) {
Some(connection) => {
let connection = &mut *connection.lock();
trace!(target: "sync", "Querying full inventory from peer#{}", peer_index);
trace!(target: "sync", "Synchronization state: sync = {:?}", self.sync.information());
connection.send_getblocks(&getblocks);
},
_ => (),
}
},
SynchronizationTask::RequestBestInventory(peer_index) => {
let block_locator_hashes = self.chain.read().best_block_locator_hashes();
@ -203,11 +211,15 @@ impl LocalNode {
hash_stop: H256::default(),
};
let connection = &mut *self.peers.get_mut(&peer_index).unwrap().lock();
trace!(target: "sync", "Querying best inventory from peer#{}", peer_index);
trace!(target: "sync", "Synchronization state: {:?}", self.sync.information());
connection.send_getblocks(&getblocks);
match self.peers.get_mut(&peer_index) {
Some(connection) => {
let connection = &mut *connection.lock();
trace!(target: "sync", "Querying best inventory from peer#{}", peer_index);
trace!(target: "sync", "Synchronization state: {:?}", self.sync.information());
connection.send_getblocks(&getblocks);
},
_ => (),
}
},
}
}