From ebeacee7d4e1d3b8d14202926b41cc4185618576 Mon Sep 17 00:00:00 2001
From: Robert Habermeier <rphmeier@gmail.com>
Date: Fri, 2 Nov 2018 18:17:57 +0100
Subject: [PATCH] all tests compile

---
 substrate/core/consensus/aura/src/lib.rs   |  8 ++++----
 substrate/core/network/src/import_queue.rs |  4 +---
 substrate/core/network/src/test/sync.rs    |  2 +-
 substrate/core/service/src/chain_ops.rs    | 10 +++-------
 4 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/substrate/core/consensus/aura/src/lib.rs b/substrate/core/consensus/aura/src/lib.rs
index cb4a24de3e..c57161668d 100644
--- a/substrate/core/consensus/aura/src/lib.rs
+++ b/substrate/core/consensus/aura/src/lib.rs
@@ -404,11 +404,11 @@ pub type AuraImportQueue<B, C> = BasicQueue<B, AuraVerifier<C>>;
 /// Start an import queue for the Aura consensus algorithm.
 pub fn import_queue<B, C>(config: Config, client: Arc<C>) -> AuraImportQueue<B, C> where
 	B: Block,
-	C: Authorities<B> + BlockImport<B> + Send + Sync,
+	C: Authorities<B> + BlockImport<B,Error=client::error::Error> + Send + Sync,
 	DigestItemFor<B>: CompatibleDigestItem,
 {
-	let verifier = Arc::new(AuraVerifier { config, client });
-	BasicQueue::new(verifier)
+	let verifier = Arc::new(AuraVerifier { config, client: client.clone() });
+	BasicQueue::new(verifier, client)
 }
 
 
@@ -458,7 +458,7 @@ mod tests {
 	const TEST_ROUTING_INTERVAL: Duration = Duration::from_millis(50);
 
 	pub struct AuraTestNet {
-		peers: Vec<Arc<Peer<AuraVerifier<PeersClient>>>>,
+		peers: Vec<Arc<Peer<AuraVerifier<PeersClient>, ()>>>,
 		started: bool
 	}
 
diff --git a/substrate/core/network/src/import_queue.rs b/substrate/core/network/src/import_queue.rs
index 96496e33ad..0d760e0d15 100644
--- a/substrate/core/network/src/import_queue.rs
+++ b/substrate/core/network/src/import_queue.rs
@@ -652,7 +652,6 @@ pub mod tests {
 	use super::*;
 
 	struct TestLink {
-		chain: Arc<Client<Block>>,
 		imported: Cell<usize>,
 		maintains: Cell<usize>,
 		disconnects: Cell<usize>,
@@ -662,7 +661,6 @@ pub mod tests {
 	impl TestLink {
 		fn new() -> TestLink {
 			TestLink {
-				chain: Arc::new(test_client::new()),
 				imported: Cell::new(0),
 				maintains: Cell::new(0),
 				disconnects: Cell::new(0),
@@ -806,7 +804,7 @@ pub mod tests {
 	#[test]
 	fn async_import_queue_drops() {
 		let verifier = Arc::new(PassThroughVerifier(true));
-		let queue = BasicQueue::new(verifier);
+		let queue = BasicQueue::new(verifier, Arc::new(test_client::new()));
 		queue.start(TestLink::new()).unwrap();
 		drop(queue);
 	}
diff --git a/substrate/core/network/src/test/sync.rs b/substrate/core/network/src/test/sync.rs
index 0f9e407828..c31b1c3d5e 100644
--- a/substrate/core/network/src/test/sync.rs
+++ b/substrate/core/network/src/test/sync.rs
@@ -94,7 +94,7 @@ fn own_blocks_are_announced() {
 	::env_logger::init().ok();
 	let mut net = TestNet::new(3);
 	net.sync(); // connect'em
-	net.peer(0).generate_blocks(1, BlockOrigin::Own, |_| ());
+	net.peer(0).generate_blocks(1, BlockOrigin::Own, |builder| builder.bake().unwrap());
 	net.sync();
 	assert_eq!(net.peer(0).client.backend().blockchain().info().unwrap().best_number, 1);
 	assert_eq!(net.peer(1).client.backend().blockchain().info().unwrap().best_number, 1);
diff --git a/substrate/core/service/src/chain_ops.rs b/substrate/core/service/src/chain_ops.rs
index d23e82b1cf..f9b7790863 100644
--- a/substrate/core/service/src/chain_ops.rs
+++ b/substrate/core/service/src/chain_ops.rs
@@ -88,16 +88,12 @@ pub fn export_blocks<F, E, W>(config: FactoryFullConfiguration<F>, exit: E, mut
 pub fn import_blocks<F, E, R>(config: FactoryFullConfiguration<F>, exit: E, mut input: R) -> error::Result<()>
 	where F: ServiceFactory, E: Future<Item=(),Error=()> + Send + 'static, R: Read,
 {
-	use network::ClientHandle;
-
-	struct DummyLink<T>(::std::sync::Arc<T>);
-	impl<B: Block, T: ClientHandle<B>> Link<B> for DummyLink<T> {
-		fn chain(&self) -> &ClientHandle<B> { &*self.0 }
-	}
+	struct DummyLink;
+	impl<B: Block> Link<B> for DummyLink { }
 
 	let client = new_client::<F>(&config)?;
 	let queue = components::FullComponents::<F>::build_import_queue(&config, client.clone())?;
-	queue.start(DummyLink(client.clone()))?;
+	queue.start(DummyLink)?;
 
 	let (exit_send, exit_recv) = std::sync::mpsc::channel();
 	::std::thread::spawn(move || {