Companion for #6025 (#1098)

polkadot/network/test/src/block_import.rs

@@ -93,7 +93,14 @@ fn async_import_queue_drops() {
 	for _ in 0..100 {
 		let verifier = PassThroughVerifier(true);
 
-		let queue = BasicQueue::new(verifier, Box::new(polkadot_test_runtime_client::new()), None, None, &executor);
+		let queue = BasicQueue::new(
+			verifier,
+			Box::new(polkadot_test_runtime_client::new()),
+			None,
+			None,
+			&executor,
+			None
+		);
 		drop(queue);
 	}
 }

polkadot/network/test/src/lib.rs

@@ -574,6 +574,7 @@ pub trait TestNetFactory: Sized {
 			justification_import,
 			finality_proof_import,
 			&sp_core::testing::SpawnBlockingExecutor::new(),
+			None,
 		));
 
 		let listen_addr = build_multiaddr![Memory(rand::random::<u64>())];
@@ -650,6 +651,7 @@ pub trait TestNetFactory: Sized {
 			justification_import,
 			finality_proof_import,
 			&sp_core::testing::SpawnBlockingExecutor::new(),
+			None,
 		));
 
 		let listen_addr = build_multiaddr![Memory(rand::random::<u64>())];

polkadot/runtime/common/src/parachains.rs

@@ -1245,7 +1245,7 @@ impl<T: Trait> Module<T> {
 			);
 
 			ensure!(
-				schedule.max_head_data_size >= candidate.candidate().head_data.0.len() as _,
+				schedule.max_head_data_size as usize >= candidate.candidate().head_data.0.len(),
 				Error::<T>::HeadDataTooLarge,
 			);
 

polkadot/service/src/lib.rs

@@ -166,7 +166,14 @@ macro_rules! new_full_start {
 				let pool = sc_transaction_pool::BasicPool::new(config, std::sync::Arc::new(pool_api), prometheus_registry);
 				Ok(pool)
 			})?
-			.with_import_queue(|config, client, mut select_chain, _, spawn_task_handle| {
+			.with_import_queue(|
+				config,
+				client,
+				mut select_chain,
+				_,
+				spawn_task_handle,
+				registry,
+			| {
 				let select_chain = select_chain.take()
 					.ok_or_else(|| service::Error::SelectChainRequired)?;
 
@@ -200,6 +207,7 @@ macro_rules! new_full_start {
 					client,
 					inherent_data_providers.clone(),
 					spawn_task_handle,
+					registry,
 				)?;
 
 				import_setup = Some((block_import, grandpa_link, babe_link));
@@ -526,7 +534,16 @@ macro_rules! new_light {
 				);
 				Ok(pool)
 			})?
-			.with_import_queue_and_fprb(|_config, client, backend, fetcher, _select_chain, _, spawn_task_handle| {
+			.with_import_queue_and_fprb(|
+				_config,
+				client,
+				backend,
+				fetcher,
+				_select_chain,
+				_,
+				spawn_task_handle,
+				registry,
+			| {
 				let fetch_checker = fetcher
 					.map(|fetcher| fetcher.checker().clone())
 					.ok_or_else(|| "Trying to start light import queue without active fetch checker")?;
@@ -553,6 +570,7 @@ macro_rules! new_light {
 					client,
 					inherent_data_providers.clone(),
 					spawn_task_handle,
+					registry,
 				)?;
 
 				Ok((import_queue, finality_proof_request_builder))