[WIP] Refactor gossiping system

Cargo.toml

@@ -30,6 +30,7 @@ members = [
 	"client/header-metadata",
 	"client/keystore",
 	"client/network",
+	"client/network-gossip",
 	"client/offchain",
 	"client/rpc-servers",
 	"client/rpc",

client/finality-grandpa/Cargo.toml

@@ -25,6 +25,7 @@ client = { package = "substrate-client", path = "../" }
 header-metadata = { package = "substrate-header-metadata", path = "../header-metadata" }
 inherents = { package = "substrate-inherents", path = "../../primitives/inherents" }
 network = { package = "substrate-network", path = "../network" }
+network-gossip = { package = "substrate-network-gossip", path = "../network-gossip" }
 paint-finality-tracker = { path = "../../paint/finality-tracker" }
 fg_primitives = { package = "substrate-finality-grandpa-primitives", path = "../../primitives/finality-grandpa" }
 grandpa = { package = "finality-grandpa", version = "0.9.0", features = ["derive-codec"] }

client/finality-grandpa/src/communication/gossip.rs

@@ -83,7 +83,7 @@
 //! We only send polite messages to peers,
 
 use sr_primitives::traits::{NumberFor, Block as BlockT, Zero};
-use network::consensus_gossip::{self as network_gossip, MessageIntent, ValidatorContext};
+use network_gossip::{self, GossipEngine, MessageIntent, ValidatorContext};
 use network::{config::Roles, PeerId};
 use codec::{Encode, Decode};
 use fg_primitives::AuthorityId;
@@ -1402,29 +1402,26 @@ pub(super) struct ReportStream {
 impl ReportStream {
 	/// Consume the report stream, converting it into a future that
 	/// handles all reports.
-	pub(super) fn consume<B, N>(self, net: N)
+	pub(super) fn consume<B>(self, net: GossipEngine<B>)
 		-> impl Future<Item=(),Error=()> + Send + 'static
 	where
 		B: BlockT,
-		N: super::Network<B> + Send + 'static,
 	{
 		ReportingTask {
 			reports: self.reports,
 			net,
-			_marker: Default::default(),
 		}
 	}
 }
 
 /// A future for reporting peers.
 #[must_use = "Futures do nothing unless polled"]
-struct ReportingTask<B, N> {
+struct ReportingTask<B: BlockT> {
 	reports: mpsc::UnboundedReceiver<PeerReport>,
-	net: N,
-	_marker: std::marker::PhantomData<B>,
+	net: GossipEngine<B>,
 }
 
-impl<B: BlockT, N: super::Network<B>> Future for ReportingTask<B, N> {
+impl<B: BlockT> Future for ReportingTask<B> {
 	type Item = ();
 	type Error = ();