feat: add fc-storage (#1005)

* feat: add fc-storage move storage overrides of `fc-rpc` into a new crate `fc-storage` * move onchain_storage_schema function into fc-storage * remove useless trait bound * move overrides_handle function into fc-storage * ignore some explicit generic
darwinia-network · Feb 28, 2023 · b984ff1 · b984ff1
1 parent 5588121
commit b984ff1
Show file tree

Hide file tree

Showing 23 changed files with 188 additions and 185 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -18,6 +18,7 @@ members = [
 	"client/rpc-core",
 	"client/rpc",
 	"client/db",
+	"client/storage",
 	"client/mapping-sync",
 	"primitives/consensus",
 	"primitives/dynamic-fee",
@@ -121,6 +122,7 @@ fc-db = { version = "2.0.0-dev", path = "client/db" }
 fc-mapping-sync = { version = "2.0.0-dev", path = "client/mapping-sync" }
 fc-rpc = { version = "2.0.0-dev", path = "client/rpc" }
 fc-rpc-core = { version = "1.1.0-dev", path = "client/rpc-core" }
+fc-storage = { version = "1.0.0-dev", path = "client/storage" }
 # Frontier Primitive
 fp-consensus = { version = "2.0.0-dev", path = "primitives/consensus", default-features = false }
 fp-dynamic-fee = { version = "1.0.0", path = "primitives/dynamic-fee", default-features = false }

diff --git a/client/rpc/Cargo.toml b/client/rpc/Cargo.toml
@@ -46,6 +46,7 @@ sp-storage = { workspace = true }
 # Frontier
 fc-db = { workspace = true }
 fc-rpc-core = { workspace = true }
+fc-storage = { workspace = true }
 fp-ethereum = { workspace = true, features = ["std"] }
 fp-rpc = { workspace = true, features = ["std"] }
 fp-storage = { workspace = true, features = ["std"] }

diff --git a/client/rpc/src/eth/block.rs b/client/rpc/src/eth/block.rs
@@ -65,10 +65,7 @@ where
 			_ => return Ok(None),
 		};
 
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			substrate_hash,
-		);
+		let schema = fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 
 		let block = block_data_cache.current_block(schema, substrate_hash).await;
 		let statuses = block_data_cache
@@ -113,10 +110,7 @@ where
 			.expect_block_hash_from_id(&id)
 			.map_err(|_| internal_err(format!("Expect block number from id: {}", id)))?;
 
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			substrate_hash,
-		);
+		let schema = fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 
 		let block = block_data_cache.current_block(schema, substrate_hash).await;
 		let statuses = block_data_cache
@@ -152,10 +146,7 @@ where
 			Some(hash) => hash,
 			_ => return Ok(None),
 		};
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			self.client.as_ref(),
-			substrate_hash,
-		);
+		let schema = fc_storage::onchain_storage_schema(self.client.as_ref(), substrate_hash);
 		let block = self
 			.overrides
 			.schemas
@@ -189,10 +180,7 @@ where
 			.client
 			.expect_block_hash_from_id(&id)
 			.map_err(|_| internal_err(format!("Expect block number from id: {}", id)))?;
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			self.client.as_ref(),
-			substrate_hash,
-		);
+		let schema = fc_storage::onchain_storage_schema(self.client.as_ref(), substrate_hash);
 		let block = self
 			.overrides
 			.schemas

diff --git a/client/rpc/src/eth/cache/mod.rs b/client/rpc/src/eth/cache/mod.rs
@@ -42,14 +42,11 @@ use sp_runtime::{
 };
 // Frontier
 use fc_rpc_core::types::*;
+use fc_storage::{OverrideHandle, StorageOverride};
 use fp_rpc::{EthereumRuntimeRPCApi, TransactionStatus};
 use fp_storage::EthereumStorageSchema;
 
 use self::lru_cache::LRUCacheByteLimited;
-use crate::{
-	frontier_backend_client,
-	overrides::{OverrideHandle, StorageOverride},
-};
 
 type WaitList<Hash, T> = HashMap<Hash, Vec<oneshot::Sender<Option<T>>>>;
 
@@ -198,7 +195,7 @@ impl<B: BlockT> EthBlockDataCacheTask<B> {
 		handler_call: F,
 	) where
 		T: Clone + scale_codec::Encode,
