Move sc-client into sc-service (#5502)

* Drop client from sc-network and sc-client-db, move LongestChain to sc-client-api * move leaves, cht, in_mem to sc-client-api, drop client from sc-finality-grandpa * drop sc-service from sc-rpc * drop sc-service from sc-consensus-aura * drop sc-client from manual-seal and babe * drop sc-client from utils/frame/rpc/system and utils/frame/benchmarking-cli * drop sc-client from bin/node and bin/node-template * drop sc-client * fix tests * remove check -p sc-client from gitlab.yml * fix warnings * fixes ui test * fix light client tests * adds associated Client type to AbstractService * adds UsageProvider to Client * fixed ui test, again * tried and failed to get node-cli to compile for wasm * thanks to tomaka for helping me get node-cli to compile for wasmm * ui test pls pas 🙏🏾 * all tests passing 🪄 * no_run documentation code * rm -f documentation code * ClientProvider * fix mega trait * move LongestChain to sc-consensus, use adds minimal bounds to AbstractService::Client * adds license to sc-consensus Co-authored-by: Benjamin Kampmann <ben@parity.io>
2026-06-12 08:51:09 +00:00 · 2020-04-28 12:59:31 +01:00
parent 7784bdeffe
commit 4fa5941f44
87 changed files with 3937 additions and 3575 deletions
@@ -52,9 +52,9 @@ use std::collections::HashMap;


 use sc_client_api::{
-	ForkBlocks, UsageInfo, MemoryInfo, BadBlocks, IoInfo, MemorySize, CloneableSpawn,
-	execution_extensions::ExecutionExtensions,
+	UsageInfo, MemoryInfo, IoInfo, MemorySize,
 	backend::{NewBlockState, PrunableStateChangesTrieStorage},
+	leaves::{LeafSet, FinalizationDisplaced},
 };
 use sp_blockchain::{
 	Result as ClientResult, Error as ClientError,
@@ -65,17 +65,13 @@ use hash_db::Prefix;
 use sp_trie::{MemoryDB, PrefixedMemoryDB, prefixed_key};
 use sp_database::Transaction;
 use parking_lot::RwLock;
-use sp_core::{ChangesTrieConfiguration, traits::CodeExecutor};
-use sp_core::offchain::storage::{OffchainOverlayedChange,OffchainOverlayedChanges};
+use sp_core::ChangesTrieConfiguration;
+use sp_core::offchain::storage::{OffchainOverlayedChange, OffchainOverlayedChanges};
 use sp_core::storage::{well_known_keys, ChildInfo};
-use sp_runtime::{
-	generic::BlockId, Justification, Storage,
-	BuildStorage,
-};
+use sp_runtime::{generic::BlockId, Justification, Storage};
 use sp_runtime::traits::{
 	Block as BlockT, Header as HeaderT, NumberFor, Zero, One, SaturatedConversion, HashFor,
 };
-use sc_executor::RuntimeInfo;
 use sp_state_machine::{
 	DBValue, ChangesTrieTransaction, ChangesTrieCacheAction, UsageInfo as StateUsageInfo,
 	StorageCollection, ChildStorageCollection,
@@ -83,13 +79,11 @@ use sp_state_machine::{
 };
 use crate::utils::{DatabaseType, Meta, meta_keys, read_db, read_meta};
 use crate::changes_tries_storage::{DbChangesTrieStorage, DbChangesTrieStorageTransaction};
-use sc_client::leaves::{LeafSet, FinalizationDisplaced};
 use sc_state_db::StateDb;
 use sp_blockchain::{CachedHeaderMetadata, HeaderMetadata, HeaderMetadataCache};
 use crate::storage_cache::{CachingState, SyncingCachingState, SharedCache, new_shared_cache};
 use crate::stats::StateUsageStats;
 use log::{trace, debug, warn};
-use prometheus_endpoint::Registry;

 // Re-export the Database trait so that one can pass an implementation of it.
 pub use sp_database::Database;
@@ -98,7 +92,6 @@ pub use sc_state_db::PruningMode;
 #[cfg(any(feature = "kvdb-rocksdb", test))]
 pub use bench::BenchmarkingState;

-const CANONICALIZATION_DELAY: u64 = 4096;
 const MIN_BLOCKS_TO_KEEP_CHANGES_TRIES_FOR: u32 = 32768;

 /// Default value for storage cache child ratio.
@@ -324,49 +317,6 @@ impl DatabaseSettingsSrc {
 	}
 }

-/// Create an instance of db-backed client.
-pub fn new_client<E, Block, RA>(
-	settings: DatabaseSettings,
-	executor: E,
-	genesis_storage: &dyn BuildStorage,
-	fork_blocks: ForkBlocks<Block>,
-	bad_blocks: BadBlocks<Block>,
-	execution_extensions: ExecutionExtensions<Block>,
-	spawn_handle: Box<dyn CloneableSpawn>,
-	prometheus_registry: Option<Registry>,
-	config: sc_client::ClientConfig,
-) -> Result<(
-		sc_client::Client<
-			Backend<Block>,
-			sc_client::LocalCallExecutor<Backend<Block>, E>,
-			Block,
-			RA,
-		>,
-		Arc<Backend<Block>>,
-	),
-	sp_blockchain::Error,
->
-	where
-		Block: BlockT,
-		E: CodeExecutor + RuntimeInfo,
-{
-	let backend = Arc::new(Backend::new(settings, CANONICALIZATION_DELAY)?);
-	let executor = sc_client::LocalCallExecutor::new(backend.clone(), executor, spawn_handle, config.clone());
-	Ok((
-		sc_client::Client::new(
-			backend.clone(),
-			executor,
-			genesis_storage,
-			fork_blocks,
-			bad_blocks,
-			execution_extensions,
-			prometheus_registry,
-			config,
-		)?,
-		backend,
-	))
-}
-
 pub(crate) mod columns {
 	pub const META: u32 = crate::utils::COLUMN_META;
 	pub const STATE: u32 = 1;
@@ -446,14 +396,14 @@ impl<Block: BlockT> BlockchainDb<Block> {
 	}
 }

-impl<Block: BlockT> sc_client::blockchain::HeaderBackend<Block> for BlockchainDb<Block> {
+impl<Block: BlockT> sc_client_api::blockchain::HeaderBackend<Block> for BlockchainDb<Block> {
 	fn header(&self, id: BlockId<Block>) -> ClientResult<Option<Block::Header>> {
 		utils::read_header(&*self.db, columns::KEY_LOOKUP, columns::HEADER, id)
 	}

-	fn info(&self) -> sc_client::blockchain::Info<Block> {
+	fn info(&self) -> sc_client_api::blockchain::Info<Block> {
 		let meta = self.meta.read();
-		sc_client::blockchain::Info {
+		sc_client_api::blockchain::Info {
 			best_hash: meta.best_hash,
 			best_number: meta.best_number,
 			genesis_hash: meta.genesis_hash,
@@ -463,7 +413,7 @@ impl<Block: BlockT> sc_client::blockchain::HeaderBackend<Block> for BlockchainDb
 		}
 	}

-	fn status(&self, id: BlockId<Block>) -> ClientResult<sc_client::blockchain::BlockStatus> {
+	fn status(&self, id: BlockId<Block>) -> ClientResult<sc_client_api::blockchain::BlockStatus> {
 		let exists = match id {
 			BlockId::Hash(_) => read_db(
 				&*self.db,
@@ -474,8 +424,8 @@ impl<Block: BlockT> sc_client::blockchain::HeaderBackend<Block> for BlockchainDb
 			BlockId::Number(n) => n <= self.meta.read().best_number,
 		};
 		match exists {
-			true => Ok(sc_client::blockchain::BlockStatus::InChain),
-			false => Ok(sc_client::blockchain::BlockStatus::Unknown),
+			true => Ok(sc_client_api::blockchain::BlockStatus::InChain),
+			false => Ok(sc_client_api::blockchain::BlockStatus::Unknown),
 		}
 	}

@@ -491,7 +441,7 @@ impl<Block: BlockT> sc_client::blockchain::HeaderBackend<Block> for BlockchainDb
 	}
 }

-impl<Block: BlockT> sc_client::blockchain::Backend<Block> for BlockchainDb<Block> {
+impl<Block: BlockT> sc_client_api::blockchain::Backend<Block> for BlockchainDb<Block> {
 	fn body(&self, id: BlockId<Block>) -> ClientResult<Option<Vec<Block::Extrinsic>>> {
 		match read_db(&*self.db, columns::KEY_LOOKUP, columns::BODY, id)? {
 			Some(body) => match Decode::decode(&mut &body[..]) {
@@ -520,7 +470,7 @@ impl<Block: BlockT> sc_client::blockchain::Backend<Block> for BlockchainDb<Block
 		Ok(self.meta.read().finalized_hash.clone())
 	}

-	fn cache(&self) -> Option<Arc<dyn sc_client::blockchain::Cache<Block>>> {
+	fn cache(&self) -> Option<Arc<dyn sc_client_api::blockchain::Cache<Block>>> {
 		None
 	}

@@ -533,8 +483,8 @@ impl<Block: BlockT> sc_client::blockchain::Backend<Block> for BlockchainDb<Block
 	}
 }

-impl<Block: BlockT> sc_client::blockchain::ProvideCache<Block> for BlockchainDb<Block> {
-	fn cache(&self) -> Option<Arc<dyn sc_client::blockchain::Cache<Block>>> {
+impl<Block: BlockT> sc_client_api::blockchain::ProvideCache<Block> for BlockchainDb<Block> {
+	fn cache(&self) -> Option<Arc<dyn sc_client_api::blockchain::Cache<Block>>> {
 		None
 	}
 }
@@ -1035,7 +985,7 @@ impl<Block: BlockT> Backend<Block> {
 			let hash = if new_canonical == number_u64 {
 				hash
 			} else {
-				::sc_client::blockchain::HeaderBackend::hash(&self.blockchain, new_canonical.saturated_into())?
+				::sc_client_api::blockchain::HeaderBackend::hash(&self.blockchain, new_canonical.saturated_into())?
 					.expect("existence of block with number `new_canonical` \
 						implies existence of blocks with all numbers before it; qed")
 			};
@@ -1259,7 +1209,7 @@ impl<Block: BlockT> Backend<Block> {
 		};

 		let cache_update = if let Some(set_head) = operation.set_head {
-			if let Some(header) = sc_client::blockchain::HeaderBackend::header(&self.blockchain, set_head)? {
+			if let Some(header) = sc_client_api::blockchain::HeaderBackend::header(&self.blockchain, set_head)? {
 				let number = header.number();
 				let hash = header.hash();

@@ -1604,7 +1554,7 @@ impl<Block: BlockT> sc_client_api::backend::Backend<Block> for Backend<Block> {
 	}

 	fn state_at(&self, block: BlockId<Block>) -> ClientResult<Self::State> {
-		use sc_client::blockchain::HeaderBackend as BcHeaderBackend;
+		use sc_client_api::blockchain::HeaderBackend as BcHeaderBackend;

 		// special case for genesis initialization
 		match block {
@@ -1705,7 +1655,7 @@ pub(crate) mod tests {
 	use crate::columns;
 	use sp_core::H256;
 	use sc_client_api::backend::{Backend as BTrait, BlockImportOperation as Op};
-	use sc_client::blockchain::Backend as BLBTrait;
+	use sc_client_api::blockchain::Backend as BLBTrait;
 	use sp_runtime::testing::{Header, Block as RawBlock, ExtrinsicWrapper};
 	use sp_runtime::traits::{Hash, BlakeTwo256};
 	use sp_runtime::generic::DigestItem;
@@ -2284,7 +2234,7 @@ pub(crate) mod tests {

 	#[test]
 	fn test_finalize_block_with_justification() {
-		use sc_client::blockchain::{Backend as BlockChainBackend};
+		use sc_client_api::blockchain::{Backend as BlockChainBackend};

 		let backend = Backend::<Block>::new_test(10, 10);

@@ -20,11 +20,13 @@ use std::{sync::Arc, collections::HashMap};
 use std::convert::TryInto;
 use parking_lot::RwLock;

-use sc_client_api::{backend::{AuxStore, NewBlockState}, UsageInfo};
-use sc_client::blockchain::{
-	BlockStatus, Cache as BlockchainCache,Info as BlockchainInfo,
+use sc_client_api::{
+	cht, backend::{AuxStore, NewBlockState}, UsageInfo,
+	blockchain::{
+		BlockStatus, Cache as BlockchainCache, Info as BlockchainInfo,
+	},
+	Storage
 };
-use sc_client::cht;
 use sp_blockchain::{
 	CachedHeaderMetadata, HeaderMetadata, HeaderMetadataCache,
 	Error as ClientError, Result as ClientResult,
@@ -32,7 +34,6 @@ use sp_blockchain::{
 	well_known_cache_keys,
 };
 use sp_database::{Database, Transaction};
-use sc_client::light::blockchain::Storage as LightBlockchainStorage;
 use codec::{Decode, Encode};
 use sp_runtime::generic::{DigestItem, BlockId};
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT, Zero, One, NumberFor, HashFor};
@@ -406,7 +407,7 @@ impl<Block> AuxStore for LightStorage<Block>
 	}
 }

-impl<Block> LightBlockchainStorage<Block> for LightStorage<Block>
+impl<Block> Storage<Block> for LightStorage<Block>
 	where Block: BlockT,
 {
 	fn import_header(
@@ -614,7 +615,7 @@ fn cht_key<N: TryInto<u32>>(cht_type: u8, block: N) -> ClientResult<[u8; 5]> {

 #[cfg(test)]
 pub(crate) mod tests {
-	use sc_client::cht;
+	use sc_client_api::cht;
 	use sp_core::ChangesTrieConfiguration;
 	use sp_runtime::generic::{DigestItem, ChangesTrieSignal};
 	use sp_runtime::testing::{H256 as Hash, Header, Block as RawBlock, ExtrinsicWrapper};