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>

substrate/bin/node-template/node/Cargo.toml

@@ -23,7 +23,7 @@ structopt = "0.3.8"
 sc-cli = { version = "0.8.0-dev", path = "../../../client/cli" }
 sp-core = { version = "2.0.0-dev", path = "../../../primitives/core" }
 sc-executor = { version = "0.8.0-dev", path = "../../../client/executor" }
-sc-service = { version = "0.8.0-dev", path = "../../../client/service" }
+sc-service = { version = "0.8.0-dev", default-features = false, path = "../../../client/service" }
 sp-inherents = { version = "2.0.0-dev", path = "../../../primitives/inherents" }
 sc-transaction-pool = { version = "2.0.0-dev", path = "../../../client/transaction-pool" }
 sp-transaction-pool = { version = "2.0.0-dev", path = "../../../primitives/transaction-pool" }
@@ -31,9 +31,9 @@ sc-network = { version = "0.8.0-dev", path = "../../../client/network" }
 sc-consensus-aura = { version = "0.8.0-dev", path = "../../../client/consensus/aura" }
 sp-consensus-aura = { version = "0.8.0-dev", path = "../../../primitives/consensus/aura" }
 sp-consensus = { version = "0.8.0-dev", path = "../../../primitives/consensus/common" }
+sc-consensus = { version = "0.8.0-dev", path = "../../../client/consensus/common" }
 sc-finality-grandpa = { version = "0.8.0-dev", path = "../../../client/finality-grandpa" }
 sp-finality-grandpa = { version = "2.0.0-dev", path = "../../../primitives/finality-grandpa" }
-sc-client = { version = "0.8.0-dev", path = "../../../client/" }
 sc-client-api = { version = "2.0.0-dev", path = "../../../client/api" }
 sp-runtime = { version = "2.0.0-dev", path = "../../../primitives/runtime" }
 sc-basic-authorship = { path = "../../../client/basic-authorship", version = "0.8.0-dev"}

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

@@ -2,8 +2,8 @@
 
 use std::sync::Arc;
 use std::time::Duration;
-use sc_client::LongestChain;
 use sc_client_api::ExecutorProvider;
+use sc_consensus::LongestChain;
 use node_template_runtime::{self, opaque::Block, RuntimeApi};
 use sc_service::{error::{Error as ServiceError}, AbstractService, Configuration, ServiceBuilder};
 use sp_inherents::InherentDataProviders;
@@ -35,7 +35,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_consensus::LongestChain::new(backend.clone()))
 			})?
 			.with_transaction_pool(|config, client, _fetcher, prometheus_registry| {
 				let pool_api = sc_transaction_pool::FullChainApi::new(client.clone());
@@ -71,9 +71,7 @@ macro_rules! new_full_start {
 }
 
 /// Builds a new service for a full client.
-pub fn new_full(config: Configuration)
-	-> Result<impl AbstractService, ServiceError>
-{
+pub fn new_full(config: Configuration) -> Result<impl AbstractService, ServiceError> {
 	let role = config.role.clone();
 	let force_authoring = config.force_authoring;
 	let name = config.network.node_name.clone();
@@ -176,9 +174,7 @@ pub fn new_full(config: Configuration)
 }
 
 /// Builds a new service for a light client.
-pub fn new_light(config: Configuration)
-	-> Result<impl AbstractService, ServiceError>
-{
+pub fn new_light(config: Configuration) -> Result<impl AbstractService, ServiceError> {
 	let inherent_data_providers = InherentDataProviders::new();
 
 	ServiceBuilder::new_light::<Block, RuntimeApi, Executor>(config)?