ImportBlock -> BlockImportParams (#3158)

substrate/node/cli/src/service.rs

@@ -214,7 +214,7 @@ construct_service_factory! {
 mod tests {
 	use std::sync::Arc;
 	use aura::CompatibleDigestItem;
-	use consensus_common::{Environment, Proposer, ImportBlock, BlockOrigin, ForkChoiceStrategy};
+	use consensus_common::{Environment, Proposer, BlockImportParams, BlockOrigin, ForkChoiceStrategy};
 	use node_primitives::DigestItem;
 	use node_runtime::{BalancesCall, Call, CENTS, SECS_PER_BLOCK, UncheckedExtrinsic};
 	use parity_codec::{Compact, Encode, Decode};
@@ -233,7 +233,7 @@ mod tests {
 	#[cfg(feature = "rhd")]
 	fn test_sync() {
 		use {service_test, Factory};
-		use client::{ImportBlock, BlockOrigin};
+		use client::{BlockImportParams, BlockOrigin};
 
 		let alice: Arc<ed25519::Pair> = Arc::new(Keyring::Alice.into());
 		let bob: Arc<ed25519::Pair> = Arc::new(Keyring::Bob.into());
@@ -253,7 +253,7 @@ mod tests {
 			};
 			let (proposer, _, _) = proposer_factory.init(&parent_header, &validators, alice.clone()).unwrap();
 			let block = proposer.propose().expect("Error making test block");
-			ImportBlock {
+			BlockImportParams {
 				origin: BlockOrigin::File,
 				justification: Vec::new(),
 				internal_justification: Vec::new(),
@@ -331,7 +331,7 @@ mod tests {
 			);
 			slot_num += 1;
 
-			ImportBlock {
+			BlockImportParams {
 				origin: BlockOrigin::File,
 				header: new_header,
 				justification: None,