-		F: FnOnce(&Box<dyn StorageOverride<B> + Send + Sync>) -> EthBlockDataCacheMessage<B>,
+		F: FnOnce(&Box<dyn StorageOverride<B>>) -> EthBlockDataCacheMessage<B>,
 		F: Send + 'static,
 	{
 		// Data is cached, we respond immediately.
@@ -318,8 +315,7 @@ where
 			FeeHistoryCacheItem,
 			Option<u64>
 		) {
-			let schema =
-				frontier_backend_client::onchain_storage_schema::<B, C, BE>(client.as_ref(), hash);
+			let schema = fc_storage::onchain_storage_schema(client.as_ref(), hash);
 			let handler = overrides
 				.schemas
 				.get(&schema)

diff --git a/client/rpc/src/eth/client.rs b/client/rpc/src/eth/client.rs
@@ -33,7 +33,7 @@ use sp_runtime::{
 use fc_rpc_core::types::*;
 use fp_rpc::EthereumRuntimeRPCApi;
 
-use crate::{eth::Eth, frontier_backend_client, internal_err};
+use crate::{eth::Eth, internal_err};
 
 impl<B, C, P, CT, BE, H: ExHashT, A: ChainApi, EGA> Eth<B, C, P, CT, BE, H, A, EGA>
 where
@@ -70,8 +70,7 @@ where
 
 	pub fn author(&self) -> Result<H160> {
 		let hash = self.client.info().best_hash;
-		let schema =
-			frontier_backend_client::onchain_storage_schema::<B, C, BE>(self.client.as_ref(), hash);
+		let schema = fc_storage::onchain_storage_schema(self.client.as_ref(), hash);
 
 		Ok(self
 			.overrides

diff --git a/client/rpc/src/eth/execute.rs b/client/rpc/src/eth/execute.rs
@@ -362,12 +362,8 @@ where
 		};
 
 		let block_gas_limit = {
-			let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-				&client,
-				substrate_hash,
-			);
+			let schema = fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 			let block = block_data_cache.current_block(schema, substrate_hash).await;
-
 			block
 				.ok_or_else(|| internal_err("block unavailable, cannot query gas limit"))?
 				.header

diff --git a/client/rpc/src/eth/fee.rs b/client/rpc/src/eth/fee.rs
@@ -135,10 +135,8 @@ where
 						self.client.expect_block_hash_from_id(&id).map_err(|_| {
 							internal_err(format!("Expect block number from id: {}", id))
 						})?;
-					let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-						self.client.as_ref(),
-						substrate_hash,
-					);
+					let schema =
+						fc_storage::onchain_storage_schema(self.client.as_ref(), substrate_hash);
 					let handler = self
 						.overrides
 						.schemas

diff --git a/client/rpc/src/eth/filter.rs b/client/rpc/src/eth/filter.rs
@@ -247,10 +247,8 @@ where
 						internal_err(format!("Expect block number from id: {}", id))
 					})?;
 
-					let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-						client.as_ref(),
-						substrate_hash,
-					);
+					let schema =
+						fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 
 					let block = block_data_cache.current_block(schema, substrate_hash).await;
 					if let Some(block) = block {
@@ -376,10 +374,7 @@ where
 				Some(hash) => hash,
 				_ => return Ok(Vec::new()),
 			};
-			let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-				client.as_ref(),
-				substrate_hash,
-			);
+			let schema = fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 
 			let block = block_data_cache.current_block(schema, substrate_hash).await;
 			let statuses = block_data_cache
@@ -460,8 +455,7 @@ where
 			.expect_block_hash_from_id(&id)
 			.map_err(|_| internal_err(format!("Expect block number from id: {}", id)))?;
 
-		let schema =
-			frontier_backend_client::onchain_storage_schema::<B, C, BE>(client, substrate_hash);
+		let schema = fc_storage::onchain_storage_schema(client, substrate_hash);
 
 		let block = block_data_cache.current_block(schema, substrate_hash).await;
 

diff --git a/client/rpc/src/eth/mod.rs b/client/rpc/src/eth/mod.rs
@@ -49,9 +49,10 @@ use sp_runtime::{
 };
 // Frontier
 use fc_rpc_core::{types::*, EthApiServer};
