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

Merge branch 'master' into tx-rpc-expose

Browse Source
This commit is contained in:
Nikolay Volf
2016-03-10 03:03:27 +04:00
parent ad81356683 ac42045155
commit 663eec8a76
17 changed files with 516 additions and 203 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sync/src/chain.rs
View File

@@ -907,9 +907,8 @@ impl ChainSync {
}
match sync.send(peer_id, packet_id, packet) {
Err(e) => {
warn!(target:"sync", "Error sending request: {:?}", e);
debug!(target:"sync", "Error sending request: {:?}", e);
sync.disable_peer(peer_id);
self.on_peer_aborting(sync, peer_id);
}
Ok(_) => {
let mut peer = self.peers.get_mut(&peer_id).unwrap();
@@ -922,9 +921,8 @@ impl ChainSync {
/// Generic packet sender
fn send_packet(&mut self, sync: &mut SyncIo, peer_id: PeerId, packet_id: PacketId, packet: Bytes) {
if let Err(e) = sync.send(peer_id, packet_id, packet) {
warn!(target:"sync", "Error sending packet: {:?}", e);
debug!(target:"sync", "Error sending packet: {:?}", e);
sync.disable_peer(peer_id);
self.on_peer_aborting(sync, peer_id);
}
}
/// Called when peer sends us new transactions