move children and blockchain interfaces

client/Cargo.toml

@@ -19,7 +19,6 @@ header-metadata = { package = "substrate-header-metadata", path = "header-metada
 hex-literal = { version = "0.2.1" }
 inherents = { package = "substrate-inherents", path = "../primitives/inherents" }
 keyring = { package = "substrate-keyring", path = "keyring" }
-kvdb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
 log = { version = "0.4.8" }
 parking_lot = { version = "0.9.0" }
 primitives = { package = "substrate-primitives", path = "../primitives/core" }

client/authority-discovery/Cargo.toml

@@ -11,7 +11,7 @@ prost-build = "0.5.0"
 [dependencies]
 authority-discovery-primitives = { package = "substrate-authority-discovery-primitives", path = "../../primitives/authority-discovery" }
 bytes = "0.4.12"
-client = { package = "substrate-client", path = "../" }
+interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
 codec = { package = "parity-scale-codec", default-features = false, version = "1.0.3" }
 derive_more = "0.15.0"
 futures-preview = "0.3.0-alpha.19"

client/authority-discovery/src/error.rs

@@ -27,7 +27,7 @@ pub enum Error {
 	/// Failed to hash the authority id to be used as a dht key.
 	HashingAuthorityId(libp2p::core::multiaddr::multihash::EncodeError),
 	/// Failed calling into the Substrate runtime.
-	CallingRuntime(client::error::Error),
+	CallingRuntime(interfaces::error::Error),
 	/// Failed signing the dht payload via the Substrate runtime.
 	SigningDhtPayload,
 	/// From the Dht we only get the hashed authority id. In order to retrieve the actual authority id and to ensure it

client/authority-discovery/src/lib.rs

@@ -57,7 +57,7 @@ use futures::Future;
 use futures_timer::Interval;
 
 use authority_discovery_primitives::{AuthorityDiscoveryApi, AuthorityId, Signature};
-use client::blockchain::HeaderBackend;
+use interfaces::blockchain::HeaderBackend;
 use error::{Error, Result};
 use log::{debug, error, log_enabled, warn};
 use network::specialization::NetworkSpecialization;
@@ -105,7 +105,7 @@ where
 	Block: BlockT + Unpin + 'static,
 	Network: NetworkProvider,
 	Client: ProvideRuntimeApi + Send + Sync + 'static + HeaderBackend<Block>,
-	<Client as ProvideRuntimeApi>::Api: AuthorityDiscoveryApi<Block, Error = client::error::Error>,
+	<Client as ProvideRuntimeApi>::Api: AuthorityDiscoveryApi<Block, Error = interfaces::error::Error>,
 	Self: Future<Output = ()>,
 {
 	/// Return a new authority discovery.
@@ -303,7 +303,7 @@ where
 	Block: BlockT + Unpin + 'static,
 	Network: NetworkProvider,
 	Client: ProvideRuntimeApi + Send + Sync + 'static + HeaderBackend<Block>,
-	<Client as ProvideRuntimeApi>::Api: AuthorityDiscoveryApi<Block, Error = client::error::Error>,
+	<Client as ProvideRuntimeApi>::Api: AuthorityDiscoveryApi<Block, Error = interfaces::error::Error>,
 {
 	type Output = ();
 
@@ -430,12 +430,12 @@ mod tests {
 		fn header(
 			&self,
 			_id: BlockId<Block>,
-		) -> std::result::Result<Option<Block::Header>, client::error::Error> {
+		) -> std::result::Result<Option<Block::Header>, interfaces::error::Error> {
 			Ok(None)
 		}
 
-		fn info(&self) -> client::blockchain::Info<Block> {
-			client::blockchain::Info {
+		fn info(&self) -> interfaces::blockchain::Info<Block> {
+			interfaces::blockchain::Info {
 				best_hash: Default::default(),
 				best_number: Zero::zero(),
 				finalized_hash: Default::default(),
@@ -447,21 +447,21 @@ mod tests {
 		fn status(
 			&self,
 			_id: BlockId<Block>,
-		) -> std::result::Result<client::blockchain::BlockStatus, client::error::Error> {
-			Ok(client::blockchain::BlockStatus::Unknown)
+		) -> std::result::Result<interfaces::blockchain::BlockStatus, interfaces::error::Error> {
+			Ok(interfaces::blockchain::BlockStatus::Unknown)
 		}
 
 		fn number(
 			&self,
 			_hash: Block::Hash,
-		) -> std::result::Result<Option<NumberFor<Block>>, client::error::Error> {
+		) -> std::result::Result<Option<NumberFor<Block>>, interfaces::error::Error> {
 			Ok(None)
 		}
 
 		fn hash(
 			&self,
 			_number: NumberFor<Block>,
-		) -> std::result::Result<Option<Block::Hash>, client::error::Error> {
+		) -> std::result::Result<Option<Block::Hash>, interfaces::error::Error> {
 			Ok(None)
 		}
 	}
@@ -475,7 +475,7 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<()>,
 			_: Vec<u8>,
-		) -> std::result::Result<NativeOrEncoded<RuntimeVersion>, client::error::Error> {
+		) -> std::result::Result<NativeOrEncoded<RuntimeVersion>, interfaces::error::Error> {
 			unimplemented!("Not required for testing!")
 		}
 
@@ -485,7 +485,7 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<(Block)>,
 			_: Vec<u8>,
-		) -> std::result::Result<NativeOrEncoded<()>, client::error::Error> {
+		) -> std::result::Result<NativeOrEncoded<()>, interfaces::error::Error> {
 			unimplemented!("Not required for testing!")
 		}
 
@@ -495,13 +495,13 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<&<Block as BlockT>::Header>,
 			_: Vec<u8>,
-		) -> std::result::Result<NativeOrEncoded<()>, client::error::Error> {
+		) -> std::result::Result<NativeOrEncoded<()>, interfaces::error::Error> {
 			unimplemented!("Not required for testing!")
 		}
 	}
 
 	impl ApiExt<Block> for RuntimeApi {
-		type Error = client::error::Error;
+		type Error = interfaces::error::Error;
 
 		fn map_api_result<F: FnOnce(&Self) -> std::result::Result<R, E>, R, E>(
 			&self,
@@ -513,7 +513,7 @@ mod tests {
 		fn runtime_version_at(
 			&self,
 			_: &BlockId<Block>,
-		) -> std::result::Result<RuntimeVersion, client::error::Error> {
+		) -> std::result::Result<RuntimeVersion, interfaces::error::Error> {
 			unimplemented!("Not required for testing!")
 		}
 
@@ -533,7 +533,7 @@ mod tests {
 			_: ExecutionContext,
 			_: Option<()>,
 			_: Vec<u8>,
-		) -> std::result::Result<NativeOrEncoded<Vec<AuthorityId>>, client::error::Error> {
+		) -> std::result::Result<NativeOrEncoded<Vec<AuthorityId>>, interfaces::error::Error> {
 			return Ok(NativeOrEncoded::Native(vec![
 				AuthorityId("test-authority-id-1".as_bytes().to_vec()),
 				AuthorityId("test-authority-id-2".as_bytes().to_vec()),
@@ -547,7 +547,7 @@ mod tests {
 			_: Vec<u8>,
 		) -> std::result::Result<
 			NativeOrEncoded<Option<(Signature, AuthorityId)>>,
-			client::error::Error,
+			interfaces::error::Error,
 		> {
 			return Ok(NativeOrEncoded::Native(Some((
 				Signature("test-signature-1".as_bytes().to_vec()),
@@ -560,7 +560,7 @@ mod tests {
 			_: ExecutionContext,
 			args: Option<(&Vec<u8>, &Signature, &AuthorityId)>,
 			_: Vec<u8>,
-		) -> std::result::Result<NativeOrEncoded<bool>, client::error::Error> {
+		) -> std::result::Result<NativeOrEncoded<bool>, interfaces::error::Error> {
 			if *args.unwrap().1 == Signature("test-signature-1".as_bytes().to_vec()) {
 				return Ok(NativeOrEncoded::Native(true));
 			}

client/db/Cargo.toml

@@ -13,6 +13,7 @@ kvdb-rocksdb = { git = "https://github.com/paritytech/parity-common", rev="b0317
 kvdb-memorydb = { git = "https://github.com/paritytech/parity-common", rev="b0317f649ab2c665b7987b8475878fc4d2e1f81d" }
 linked-hash-map = "0.5.2"
 hash-db = "0.15.2"
+interfaces = { package = "substrate-client-interfaces", path = "../interfaces" }
 primitives = { package = "substrate-primitives", path = "../../primitives/core" }
 sr-primitives = {  path = "../../primitives/sr-primitives" }
 client = { package = "substrate-client", path = "../" }

client/db/src/lib.rs

@@ -29,6 +29,7 @@
 pub mod light;
 pub mod offchain;
 
+mod children;
 mod cache;
 mod storage_cache;
 mod utils;
@@ -64,7 +65,6 @@ use state_machine::{
 };
 use crate::utils::{Meta, db_err, meta_keys, read_db, read_meta};
 use client::leaves::{LeafSet, FinalizationDisplaced};
-use client::children;
 use state_db::StateDb;
 use header_metadata::{CachedHeaderMetadata, HeaderMetadata, HeaderMetadataCache};
 use crate::storage_cache::{CachingState, SharedCache, new_shared_cache};

client/src/blockchain.rs → client/interfaces/src/blockchain.rs

@@ -26,7 +26,7 @@ use parking_lot::Mutex;
 
 use header_metadata::HeaderMetadata;
 
-use interfaces::error::{Error, Result};
+use crate::error::{Error, Result};
 
 /// Blockchain database header backend. Does not perform any validation.
 pub trait HeaderBackend<Block: BlockT>: Send + Sync {

client/interfaces/src/lib.rs

@@ -1 +1,2 @@
-pub mod errors;
+pub mod errors;
+pub mod blockchain;

client/src/backend.rs

@@ -25,7 +25,7 @@ use sr_primitives::{generic::BlockId, Justification, StorageOverlay, ChildrenSto
 use sr_primitives::traits::{Block as BlockT, NumberFor};
 use state_machine::backend::Backend as StateBackend;
 use state_machine::{ChangesTrieStorage as StateChangesTrieStorage, ChangesTrieTransaction};
-use crate::blockchain::well_known_cache_keys;
+use interfaces::blockchain::well_known_cache_keys;
 use consensus::BlockOrigin;
 use hash_db::Hasher;
 use parking_lot::Mutex;
@@ -216,7 +216,7 @@ pub trait Backend<Block, H>: AuxStore + Send + Sync where
 	/// Associated block insertion operation type.
 	type BlockImportOperation: BlockImportOperation<Block, H, State=Self::State>;
 	/// Associated blockchain backend type.
-	type Blockchain: crate::blockchain::Backend<Block>;
+	type Blockchain: interfaces::blockchain::Backend<Block>;
 	/// Associated state backend type.
 	type State: StateBackend<H>;
 	/// Changes trie storage.

client/src/in_mem.rs

@@ -33,7 +33,7 @@ use interfaces::error;
 use crate::backend::{self, NewBlockState, StorageCollection, ChildStorageCollection};
 use crate::light;
 use crate::leaves::LeafSet;
-use crate::blockchain::{
+use interfaces::blockchain::{
 	self, BlockStatus, HeaderBackend, well_known_cache_keys::Id as CacheKeyId
 };
 

client/src/lib.rs

@@ -76,20 +76,19 @@
 #![warn(missing_docs)]
 #![recursion_limit="128"]
 
-pub mod blockchain;
 pub mod backend;
 pub mod cht;
 pub mod in_mem;
 pub mod genesis;
 pub mod light;
 pub mod leaves;
-pub mod children;
 mod call_executor;
 mod client;
 mod notifications;
 
 pub use interfaces::error;
-pub use crate::blockchain::Info as ChainInfo;
+pub use interfaces::blockchain;
+pub use interfaces::blockchain::Info as ChainInfo;
 pub use crate::call_executor::{CallExecutor, LocalCallExecutor};
 pub use crate::client::{
 	new_with_backend,
@@ -102,4 +101,4 @@ pub use crate::client::{
 pub use crate::notifications::{StorageEventStream, StorageChangeSet};
 pub use state_machine::{ExecutionStrategy, StorageProof};
 pub use crate::leaves::LeafSet;
-pub use crate::blockchain::well_known_cache_keys;
+pub use interfaces::blockchain::well_known_cache_keys;

client/src/light/backend.rs

@@ -29,7 +29,7 @@ use crate::backend::{
 	AuxStore, Backend as ClientBackend, BlockImportOperation, RemoteBackend, NewBlockState,
 	StorageCollection, ChildStorageCollection,
 };
-use crate::blockchain::{HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys};
+use interfaces::blockchain::{HeaderBackend as BlockchainHeaderBackend, well_known_cache_keys};
 use interfaces::error::{Error as ClientError, Result as ClientResult};
 use crate::light::blockchain::{Blockchain, Storage as BlockchainStorage};
 use hash_db::Hasher;

client/src/light/blockchain.rs

@@ -26,7 +26,7 @@ use sr_primitives::traits::{Block as BlockT, Header as HeaderT, NumberFor, Zero}
 use header_metadata::{HeaderMetadata, CachedHeaderMetadata};
 
 use crate::backend::{AuxStore, NewBlockState};
-use crate::blockchain::{
+use interfaces::blockchain::{
 	Backend as BlockchainBackend, BlockStatus, Cache as BlockchainCache,
 	HeaderBackend as BlockchainHeaderBackend, Info as BlockchainInfo, ProvideCache,
 	well_known_cache_keys
@@ -250,7 +250,7 @@ pub mod tests {
 	use std::collections::HashMap;
 	use parking_lot::Mutex;
 	use test_client::runtime::{Hash, Block, Header};
-	use crate::blockchain::Info;
+	use interfaces::blockchain::Info;
 	use super::*;
 
 	pub type DummyBlockchain = Blockchain<DummyStorage>;