From 6ccdbea01c592428fe1cdb5087d696fdf62ad474 Mon Sep 17 00:00:00 2001
From: Pierre Krieger <pierre.krieger1708@gmail.com>
Date: Tue, 14 May 2019 12:08:01 +0200
Subject: [PATCH] Move extra_requests.rs as a submodule of sync (#2573)

---
 substrate/core/network/src/lib.rs                       | 1 -
 substrate/core/network/src/sync.rs                      | 4 +++-
 substrate/core/network/src/{ => sync}/extra_requests.rs | 0
 3 files changed, 3 insertions(+), 2 deletions(-)
 rename substrate/core/network/src/{ => sync}/extra_requests.rs (100%)

diff --git a/substrate/core/network/src/lib.rs b/substrate/core/network/src/lib.rs
index cd5772b2ae..4d69767c7b 100644
--- a/substrate/core/network/src/lib.rs
+++ b/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;
diff --git a/substrate/core/network/src/sync.rs b/substrate/core/network/src/sync.rs
index 90e1359c56..d5fc490a05 100644
--- a/substrate/core/network/src/sync.rs
+++ b/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.
diff --git a/substrate/core/network/src/extra_requests.rs b/substrate/core/network/src/sync/extra_requests.rs
similarity index 100%
rename from substrate/core/network/src/extra_requests.rs
rename to substrate/core/network/src/sync/extra_requests.rs