Simplify code

paritytech · Dec 2, 2022 · Nov 22, 2022 · Nov 22, 2022 · Nov 22, 2022 · Nov 22, 2022
commit c49f64b068578f0f069b95d6696d4e5fc7289389
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/node/client/Cargo.toml b/node/client/Cargo.toml
@@ -5,6 +5,7 @@ authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 
 [dependencies]
+async-trait = "0.1.57"
 futures = "0.3.21"
 frame-benchmarking = { git = "https://github.com/paritytech/substrate", branch = "master" }
 frame-benchmarking-cli = { git = "https://github.com/paritytech/substrate", branch = "master" }

diff --git a/node/client/src/benchmarking.rs b/node/client/src/benchmarking.rs
@@ -368,11 +368,27 @@ pub fn benchmark_inherent_data(
 		parent_header: header,
 	};
 
+	struct BenchmarkProvider(polkadot_primitives::v2::InherentData);
+	#[async_trait::async_trait]
+	impl sp_inherents::InherentDataProvider for BenchmarkProvider {
+		async fn provide_inherent_data(
+			&self,
+			dst_inherent_data: &mut sp_inherents::InherentData,
+		) -> Result<(), sp_inherents::Error> {
+			dst_inherent_data.put_data(*b"BENCH_PR", &self.0)
+		}
+
+		async fn try_handle_error(
+			&self,
+			_identifier: &sp_inherents::InherentIdentifier,
+			_error: &[u8],
+		) -> Option<Result<(), sp_inherents::Error>> {
+			None
+		}
+	}
+
 	futures::executor::block_on(
-		polkadot_node_core_parachains_inherent::ParachainsInherentDataProvider::from_data(
-			para_data,
-		)
-		.provide_inherent_data(&mut inherent_data),
+		BenchmarkProvider(para_data).provide_inherent_data(&mut inherent_data),
 	)?;
 
 	Ok(inherent_data)

diff --git a/node/core/parachains-inherent/src/lib.rs b/node/core/parachains-inherent/src/lib.rs
@@ -29,7 +29,6 @@ use polkadot_node_subsystem::{
 	errors::SubsystemError, messages::ProvisionerMessage, overseer::Handle,
 };
 use polkadot_primitives::v2::{Block, Hash, InherentData as ParachainsInherentData};
-use sp_blockchain::HeaderBackend;
 use sp_runtime::generic::BlockId;
 use std::{sync::Arc, time};
 
@@ -39,22 +38,24 @@ pub(crate) const LOG_TARGET: &str = "parachain::parachains-inherent";
 const PROVISIONER_TIMEOUT: time::Duration = core::time::Duration::from_millis(2500);
 
 /// Provides the parachains inherent data.
-pub struct ParachainsInherentDataProvider {
-	inherent_data: ParachainsInherentData,
+pub struct ParachainsInherentDataProvider<C: sp_blockchain::HeaderBackend<Block>> {
+	pub client: Arc<C>,
+	pub overseer: polkadot_overseer::Handle,
+	pub parent: Hash,
 }
 
-impl ParachainsInherentDataProvider {
-	/// Create a [`Self`] directly from some [`ParachainsInherentData`].
-	pub fn from_data(inherent_data: ParachainsInherentData) -> Self {
-		Self { inherent_data }
+impl<C: sp_blockchain::HeaderBackend<Block>> ParachainsInherentDataProvider<C> {
+	/// Create a new [`Self`].
+	pub fn new(client: Arc<C>, overseer: polkadot_overseer::Handle, parent: Hash) -> Self {
+		ParachainsInherentDataProvider { client, overseer, parent }
 	}
 
 	/// Create a new instance of the [`ParachainsInherentDataProvider`].
-	pub async fn create<C: HeaderBackend<Block>>(
+	pub async fn create(
 		client: Arc<C>,
 		mut overseer: Handle,
 		parent: Hash,
-	) -> Result<Self, Error> {
+	) -> Result<ParachainsInherentData, Error> {
 		let pid = async {
 			let (sender, receiver) = futures::channel::oneshot::channel();
 			gum::trace!(
@@ -119,64 +120,28 @@ impl ParachainsInherentDataProvider {
 			},
 		};
 
-		Ok(Self { inherent_data })
-	}
-}
-
-#[async_trait::async_trait]
-impl sp_inherents::InherentDataProvider for ParachainsInherentDataProvider {
-	async fn provide_inherent_data(
-		&self,
-		dst_inherent_data: &mut sp_inherents::InherentData,
-	) -> Result<(), sp_inherents::Error> {
-		dst_inherent_data
-			.put_data(polkadot_primitives::v2::PARACHAINS_INHERENT_IDENTIFIER, &self.inherent_data)
-	}
-
-	async fn try_handle_error(
-		&self,
-		_identifier: &sp_inherents::InherentIdentifier,
-		_error: &[u8],
-	) -> Option<Result<(), sp_inherents::Error>> {
-		// Inherent isn't checked and can not return any error
-		None
-	}
-}
-
-/// Parachains inherent-data provider
-//#[derive(Encode, Decode, Clone, PartialEq, RuntimeDebug, TypeInfo)]
-pub struct InherentDataProvider<C: sp_blockchain::HeaderBackend<Block>> {
-	pub client: Arc<C>,
-	pub overseer: polkadot_overseer::Handle,
-	pub parent: Hash,
-}
-
-impl<C: sp_blockchain::HeaderBackend<Block>> InherentDataProvider<C> {
-	pub fn new(client: Arc<C>, overseer: polkadot_overseer::Handle, parent: Hash) -> Self {
-		InherentDataProvider { client, overseer, parent }
+		Ok(inherent_data)
 	}
 }
 
 #[async_trait::async_trait]
 impl<C: sp_blockchain::HeaderBackend<Block>> sp_inherents::InherentDataProvider
-	for InherentDataProvider<C>
+	for ParachainsInherentDataProvider<C>
 {
 	async fn provide_inherent_data(
 		&self,
 		dst_inherent_data: &mut sp_inherents::InherentData,
 	) -> Result<(), sp_inherents::Error> {
-		let parachain = ParachainsInherentDataProvider::create(
+		let inherent_data = ParachainsInherentDataProvider::create(
 			self.client.clone(),
 			self.overseer.clone(),
 			self.parent,
 		)
 		.await
 		.map_err(|e| sp_inherents::Error::Application(Box::new(e)))?;
 
-		dst_inherent_data.put_data(
-			polkadot_primitives::v2::PARACHAINS_INHERENT_IDENTIFIER,
-			&parachain.inherent_data,
-		)
+		dst_inherent_data
+			.put_data(polkadot_primitives::v2::PARACHAINS_INHERENT_IDENTIFIER, &inherent_data)
 	}
 
 	async fn try_handle_error(

diff --git a/node/service/src/lib.rs b/node/service/src/lib.rs
@@ -1153,7 +1153,7 @@ where
 
 				async move {
 					let parachain =
-						polkadot_node_core_parachains_inherent::InherentDataProvider::new(
+						polkadot_node_core_parachains_inherent::ParachainsInherentDataProvider::new(
 							client_clone,
 							overseer_handle,
 							parent,