Remove legacy block requests

finality-aleph/src/network/mod.rs

@@ -16,14 +16,6 @@ pub use gossip::{
 use network_clique::{AddressingInformation, NetworkIdentity, PeerId};
 pub use substrate::{ProtocolNaming, SubstrateNetwork};
 
-use crate::BlockId;
-
-/// Abstraction for requesting stale blocks.
-pub trait RequestBlocks: Clone + Send + Sync + 'static {
-    /// Request the given block -- this is supposed to be used only for "old forks".
-    fn request_stale_block(&self, block: BlockId);
-}
-
 /// A basic alias for properties we expect basic data to satisfy.
 pub trait Data: Clone + Codec + Send + Sync + 'static {}
 

finality-aleph/src/network/substrate.rs

@@ -6,38 +6,17 @@ use log::{error, trace};
 use sc_network::{
     multiaddr::Protocol as MultiaddressProtocol, Event as SubstrateEvent, Multiaddr,
     NetworkEventStream as _, NetworkNotification, NetworkPeers, NetworkService,
-    NetworkSyncForkRequest, NotificationSenderT, PeerId, ProtocolName,
+    NotificationSenderT, PeerId, ProtocolName,
 };
 use sc_network_common::{
     sync::{SyncEvent, SyncEventStream},
     ExHashT,
 };
 use sc_network_sync::SyncingService;
-use sp_runtime::traits::{Block, Header};
+use sp_runtime::traits::Block;
 use tokio::select;
 
-use crate::{
-    aleph_primitives::{BlockHash, BlockNumber},
-    network::{
-        gossip::{Event, EventStream, NetworkSender, Protocol, RawNetwork},
-        RequestBlocks,
-    },
-    BlockId,
-};
-
-impl<B> RequestBlocks for Arc<SyncingService<B>>
-where
-    B: Block<Hash = BlockHash>,
-    B::Header: Header<Number = BlockNumber>,
-{
-    fn request_stale_block(&self, block_id: BlockId) {
-        // The below comment is adapted from substrate:
-        // Notifies the sync service to try and sync the given block from the given peers. If the given vector
-        // of peers is empty (as in our case) then the underlying implementation should make a best effort to fetch
-        // the block from any peers it is connected to.
-        SyncingService::set_sync_fork_request(self, Vec::new(), block_id.hash, block_id.number)
-    }
-}
+use crate::network::gossip::{Event, EventStream, NetworkSender, Protocol, RawNetwork};
 
 /// Name of the network protocol used by Aleph Zero to disseminate validator
 /// authentications.

finality-aleph/src/nodes.rs

@@ -26,8 +26,8 @@ use crate::{
     session_map::{AuthorityProviderImpl, FinalityNotifierImpl, SessionMapUpdater},
     sync::{
         ChainStatus, FinalizationStatus, Justification, JustificationTranslator,
-        OldSyncCompatibleRequestBlocks, Service as SyncService, SubstrateChainStatusNotifier,
-        SubstrateFinalizationInfo, VerifierCache, IO as SyncIO,
+        Service as SyncService, SubstrateChainStatusNotifier, SubstrateFinalizationInfo,
+        VerifierCache, IO as SyncIO,
     },
     AlephConfig,
 };
@@ -116,8 +116,6 @@ where
     );
     let gossip_network_task = async move { gossip_network_service.run().await };
 
-    let block_requester = sync_network.clone();
-
     let map_updater = SessionMapUpdater::new(
         AuthorityProviderImpl::new(client.clone()),
         FinalityNotifierImpl::new(client.clone()),
@@ -186,9 +184,6 @@ where
     spawn_handle.spawn("aleph/gossip_network", gossip_network_task);
     debug!(target: "aleph-party", "Gossip network has started.");
 
-    let compatible_block_request =
-        OldSyncCompatibleRequestBlocks::new(block_requester.clone(), request_block);
-
     let party = ConsensusParty::new(ConsensusPartyParams {
         session_authorities,
         sync_oracle,
@@ -204,7 +199,7 @@ where
             unit_creation_delay,
             justifications_for_sync,
             JustificationTranslator::new(chain_status.clone()),
-            compatible_block_request,
+            request_block,
             metrics,
             spawn_handle,
             connection_manager,

finality-aleph/src/sync/mod.rs

@@ -8,7 +8,6 @@ use parity_scale_codec::Codec;
 
 use crate::BlockId;
 
-mod compatibility;
 mod data;
 mod forest;
 mod handler;
@@ -22,7 +21,6 @@ mod task_queue;
 mod tasks;
 mod ticker;
 
-pub use compatibility::OldSyncCompatibleRequestBlocks;
 pub use service::{Service, IO};
 pub use substrate::{
     Justification as SubstrateJustification, JustificationTranslator, SessionVerifier,