+use fc_storage::OverrideHandle;
 use fp_rpc::{ConvertTransactionRuntimeApi, EthereumRuntimeRPCApi, TransactionStatus};
 
-use crate::{internal_err, overrides::OverrideHandle, public_key, signer::EthSigner};
+use crate::{internal_err, public_key, signer::EthSigner};
 
 pub use self::{
 	cache::{EthBlockDataCacheTask, EthTask},

diff --git a/client/rpc/src/eth/state.rs b/client/rpc/src/eth/state.rs
@@ -96,10 +96,7 @@ where
 				.client
 				.expect_block_hash_from_id(&id)
 				.map_err(|_| internal_err(format!("Expect block number from id: {}", id)))?;
-			let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-				self.client.as_ref(),
-				substrate_hash,
-			);
+			let schema = fc_storage::onchain_storage_schema(self.client.as_ref(), substrate_hash);
 			Ok(self
 				.overrides
 				.schemas
@@ -173,10 +170,7 @@ where
 				.client
 				.expect_block_hash_from_id(&id)
 				.map_err(|_| internal_err(format!("Expect block number from id: {}", id)))?;
-			let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-				self.client.as_ref(),
-				substrate_hash,
-			);
+			let schema = fc_storage::onchain_storage_schema(self.client.as_ref(), substrate_hash);
 
 			Ok(self
 				.overrides

diff --git a/client/rpc/src/eth/transaction.rs b/client/rpc/src/eth/transaction.rs
@@ -137,10 +137,7 @@ where
 			_ => return Ok(None),
 		};
 
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			substrate_hash,
-		);
+		let schema = fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 
 		let block = block_data_cache.current_block(schema, substrate_hash).await;
 		let statuses = block_data_cache
@@ -185,10 +182,7 @@ where
 
 		let index = index.value();
 
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			substrate_hash,
-		);
+		let schema = fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 
 		let block = block_data_cache.current_block(schema, substrate_hash).await;
 		let statuses = block_data_cache
@@ -241,10 +235,7 @@ where
 			.map_err(|_| internal_err(format!("Expect block number from id: {}", id)))?;
 
 		let index = index.value();
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			substrate_hash,
-		);
+		let schema = fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 
 		let block = block_data_cache.current_block(schema, substrate_hash).await;
 		let statuses = block_data_cache
@@ -301,10 +292,7 @@ where
 			_ => return Ok(None),
 		};
 
-		let schema = frontier_backend_client::onchain_storage_schema::<B, C, BE>(
-			client.as_ref(),
-			substrate_hash,
-		);
+		let schema = fc_storage::onchain_storage_schema(client.as_ref(), substrate_hash);
 		let handler = overrides
 			.schemas
 			.get(&schema)

diff --git a/client/rpc/src/eth_pubsub.rs b/client/rpc/src/eth_pubsub.rs
@@ -44,10 +44,9 @@ use fc_rpc_core::{
 	},
 	EthPubSubApiServer,
 };
+use fc_storage::OverrideHandle;
 use fp_rpc::EthereumRuntimeRPCApi;
 
-use crate::{frontier_backend_client, overrides::OverrideHandle};
-
 #[derive(Debug)]
 pub struct EthereumSubIdProvider;
 
@@ -231,11 +230,10 @@ where
 							if notification.is_new_best {
 								let substrate_hash = notification.hash;
 
-								let schema = frontier_backend_client::onchain_storage_schema::<
-									B,
-									C,
-									BE,
-								>(client.as_ref(), notification.hash);
+								let schema = fc_storage::onchain_storage_schema(
+									client.as_ref(),
+									substrate_hash,
+								);
 								let handler = overrides
 									.schemas
 									.get(&schema)
@@ -269,11 +267,10 @@ where
 						.import_notification_stream()
 						.filter_map(move |notification| {
 							if notification.is_new_best {
-								let schema = frontier_backend_client::onchain_storage_schema::<
-									B,
-									C,
-									BE,
-								>(client.as_ref(), notification.hash);
+								let schema = fc_storage::onchain_storage_schema(
+									client.as_ref(),
+									notification.hash,
+								);
 								let handler = overrides
 									.schemas
 									.get(&schema)