Undo networking changes

network/Cargo.toml

@@ -25,9 +25,8 @@ exit-future = "0.2.0"
 futures-timer = "2.0"
 sp-blockchain = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-api = { git = "https://github.com/paritytech/substrate", branch = "master" }
-sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 wasm-timer = "0.2.4"
 
 [dev-dependencies]
-
+sp-keyring = { git = "https://github.com/paritytech/substrate", branch = "master" }
 sp-state-machine = { git = "https://github.com/paritytech/substrate", branch = "master" }

network/src/legacy/gossip/mod.rs

@@ -361,6 +361,7 @@ pub struct NewLeafActions {
 }
 
 impl NewLeafActions {
+	#[cfg(test)]
 	pub fn new() -> Self {
 		NewLeafActions { actions: Vec::new() }
 	}

network/src/protocol/mod.rs

@@ -66,7 +66,8 @@ pub const POLKADOT_PROTOCOL_NAME: &[u8] = b"/polkadot/1";
 
 pub use crate::legacy::gossip::ChainContext;
 
-pub mod tests;
+#[cfg(test)]
+mod tests;
 
 // Messages from the service API or network adapter.
 enum ServiceToWorkerMsg {
@@ -118,6 +119,7 @@ enum ServiceToWorkerMsg {
 	/// Used in tests to ensure that all other messages sent from the same
 	/// thread have been flushed. Also executes arbitrary logic with the protocl
 	/// handler.
+	#[cfg(test)]
 	Synchronize(Box<dyn FnOnce(&mut ProtocolHandler) + Send>),
 }
 
@@ -1006,6 +1008,7 @@ impl<Api, Sp, Gossip> Worker<Api, Sp, Gossip> where
 
 				let _ = sender.send(checked_messages);
 			}
+			#[cfg(test)]
 			ServiceToWorkerMsg::Synchronize(callback) => {
 				(callback)(&mut self.protocol_handler)
 			}

network/src/protocol/tests.rs

@@ -52,7 +52,7 @@ struct Recorded {
 type GossipStreamEntry = (mpsc::UnboundedReceiver<TopicNotification>, oneshot::Sender<()>);
 
 #[derive(Default, Clone)]
-pub struct MockGossip {
+struct MockGossip {
 	inner: Arc<Mutex<HashMap<Hash, GossipStreamEntry>>>,
 	gossip_messages: Arc<Mutex<HashMap<Hash, GossipMessage>>>,
 }