move import queue to consensus-common (#1282)

Author: gterzian

Cargo.lock

@@ -25,7 +25,7 @@ use runtime_primitives::{
 	Justification,
 	generic::{BlockId, SignedBlock},
 };
-use consensus::{ImportBlock, ImportResult, BlockOrigin};
+use consensus::{Error as ConsensusError, ErrorKind as ConsensusErrorKind, ImportBlock, ImportResult, BlockOrigin};
 use runtime_primitives::traits::{
 	Block as BlockT, Header as HeaderT, Zero, As, NumberFor, CurrentHeight, BlockNumberToHash,
 	ApiRef, ProvideRuntimeApi, Digest, DigestItem,
@@ -1019,7 +1019,7 @@ impl<B, E, Block, RA> consensus::BlockImport<Block> for Client<B, E, Block, RA>
 	E: CallExecutor<Block, Blake2Hasher> + Clone + Send + Sync,
 	Block: BlockT<Hash=H256>,
 {
-	type Error = Error;
+	type Error = ConsensusError;
 
 	/// Import a checked and validated block. If a justification is provided in
 	/// `ImportBlock` then `finalized` *must* be true.
@@ -1044,9 +1044,10 @@ impl<B, E, Block, RA> consensus::BlockImport<Block> for Client<B, E, Block, RA>
 
 		let parent_hash = header.parent_hash().clone();
 
-		match self.backend.blockchain().status(BlockId::Hash(parent_hash))? {
-			blockchain::BlockStatus::InChain => {},
-			blockchain::BlockStatus::Unknown => return Ok(ImportResult::UnknownParent),
+		match self.backend.blockchain().status(BlockId::Hash(parent_hash)) {
+			Ok(blockchain::BlockStatus::InChain) => {},
+			Ok(blockchain::BlockStatus::Unknown) => return Ok(ImportResult::UnknownParent),
+            Err(e) => return Err(ConsensusErrorKind::ClientImport(e.to_string()).into())
 		}
 
 		let import_headers = if post_digests.is_empty() {
@@ -1081,7 +1082,7 @@ impl<B, E, Block, RA> consensus::BlockImport<Block> for Client<B, E, Block, RA>
 			"best" => ?hash,
 			"origin" => ?origin
 		);
-		result.map_err(|e| e.into())
+		result.map_err(|e| ConsensusErrorKind::ClientImport(e.to_string()).into())
 	}
 }
 

core/client/src/client.rs

@@ -21,14 +21,11 @@ parking_lot = "0.4"
 error-chain = "0.12"
 log = "0.3"
 substrate-consensus-common = { path = "../common" }
-substrate-network = { path = "../../network" }
 
 [dev-dependencies]
 substrate-keyring = { path = "../../keyring" }
 substrate-executor = { path = "../../executor" }
+substrate-network = { path = "../../network", features = ["test-helpers"]}
 substrate-service = { path = "../../service" }
 substrate-test-client = { path = "../../test-client" }
 env_logger = "0.4"
-
-[target.'cfg(test)'.dependencies]
-substrate-network = { path = "../../network", features = ["test-helpers"], optional = true }

core/consensus/aura/Cargo.toml

@@ -37,7 +37,6 @@ extern crate substrate_consensus_aura_primitives as aura_primitives;
 extern crate substrate_consensus_common as consensus_common;
 extern crate tokio;
 extern crate sr_version as runtime_version;
-extern crate substrate_network as network;
 extern crate parking_lot;
 
 #[macro_use]
@@ -48,6 +47,8 @@ extern crate futures;
 #[cfg(test)]
 extern crate substrate_keyring as keyring;
 #[cfg(test)]
+extern crate substrate_network as network;
+#[cfg(test)]
 extern crate substrate_service as service;
 #[cfg(test)]
 extern crate substrate_test_client as test_client;
@@ -60,13 +61,13 @@ use std::sync::Arc;
 use std::time::Duration;
 
 use codec::Encode;
-use consensus_common::{Authorities, BlockImport, Environment, Proposer};
+use consensus_common::{Authorities, BlockImport, Environment, Error as ConsensusError, Proposer};
+use consensus_common::import_queue::{Verifier, BasicQueue};
 use client::ChainHead;
 use client::block_builder::api::BlockBuilder as BlockBuilderApi;
 use consensus_common::{ImportBlock, BlockOrigin};
 use runtime_primitives::{generic, generic::BlockId, Justification, BasicInherentData};
 use runtime_primitives::traits::{Block, Header, Digest, DigestItemFor, ProvideRuntimeApi};
-use network::import_queue::{Verifier, BasicQueue};
 use primitives::{AuthorityId, ed25519};
 
 use futures::{Stream, Future, IntoFuture, future::{self, Either}};
@@ -214,7 +215,6 @@ pub fn start_aura<B, C, E, I, SO, Error>(
 	Error: ::std::error::Error + Send + 'static + From<::consensus_common::Error>,
 {
 	let make_authorship = move || {
-		use futures::future;
 
 		let client = client.clone();
 		let pair = local_key.clone();
@@ -596,7 +596,7 @@ pub fn import_queue<B, C, E, MakeInherent, Inherent>(
 	make_inherent: MakeInherent,
 ) -> AuraImportQueue<B, C, E, MakeInherent> where
 	B: Block,
-	C: Authorities<B> + BlockImport<B,Error=::client::error::Error> + ProvideRuntimeApi + Send + Sync,
+	C: Authorities<B> + BlockImport<B,Error=ConsensusError> + ProvideRuntimeApi + Send + Sync,
 	C::Api: BlockBuilderApi<B, Inherent>,
 	DigestItemFor<B>: CompatibleDigestItem,
 	E: ExtraVerification<B>,

core/consensus/aura/src/lib.rs

@@ -5,6 +5,8 @@ authors = ["Parity Technologies <admin@parity.io>"]
 description = "Common utilities for substrate consensus"
 
 [dependencies]
+log = "0.4"
+parking_lot = "0.7"
 substrate-primitives = { path= "../../primitives" }
 error-chain = "0.12"
 futures = "0.1"
@@ -13,3 +15,6 @@ sr-primitives = { path = "../../sr-primitives" }
 tokio = "0.1.7"
 parity-codec = "2.1"
 parity-codec-derive = "2.0"
+
+[dev-dependencies]
+substrate-test-client = { path = "../../test-client" }

core/consensus/common/Cargo.toml

@@ -84,5 +84,11 @@ error_chain! {
 			description("Other error")
 			display("Other error: {}", e.description())
 		}
+
+		/// Error from the client while importing
+		ClientImport(reason: String) {
+			description("Import failed"),
+			display("Import failed: {}", reason),
+		}
 	}
 }