Move sc-client into sc-service

.gitlab-ci.yml

@@ -325,7 +325,6 @@ check-web-wasm:
     - time cargo build --target=wasm32-unknown-unknown -p sp-io
     - time cargo build --target=wasm32-unknown-unknown -p sp-runtime
     - time cargo build --target=wasm32-unknown-unknown -p sp-std
-    - time cargo build --target=wasm32-unknown-unknown -p sc-client
     - time cargo build --target=wasm32-unknown-unknown -p sc-consensus-aura
     - time cargo build --target=wasm32-unknown-unknown -p sc-consensus-babe
     - time cargo build --target=wasm32-unknown-unknown -p sp-consensus

Cargo.toml

@@ -14,7 +14,6 @@ members = [
 	"bin/node/transaction-factory",
 	"bin/utils/subkey",
 	"bin/utils/chain-spec-builder",
-	"client",
 	"client/api",
 	"client/authority-discovery",
 	"client/basic-authorship",

bin/node-template/node/Cargo.toml

@@ -30,7 +30,6 @@ sp-consensus-aura = { version = "0.8.0-alpha.5", path = "../../../primitives/con
 sp-consensus = { version = "0.8.0-alpha.5", path = "../../../primitives/consensus/common" }
 sc-finality-grandpa = { version = "0.8.0-alpha.5", path = "../../../client/finality-grandpa" }
 sp-finality-grandpa = { version = "2.0.0-alpha.5", path = "../../../primitives/finality-grandpa" }
-sc-client = { version = "0.8.0-alpha.5", path = "../../../client/" }
 sc-client-api = { version = "2.0.0-alpha.5", path = "../../../client/api" }
 sp-runtime = { version = "2.0.0-alpha.5", path = "../../../primitives/runtime" }
 sc-basic-authorship = { path = "../../../client/basic-authorship", version = "0.8.0-alpha.5"}

bin/node-template/node/src/service.rs

@@ -2,8 +2,7 @@
 
 use std::sync::Arc;
 use std::time::Duration;
-use sc_client::LongestChain;
-use sc_client_api::ExecutorProvider;
+use sc_client_api::{ExecutorProvider, LongestChain};
 use node_template_runtime::{self, opaque::Block, RuntimeApi};
 use sc_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder};
 use sp_inherents::InherentDataProviders;
@@ -33,7 +32,7 @@ macro_rules! new_full_start {
 			node_template_runtime::opaque::Block, node_template_runtime::RuntimeApi, crate::service::Executor
 		>($config)?
 			.with_select_chain(|_config, backend| {
-				Ok(sc_client::LongestChain::new(backend.clone()))
+				Ok(sc_client_api::LongestChain::new(backend.clone()))
 			})?
 			.with_transaction_pool(|config, client, _fetcher| {
 				let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());

bin/node/cli/Cargo.toml

@@ -56,7 +56,6 @@ sp-consensus = { version = "0.8.0-alpha.5", path = "../../../primitives/consensu
 
 # client dependencies
 sc-client-api = { version = "2.0.0-alpha.5", path = "../../../client/api" }
-sc-client = { version = "0.8.0-alpha.5", path = "../../../client/" }
 sc-chain-spec = { version = "2.0.0-alpha.5", path = "../../../client/chain-spec" }
 sc-transaction-pool = { version = "2.0.0-alpha.5", path = "../../../client/transaction-pool" }
 sp-transaction-pool = { version = "2.0.0-alpha.5", path = "../../../primitives/transaction-pool" }

bin/node/cli/src/chain_spec.rs

@@ -51,9 +51,9 @@ const STAGING_TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit/";
 #[serde(rename_all = "camelCase")]
 pub struct Extensions {
 	/// Block numbers with known hashes.
-	pub fork_blocks: sc_client::ForkBlocks<Block>,
+	pub fork_blocks: sc_client_api::ForkBlocks<Block>,
 	/// Known bad block hashes.
-	pub bad_blocks: sc_client::BadBlocks<Block>,
+	pub bad_blocks: sc_client_api::BadBlocks<Block>,
 }
 
 /// Specialized `ChainSpec`.