Removal of light client from substrate (#9684)

* Removal of light client from substrate

* add missing import

* These tests relate to there being light and non light clients.

* removing lightnodes from test

* cargo fmt

* not needed

* LightDataChecker not needed any longer

* cargo fmt

* Update client/service/test/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* Update client/service/test/src/lib.rs

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

* cargo fmt

Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

substrate/client/service/src/builder.rs

@@ -18,7 +18,7 @@
 
 use crate::{
 	build_network_future,
-	client::{light, Client, ClientConfig},
+	client::{Client, ClientConfig},
 	config::{Configuration, KeystoreConfig, PrometheusConfig, TransactionStorageMode},
 	error::Error,
 	metrics::MetricsService,
@@ -58,7 +58,7 @@ use sp_core::traits::{CodeExecutor, SpawnNamed};
 use sp_keystore::{CryptoStore, SyncCryptoStore, SyncCryptoStorePtr};
 use sp_runtime::{
 	generic::BlockId,
-	traits::{Block as BlockT, BlockIdTo, HashFor, Zero},
+	traits::{Block as BlockT, BlockIdTo, Zero},
 	BuildStorage,
 };
 use std::{str::FromStr, sync::Arc, time::SystemTime};
@@ -137,47 +137,9 @@ pub type TFullBackend<TBl> = sc_client_db::Backend<TBl>;
 pub type TFullCallExecutor<TBl, TExec> =
 	crate::client::LocalCallExecutor<TBl, sc_client_db::Backend<TBl>, TExec>;
 
-/// Light client type.
-pub type TLightClient<TBl, TRtApi, TExec> =
-	TLightClientWithBackend<TBl, TRtApi, TExec, TLightBackend<TBl>>;
-
-/// Light client backend type.
-pub type TLightBackend<TBl> =
-	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>;
-
-/// Light call executor type.
-pub type TLightCallExecutor<TBl, TExec> = sc_light::GenesisCallExecutor<
-	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>,
-	crate::client::LocalCallExecutor<
-		TBl,
-		sc_light::Backend<sc_client_db::light::LightStorage<TBl>, HashFor<TBl>>,
-		TExec,
-	>,
->;
-
 type TFullParts<TBl, TRtApi, TExec> =
 	(TFullClient<TBl, TRtApi, TExec>, Arc<TFullBackend<TBl>>, KeystoreContainer, TaskManager);
 
-type TLightParts<TBl, TRtApi, TExec> = (
-	Arc<TLightClient<TBl, TRtApi, TExec>>,
-	Arc<TLightBackend<TBl>>,
-	KeystoreContainer,
-	TaskManager,
-	Arc<OnDemand<TBl>>,
-);
-
-/// Light client backend type with a specific hash type.
-pub type TLightBackendWithHash<TBl, THash> =
-	sc_light::Backend<sc_client_db::light::LightStorage<TBl>, THash>;
-
-/// Light client type with a specific backend.
-pub type TLightClientWithBackend<TBl, TRtApi, TExec, TBackend> = Client<
-	TBackend,
-	sc_light::GenesisCallExecutor<TBackend, crate::client::LocalCallExecutor<TBl, TBackend, TExec>>,
-	TBl,
-	TRtApi,
->;
-
 trait AsCryptoStoreRef {
 	fn keystore_ref(&self) -> Arc<dyn CryptoStore>;
 	fn sync_keystore_ref(&self) -> Arc<dyn SyncCryptoStore>;
@@ -359,53 +321,6 @@ where
 	Ok((client, backend, keystore_container, task_manager))
 }
 
-/// Create the initial parts of a light node.
-pub fn new_light_parts<TBl, TRtApi, TExec>(
-	config: &Configuration,
-	telemetry: Option<TelemetryHandle>,
-	executor: TExec,
-) -> Result<TLightParts<TBl, TRtApi, TExec>, Error>
-where
-	TBl: BlockT,
-	TExec: CodeExecutor + RuntimeVersionOf + Clone,
-{
-	let keystore_container = KeystoreContainer::new(&config.keystore)?;
-	let task_manager = {
-		let registry = config.prometheus_config.as_ref().map(|cfg| &cfg.registry);
-		TaskManager::new(config.tokio_handle.clone(), registry)?
-	};
-
-	let db_storage = {
-		let db_settings = sc_client_db::DatabaseSettings {
-			state_cache_size: config.state_cache_size,
-			state_cache_child_ratio: config.state_cache_child_ratio.map(|v| (v, 100)),
-			state_pruning: config.state_pruning.clone(),
-			source: config.database.clone(),
-			keep_blocks: config.keep_blocks.clone(),
-			transaction_storage: config.transaction_storage.clone(),
-		};
-		sc_client_db::light::LightStorage::new(db_settings)?
-	};
-	let light_blockchain = sc_light::new_light_blockchain(db_storage);
-	let fetch_checker = Arc::new(sc_light::new_fetch_checker::<_, TBl, _>(
-		light_blockchain.clone(),
-		executor.clone(),
-		Box::new(task_manager.spawn_handle()),
-	));
-	let on_demand = Arc::new(sc_network::config::OnDemand::new(fetch_checker));
-	let backend = sc_light::new_light_backend(light_blockchain);
-	let client = Arc::new(light::new_light(
-		backend.clone(),
-		config.chain_spec.as_storage_builder(),
-		executor,
-		Box::new(task_manager.spawn_handle()),
-		config.prometheus_config.as_ref().map(|config| config.registry.clone()),
-		telemetry,
-	)?);
-
-	Ok((client, backend, keystore_container, task_manager, on_demand))
-}
-
 /// Create an instance of default DB-backend backend.
 pub fn new_db_backend<Block>(
 	settings: DatabaseSettings,
@@ -559,12 +474,12 @@ where
 		mut config,
 		task_manager,
 		client,
-		on_demand,
+		on_demand: _,
 		backend,
 		keystore,
 		transaction_pool,
 		rpc_extensions_builder,
-		remote_blockchain,
+		remote_blockchain: _,
 		network,
 		system_rpc_tx,
 		telemetry,
@@ -630,8 +545,6 @@ where
 			client.clone(),
 			transaction_pool.clone(),
 			keystore.clone(),
-			on_demand.clone(),
-			remote_blockchain.clone(),
 			&*rpc_extensions_builder,
 			backend.offchain_storage(),
 			system_rpc_tx.clone(),
@@ -729,8 +642,6 @@ fn gen_handler<TBl, TBackend, TExPool, TRpc, TCl>(
 	client: Arc<TCl>,
 	transaction_pool: Arc<TExPool>,
 	keystore: SyncCryptoStorePtr,
-	on_demand: Option<Arc<OnDemand<TBl>>>,
-	remote_blockchain: Option<Arc<dyn RemoteBlockchain<TBl>>>,
 	rpc_extensions_builder: &(dyn RpcExtensionBuilder<Output = TRpc> + Send),
 	offchain_storage: Option<<TBackend as sc_client_api::backend::Backend<TBl>>::OffchainStorage>,
 	system_rpc_tx: TracingUnboundedSender<sc_rpc::system::Request<TBl>>,
@@ -769,34 +680,17 @@ where
 	let task_executor = sc_rpc::SubscriptionTaskExecutor::new(spawn_handle);
 	let subscriptions = SubscriptionManager::new(Arc::new(task_executor.clone()));
 
-	let (chain, state, child_state) =
-		if let (Some(remote_blockchain), Some(on_demand)) = (remote_blockchain, on_demand) {
-			// Light clients
-			let chain = sc_rpc::chain::new_light(
-				client.clone(),
-				subscriptions.clone(),
-				remote_blockchain.clone(),
-				on_demand.clone(),
-			);
-			let (state, child_state) = sc_rpc::state::new_light(
-				client.clone(),
-				subscriptions.clone(),
-				remote_blockchain.clone(),
-				on_demand,
-				deny_unsafe,
-			);
-			(chain, state, child_state)
-		} else {
-			// Full nodes
-			let chain = sc_rpc::chain::new_full(client.clone(), subscriptions.clone());
-			let (state, child_state) = sc_rpc::state::new_full(
-				client.clone(),
-				subscriptions.clone(),
-				deny_unsafe,
-				config.rpc_max_payload,
-			);
-			(chain, state, child_state)
-		};
+	let (chain, state, child_state) = {
+		// Full nodes
+		let chain = sc_rpc::chain::new_full(client.clone(), subscriptions.clone());
+		let (state, child_state) = sc_rpc::state::new_full(
+			client.clone(),
+			subscriptions.clone(),
+			deny_unsafe,
+			config.rpc_max_payload,
+		);
+		(chain, state, child_state)
+	};
 
 	let author =
 		sc_rpc::author::Author::new(client, transaction_pool, subscriptions, keystore, deny_unsafe);

substrate/client/service/src/client/client.rs

@@ -42,6 +42,7 @@ use sc_client_api::{
 		ProvideUncles,
 	},
 	execution_extensions::ExecutionExtensions,
+	light::ChangesProof,
 	notifications::{StorageEventStream, StorageNotifications},
 	CallExecutor, ExecutorProvider, KeyIterator, ProofProvider, UsageProvider,
 };
@@ -49,7 +50,6 @@ use sc_consensus::{
 	BlockCheckParams, BlockImportParams, ForkChoiceStrategy, ImportResult, StateAction,
 };
 use sc_executor::RuntimeVersion;
-use sc_light::fetcher::ChangesProof;
 use sc_telemetry::{telemetry, TelemetryHandle, SUBSTRATE_INFO};
 use sp_api::{
 	ApiExt, ApiRef, CallApiAt, CallApiAtParams, ConstructRuntimeApi, Core as CoreApi,

substrate/client/service/src/client/light.rs

@@ -1,82 +0,0 @@
-// This file is part of Substrate.
-
-// Copyright (C) 2017-2021 Parity Technologies (UK) Ltd.
-// SPDX-License-Identifier: GPL-3.0-or-later WITH Classpath-exception-2.0
-
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-
-// You should have received a copy of the GNU General Public License
-// along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-//! Light client utilities.
-
-use std::sync::Arc;
-
-use prometheus_endpoint::Registry;
-use sc_executor::RuntimeVersionOf;
-use sc_telemetry::TelemetryHandle;
-use sp_blockchain::Result as ClientResult;
-use sp_core::traits::{CodeExecutor, SpawnNamed};
-use sp_runtime::{
-	traits::{Block as BlockT, HashFor},
-	BuildStorage,
-};
-
-use super::{
-	call_executor::LocalCallExecutor,
-	client::{Client, ClientConfig},
-};
-use sc_client_api::light::Storage as BlockchainStorage;
-use sc_light::{Backend, GenesisCallExecutor};
-
-/// Create an instance of light client.
-pub fn new_light<B, S, RA, E>(
-	backend: Arc<Backend<S, HashFor<B>>>,
-	genesis_storage: &dyn BuildStorage,
-	code_executor: E,
-	spawn_handle: Box<dyn SpawnNamed>,
-	prometheus_registry: Option<Registry>,
-	telemetry: Option<TelemetryHandle>,
-) -> ClientResult<
-	Client<
-		Backend<S, HashFor<B>>,
-		GenesisCallExecutor<
-			Backend<S, HashFor<B>>,
-			LocalCallExecutor<B, Backend<S, HashFor<B>>, E>,
-		>,
-		B,
-		RA,
-	>,
->
-where
-	B: BlockT,
-	S: BlockchainStorage<B> + 'static,
-	E: CodeExecutor + RuntimeVersionOf + Clone + 'static,
-{
-	let local_executor = LocalCallExecutor::new(
-		backend.clone(),
-		code_executor,
-		spawn_handle.clone(),
-		ClientConfig::default(),
-	)?;
-	let executor = GenesisCallExecutor::new(backend.clone(), local_executor);
-	Client::new(
-		backend,
-		executor,
-		genesis_storage,
-		Default::default(),
-		Default::default(),
-		Default::default(),
-		prometheus_registry,
-		telemetry,
-		ClientConfig::default(),
-	)
-}

substrate/client/service/src/client/mod.rs

@@ -49,7 +49,6 @@ mod block_rules;
 mod call_executor;
 mod client;
 pub mod genesis;
-pub mod light;
 mod wasm_override;
 mod wasm_substitutes;
 

substrate/client/service/src/lib.rs

@@ -49,10 +49,9 @@ use sp_runtime::{
 pub use self::{
 	builder::{
 		build_network, build_offchain_workers, new_client, new_db_backend, new_full_client,
-		new_full_parts, new_light_parts, spawn_tasks, BuildNetworkParams, KeystoreContainer,
-		NetworkStarter, NoopRpcExtensionBuilder, RpcExtensionBuilder, SpawnTasksParams,
-		TFullBackend, TFullCallExecutor, TFullClient, TLightBackend, TLightBackendWithHash,
-		TLightCallExecutor, TLightClient, TLightClientWithBackend,
+		new_full_parts, spawn_tasks, BuildNetworkParams, KeystoreContainer, NetworkStarter,
+		NoopRpcExtensionBuilder, RpcExtensionBuilder, SpawnTasksParams, TFullBackend,
+		TFullCallExecutor, TFullClient,
 	},
 	client::{ClientConfig, LocalCallExecutor},
 	error::Error,