remove ClientProvider for feature PolkadotClient (#1052)

collator/src/lib.rs

@@ -71,9 +71,9 @@ pub use polkadot_validation::SignedStatement;
 pub use polkadot_primitives::parachain::CollatorId;
 pub use sc_network::PeerId;
 pub use service::RuntimeApiCollection;
-use sc_service::ClientProvider;
 pub use sc_cli::SubstrateCli;
 use sp_api::{ConstructRuntimeApi, ApiExt, HashFor};
+use polkadot_service::PolkadotClient;
 
 const COLLATION_TIMEOUT: Duration = Duration::from_secs(30);
 
@@ -200,7 +200,7 @@ pub async fn collate<P>(
 	Ok(collation)
 }
 
-fn build_collator_service<SP, P, C, E, R, Extrinsic>(
+fn build_collator_service<SP, P, C, R, Extrinsic>(
 	spawner: SP,
 	handles: polkadot_service::FullNodeHandles,
 	client: Arc<C>,
@@ -209,10 +209,9 @@ fn build_collator_service<SP, P, C, E, R, Extrinsic>(
 	build_parachain_context: P,
 ) -> Result<impl Future<Output = ()> + Send + 'static, polkadot_service::Error>
 	where
-		C: ClientProvider<
+		C: PolkadotClient<
 			service::Block,
 			service::TFullBackend<service::Block>,
-			service::TFullCallExecutor<service::Block, E>,
 			R
 		> + 'static,
 		R: ConstructRuntimeApi<service::Block, C> + Sync + Send,
@@ -226,7 +225,6 @@ fn build_collator_service<SP, P, C, E, R, Extrinsic>(
 				StateBackend = <service::TFullBackend<service::Block> as service::Backend<service::Block>>::State,
 			>
 			+ Sync + Send,
-		E: sc_executor::NativeExecutionDispatch + 'static,
 		P: BuildParachainContext,
 		P::ParachainContext: Send + 'static,
 		<P::ParachainContext as ParachainContext>::ProduceCandidate: Send,

service/src/client.rs

+// Copyright 2017-2020 Parity Technologies (UK) Ltd.
+// This file is part of Polkadot.
+
+// Polkadot 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.
+
+// Polkadot 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 Polkadot.  If not, see <http://www.gnu.org/licenses/>.
+
+//! Polkadot Client meta trait
+
+use sc_client_api::BlockchainEvents;
+use sp_api::{ProvideRuntimeApi, ConstructRuntimeApi, CallApiAt};
+use sp_runtime::traits::Block as BlockT;
+use sc_client_api::Backend as BackendT;
+
+/// Polkadot client abstraction, this super trait only pulls in functionality required for
+/// polkadot internal crates like polkadot-collator.
+pub trait PolkadotClient<Block, Backend, Runtime>:
+	BlockchainEvents<Block> + Sized + Send + Sync
+	+ ProvideRuntimeApi<Block, Api = Runtime::RuntimeApi>
+	+ CallApiAt<
+		Block,
+		Error = sp_blockchain::Error,
+		StateBackend = Backend ::State
+	>
+	where
+		Block: BlockT,
+		Backend: BackendT<Block>,
+		Runtime: ConstructRuntimeApi<Block, Self>
+{}
+
+impl<Block, Backend, Runtime, Client> PolkadotClient<Block, Backend, Runtime> for Client
+	where
+		Block: BlockT,
+		Runtime: ConstructRuntimeApi<Block, Self>,
+		Backend: BackendT<Block>,
+		Client: BlockchainEvents<Block> + ProvideRuntimeApi<Block, Api = Runtime::RuntimeApi>
+			+ Sized + Send + Sync
+			+ CallApiAt<
+				Block,
+				Error = sp_blockchain::Error,
+				StateBackend = Backend ::State
+			>
+{}

service/src/lib.rs

@@ -18,6 +18,7 @@
 
 pub mod chain_spec;
 mod grandpa_support;
+mod client;
 
 use std::sync::Arc;
 use std::time::Duration;
@@ -51,6 +52,7 @@ pub use polkadot_runtime;
 pub use kusama_runtime;
 pub use westend_runtime;
 use prometheus_endpoint::Registry;
+pub use self::client::PolkadotClient;
 
 native_executor_instance!(
 	pub PolkadotExecutor,
@@ -580,10 +582,9 @@ pub fn polkadot_new_full(
 )
 	-> Result<(
 		impl AbstractService,
-		Arc<impl ClientProvider<
+		Arc<impl PolkadotClient<
 			Block,
 			TFullBackend<Block>,
-			TFullCallExecutor<Block, PolkadotExecutor>,
 			polkadot_runtime::RuntimeApi
 		>>,
 		FullNodeHandles,
@@ -614,10 +615,9 @@ pub fn kusama_new_full(
 	grandpa_pause: Option<(u32, u32)>,
 ) -> Result<(
 		impl AbstractService,
-		Arc<impl ClientProvider<
+		Arc<impl PolkadotClient<
 			Block,
 			TFullBackend<Block>,
-			TFullCallExecutor<Block, KusamaExecutor>,
 			kusama_runtime::RuntimeApi
 			>
 		>,
@@ -650,10 +650,9 @@ pub fn westend_new_full(
 )
 	-> Result<(
 		impl AbstractService,
-		Arc<impl ClientProvider<
+		Arc<impl PolkadotClient<
 			Block,
 			TFullBackend<Block>,
-			TFullCallExecutor<Block, KusamaExecutor>,
 			westend_runtime::RuntimeApi
 		>>,
 		FullNodeHandles,