Core/grin
0
0
Fork 0
mirror of https://github.com/mimblewimble/grin.git synced 2025-01-21 11:31:08 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Do not request orphan predecessor if we have its header. Shows we're already on it (sync).

Browse source
This commit is contained in:
Ignotus Peverell 2018-03-19 22:17:59 +00:00
parent 154d52e548
commit cd72be893e
No known key found for this signature in database
GPG key ID: 99CD25F39F8F8211
1 changed files with 23 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

49
grin/src/adapters.rs
View file

@ -388,9 +388,11 @@ impl NetToChainAdapter {
Ok(_) => true, Ok(_) => true,
Err(chain::Error::Orphan) => { Err(chain::Error::Orphan) => {
// make sure we did not miss the parent block // make sure we did not miss the parent block
if !self.currently_syncing.load(Ordering::Relaxed) && !chain.is_orphan(&prev_hash) { if !chain.is_orphan(&prev_hash) {
debug!(LOGGER, "adapter: process_block: received an orphan block, checking the parent: {:}", prev_hash); if let Err(_) = chain.get_block_header(&prev_hash) {
self.request_block_by_hash(prev_hash, &addr) debug!(LOGGER, "adapter: process_block: received an orphan block, checking the parent: {:}", prev_hash);
self.request_block_by_hash(prev_hash, &addr)
}
} }
true true
} }
@ -415,8 +417,6 @@ impl NetToChainAdapter {
// After receiving a compact block if we cannot successfully hydrate // After receiving a compact block if we cannot successfully hydrate
// it into a full block then fallback to requesting the full block // it into a full block then fallback to requesting the full block
// from the same peer that gave us the compact block // from the same peer that gave us the compact block
//
// TODO - currently only request block from a single peer
// consider additional peers for redundancy? // consider additional peers for redundancy?
fn request_block(&self, bh: &BlockHeader, addr: &SocketAddr) { fn request_block(&self, bh: &BlockHeader, addr: &SocketAddr) {
self.request_block_by_hash(bh.hash(), addr) self.request_block_by_hash(bh.hash(), addr)
@ -429,9 +429,6 @@ impl NetToChainAdapter {
// After we have received a block header in "header first" propagation // After we have received a block header in "header first" propagation
// we need to go request the block (compact representation) from the // we need to go request the block (compact representation) from the
// same peer that gave us the header (unless we have already accepted the block) // same peer that gave us the header (unless we have already accepted the block)
//
// TODO - currently only request block from a single peer
// consider additional peers for redundancy?
fn request_compact_block(&self, bh: &BlockHeader, addr: &SocketAddr) { fn request_compact_block(&self, bh: &BlockHeader, addr: &SocketAddr) {
self.send_block_request_to_peer(bh.hash(), addr, |peer, h| { self.send_block_request_to_peer(bh.hash(), addr, |peer, h| {
peer.send_compact_block_request(h) peer.send_compact_block_request(h)
@ -443,24 +440,24 @@ impl NetToChainAdapter {
F: Fn(&p2p::Peer, Hash) -> Result<(), p2p::Error>, F: Fn(&p2p::Peer, Hash) -> Result<(), p2p::Error>,
{ {
match w(&self.chain).block_exists(h) { match w(&self.chain).block_exists(h) {
Ok(false) => { Ok(false) => {
match wo(&self.peers).get_connected_peer(addr) { match wo(&self.peers).get_connected_peer(addr) {
None => debug!(LOGGER, "send_block_request_to_peer: can't send request to peer {:?}, not connected", addr), None => debug!(LOGGER, "send_block_request_to_peer: can't send request to peer {:?}, not connected", addr),
Some(peer) => { Some(peer) => {
match peer.read() { match peer.read() {
Err(e) => debug!(LOGGER, "send_block_request_to_peer: can't send request to peer {:?}, read fails: {:?}", addr, e), Err(e) => debug!(LOGGER, "send_block_request_to_peer: can't send request to peer {:?}, read fails: {:?}", addr, e),
Ok(p) => { Ok(p) => {
if let Err(e) = f(&p, h) { if let Err(e) = f(&p, h) {
error!(LOGGER, "send_block_request_to_peer: failed: {:?}", e) error!(LOGGER, "send_block_request_to_peer: failed: {:?}", e)
} }
} }
} }
} }
} }
} }
Ok(true) => debug!(LOGGER, "send_block_request_to_peer: block {} already known", h), Ok(true) => debug!(LOGGER, "send_block_request_to_peer: block {} already known", h),
Err(e) => error!(LOGGER, "send_block_request_to_peer: failed to check block exists: {:?}", e) Err(e) => error!(LOGGER, "send_block_request_to_peer: failed to check block exists: {:?}", e)
} }
} }
/// Prepare options for the chain pipeline /// Prepare options for the chain pipeline