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

[beta] Backports (#6563)

Browse Source 
* Sync progress and error handling fixes (#6560)

* Fixed receipt serialization and RPC (#6555)

* v1.7.3
This commit is contained in:
Arkadiy Paronyan
2017-09-21 11:42:58 +02:00
committed by GitHub
parent 9f47909edf
commit 083b69ffb1
19 changed files with 164 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sync/src/chain.rs
View File

@@ -688,7 +688,7 @@ impl ChainSync {
}
} else {
trace!(target: "sync", "{}: Fork mismatch", peer_id);
io.disconnect_peer(peer_id);
io.disable_peer(peer_id);
return Ok(());
}
}
@@ -1146,7 +1146,7 @@ impl ChainSync {
trace!(target: "sync", "== Connected {}: {}", peer, io.peer_info(peer));
if let Err(e) = self.send_status(io, peer) {
debug!(target:"sync", "Error sending status request: {:?}", e);
io.disable_peer(peer);
io.disconnect_peer(peer);
} else {
self.handshaking_peers.insert(peer, time::precise_time_ns());
}
@@ -1447,7 +1447,7 @@ impl ChainSync {
};
if let Err(e) = result {
debug!(target:"sync", "Error sending request: {:?}", e);
sync.disable_peer(peer_id);
sync.disconnect_peer(peer_id);
}
}
}
@@ -1456,7 +1456,7 @@ impl ChainSync {
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) {
debug!(target:"sync", "Error sending packet: {:?}", e);
sync.disable_peer(peer_id);
sync.disconnect_peer(peer_id);
}
}