From 0805651d10b647576c933b5bb0340f39978780fe Mon Sep 17 00:00:00 2001
From: Max Inden <mail@max-inden.de>
Date: Tue, 22 Oct 2019 21:25:08 +0200
Subject: [PATCH] core/network/sync: Ask for block from all peers if none
provided
When requesting an explicit fork sync, try to sync from all known peers,
when no specific peers were provided.
---
core/network/src/protocol/sync.rs | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/core/network/src/protocol/sync.rs b/core/network/src/protocol/sync.rs
index bd8a9fe27f6..17ba6ca94d2 100644
--- a/core/network/src/protocol/sync.rs
+++ b/core/network/src/protocol/sync.rs
@@ -456,14 +456,20 @@ impl<B: BlockT> ChainSync<B> {
/// Request syncing for the given block from given set of peers.
// The implementation is similar to on_block_announce with unknown parent hash.
- pub fn set_sync_fork_request(&mut self, peers: Vec<PeerId>, hash: &B::Hash, number: NumberFor<B>) {
+ pub fn set_sync_fork_request(&mut self, mut peers: Vec<PeerId>, hash: &B::Hash, number: NumberFor<B>) {
if peers.is_empty() {
- if let Some(_) = self.fork_targets.remove(hash) {
- debug!(target: "sync", "Cleared sync request for block {:?} with {:?}", hash, peers);
- }
- return;
+ debug!(
+ target: "sync",
+ "Explicit sync request for block {:?} with no peers specified. \
+ Syncing from all connected peers {:?} instead.",
+ hash, peers,
+ );
+
+ peers = self.peers.iter().map(|(id, _)| id.clone()).collect();
+ } else {
+ debug!(target: "sync", "Explicit sync request for block {:?} with {:?}", hash, peers);
}
- debug!(target: "sync", "Explicit sync request for block {:?} with {:?}", hash, peers);
+
if self.is_known(&hash) {
debug!(target: "sync", "Refusing to sync known hash {:?}", hash);
return;
--
GitLab