Move extra_requests.rs as a submodule of sync (#2573)

substrate/core/network/src/lib.rs

@@ -30,7 +30,6 @@ mod protocol;
 mod chain;
 mod blocks;
 mod on_demand;
-mod extra_requests;
 mod util;
 pub mod config;
 pub mod consensus_gossip;

substrate/core/network/src/sync.rs

@@ -39,13 +39,15 @@ use client::{BlockStatus, ClientInfo};
 use consensus::{BlockOrigin, import_queue::{IncomingBlock, SharedFinalityProofRequestBuilder}};
 use client::error::Error as ClientError;
 use crate::blocks::BlockCollection;
-use crate::extra_requests::ExtraRequestsAggregator;
+use crate::sync::extra_requests::ExtraRequestsAggregator;
 use runtime_primitives::traits::{Block as BlockT, Header as HeaderT, As, NumberFor, Zero, CheckedSub};
 use runtime_primitives::{Justification, generic::BlockId};
 use crate::message;
 use crate::config::Roles;
 use std::collections::HashSet;
 
+mod extra_requests;
+
 // Maximum blocks to request in a single packet.
 const MAX_BLOCKS_TO_REQUEST: usize = 128;
 // Maximum blocks to store in the import queue.