Merge remote-tracking branch 'origin/master' into dm-clean-up-runtime…

…-block-on-in-tests

client/network/src/service/tests/chain_sync.rs

@@ -104,7 +104,7 @@ async fn request_justification() {
 
 	set_default_expecations_no_peers(&mut chain_sync);
 	let mut network = TestNetworkBuilder::new()
-		.with_chain_sync((chain_sync, chain_sync_service))
+		.with_chain_sync((Box::new(chain_sync), chain_sync_service))
 		.build();
 
 	// send "request justifiction" message and poll the network
@@ -316,7 +316,10 @@ async fn invalid_justification_imported() {
 	let listen_addr = config::build_multiaddr![Memory(rand::random::<u64>())];
 
 	let (service1, mut event_stream1) = TestNetworkBuilder::new()
-		.with_import_queue(Box::new(DummyImportQueue(justification_info.clone())))
+		.with_import_queue(Box::new(DummyImportQueue(
+			justification_info.clone(),
+			DummyImportQueueHandle {},
+		)))
 		.with_listen_addresses(vec![listen_addr.clone()])
 		.build()
 		.start_network();

client/network/src/service/tests/mod.rs

@@ -336,7 +336,7 @@ impl TestNetworkBuilder {
 		tokio::spawn(async move {
 			let _ = chain_sync_network_provider.run(service).await;
 		});
-		self.rt_handle.spawn(async move {
+		tokio::spawn(async move {
 			loop {
 				futures::future::poll_fn(|cx| {
 					import_queue.poll_actions(cx, &mut *link);