Custom RPC request management for sync (#3029)

## Proposed Changes
Make `lighthouse_network` generic over request ids, now usable by sync

beacon_node/network/src/sync/range_sync/batch.rs

@@ -1,4 +1,4 @@
-use crate::sync::RequestId;
+use crate::sync::manager::Id;
 use lighthouse_network::rpc::methods::BlocksByRangeRequest;
 use lighthouse_network::PeerId;
 use std::collections::HashSet;
@@ -93,7 +93,7 @@ pub enum BatchState<T: EthSpec> {
     /// The batch has failed either downloading or processing, but can be requested again.
     AwaitingDownload,
     /// The batch is being downloaded.
-    Downloading(PeerId, Vec<SignedBeaconBlock<T>>, RequestId),
+    Downloading(PeerId, Vec<SignedBeaconBlock<T>>, Id),
     /// The batch has been completely downloaded and is ready for processing.
     AwaitingProcessing(PeerId, Vec<SignedBeaconBlock<T>>),
     /// The batch is being processed.
@@ -167,7 +167,7 @@ impl<T: EthSpec, B: BatchConfig> BatchInfo<T, B> {
     }
 
     /// Verifies if an incomming block belongs to this batch.
-    pub fn is_expecting_block(&self, peer_id: &PeerId, request_id: &RequestId) -> bool {
+    pub fn is_expecting_block(&self, peer_id: &PeerId, request_id: &Id) -> bool {
         if let BatchState::Downloading(expected_peer, _, expected_id) = &self.state {
             return peer_id == expected_peer && expected_id == request_id;
         }
@@ -312,7 +312,7 @@ impl<T: EthSpec, B: BatchConfig> BatchInfo<T, B> {
     pub fn start_downloading_from_peer(
         &mut self,
         peer: PeerId,
-        request_id: RequestId,
+        request_id: Id,
     ) -> Result<(), WrongState> {
         match self.state.poison() {
             BatchState::AwaitingDownload => {

beacon_node/network/src/sync/range_sync/chain.rs

@@ -1,7 +1,7 @@
 use super::batch::{BatchInfo, BatchState};
 use crate::beacon_processor::ProcessId;
 use crate::beacon_processor::WorkEvent as BeaconWorkEvent;
-use crate::sync::{network_context::SyncNetworkContext, BatchProcessResult, RequestId};
+use crate::sync::{manager::Id, network_context::SyncNetworkContext, BatchProcessResult};
 use beacon_chain::BeaconChainTypes;
 use fnv::FnvHashMap;
 use lighthouse_network::{PeerAction, PeerId};
@@ -214,7 +214,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
         network: &mut SyncNetworkContext<T::EthSpec>,
         batch_id: BatchId,
         peer_id: &PeerId,
-        request_id: RequestId,
+        request_id: Id,
         beacon_block: Option<SignedBeaconBlock<T::EthSpec>>,
     ) -> ProcessingResult {
         // check if we have this batch
@@ -807,7 +807,7 @@ impl<T: BeaconChainTypes> SyncingChain<T> {
         network: &mut SyncNetworkContext<T::EthSpec>,
         batch_id: BatchId,
         peer_id: &PeerId,
-        request_id: RequestId,
+        request_id: Id,
     ) -> ProcessingResult {
         if let Some(batch) = self.batches.get_mut(&batch_id) {
             // A batch could be retried without the peer failing the request (disconnecting/

beacon_node/network/src/sync/range_sync/range.rs

@@ -45,8 +45,9 @@ use super::chain_collection::ChainCollection;
 use super::sync_type::RangeSyncType;
 use crate::beacon_processor::WorkEvent as BeaconWorkEvent;
 use crate::status::ToStatusMessage;
+use crate::sync::manager::Id;
 use crate::sync::network_context::SyncNetworkContext;
-use crate::sync::{BatchProcessResult, RequestId};
+use crate::sync::BatchProcessResult;
 use beacon_chain::{BeaconChain, BeaconChainTypes};
 use lighthouse_network::PeerId;
 use lighthouse_network::SyncInfo;
@@ -201,7 +202,7 @@ where
         peer_id: PeerId,
         chain_id: ChainId,
         batch_id: BatchId,
-        request_id: RequestId,
+        request_id: Id,
         beacon_block: Option<SignedBeaconBlock<T::EthSpec>>,
     ) {
         // check if this chunk removes the chain
@@ -300,7 +301,7 @@ where
         peer_id: PeerId,
         batch_id: BatchId,
         chain_id: ChainId,
-        request_id: RequestId,
+        request_id: Id,
     ) {
         // check that this request is pending
         match self.chains.call_by_id(chain_id, |chain| {
@@ -364,6 +365,7 @@ where
 
 #[cfg(test)]
 mod tests {
+    use crate::service::RequestId;
     use crate::NetworkMessage;
 
     use super::*;
@@ -494,10 +496,7 @@ mod tests {
         }
 
         /// Reads an BlocksByRange request to a given peer from the network receiver channel.
-        fn grab_request(
-            &mut self,
-            expected_peer: &PeerId,
-        ) -> (lighthouse_network::rpc::RequestId, BlocksByRangeRequest) {
+        fn grab_request(&mut self, expected_peer: &PeerId) -> (RequestId, BlocksByRangeRequest) {
             if let Some(NetworkMessage::SendRequest {
                 peer_id,
                 request: Request::BlocksByRange(request),