Merge pull request #460 from Cerebellum-Network/addressing-deprecatin…

…g-traits Addressing deprecated traits
Cerebellum-Network · Nov 13, 2024 · 2fa67af · 2fa67af
2 parents 6e71c2f + 8026fac
commit 2fa67af
Show file tree

Hide file tree

Showing 39 changed files with 620 additions and 566 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - [C] Changes is `Cere` Runtime
 - [D] Changes is `Cere Dev` Runtime
 
+## [6.6.1]
+- [C,D] Remove the Deprecated traits.
+
 ## [6.6.0]
 - [C,D] Update Substrate from `stable2407` to `stable2409`.
 

diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,5 +1,5 @@
 [workspace.package]
-version = "6.6.0"
+version = "6.6.1"
 authors = ["Cerebellum-Network"]
 edition = "2021"
 homepage = "https://cere.network/"

diff --git a/node/cli/src/command.rs b/node/cli/src/command.rs
@@ -144,8 +144,7 @@ pub fn run() -> sc_cli::Result<()> {
 					#[cfg(feature = "cere-dev-native")]
 					if chain_spec.is_cere_dev() {
 						return runner.sync_run(|config| {
-							#[allow(deprecated)]
-							cmd.run::<sp_runtime::traits::HashingFor<cere_service::cere_dev_runtime::Block>, ()>(config)
+							cmd.run_with_spec::<sp_runtime::traits::HashingFor<cere_service::cere_dev_runtime::Block>, ()>(Some(config.chain_spec))
 						});
 					}
 

diff --git a/node/client/Cargo.toml b/node/client/Cargo.toml
@@ -30,6 +30,7 @@ sp-consensus = { workspace = true, default-features = true }
 sp-consensus-babe = { workspace = true, default-features = true }
 sp-consensus-grandpa = { workspace = true, default-features = true }
 sp-inherents = { workspace = true, default-features = true }
+sp-io = { workspace = true, default-features = true }
 sp-offchain = { workspace = true, default-features = true }
 sp-runtime = { workspace = true, default-features = true }
 sp-session = { workspace = true, default-features = true }
@@ -45,3 +46,4 @@ cere-runtime = { workspace = true, optional = true }
 default = ["cere"]
 cere = ["cere-runtime"]
 cere-dev = ["cere-dev-runtime"]
+runtime-benchmarks = []
diff --git a/node/client/src/lib.rs b/node/client/src/lib.rs
@@ -6,8 +6,7 @@ use sc_client_api::{
 	AuxStore, Backend as BackendT, BlockchainEvents, KeysIter, MerkleValue, PairsIter,
 	UsageProvider,
 };
-#[allow(deprecated)]
-pub use sc_executor::NativeElseWasmExecutor;
+use sc_executor::WasmExecutor;
 use sp_api::{CallApiAt, ProvideRuntimeApi};
 use sp_blockchain::{HeaderBackend, HeaderMetadata};
 use sp_consensus::BlockStatus;
@@ -19,46 +18,19 @@ use sp_runtime::{
 use sp_storage::{ChildInfo, StorageData, StorageKey};
 
 pub type FullBackend = sc_service::TFullBackend<Block>;
-#[allow(deprecated)]
-pub type FullClient<RuntimeApi, ExecutorDispatch> =
-	sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
 
-#[cfg(not(any(feature = "cere", feature = "cere-dev",)))]
-compile_error!("at least one runtime feature must be enabled");
-
-/// The native executor instance for Cere.
-#[cfg(feature = "cere")]
-pub struct CereExecutorDispatch;
-
-#[cfg(feature = "cere")]
-impl sc_executor::NativeExecutionDispatch for CereExecutorDispatch {
-	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
+#[cfg(not(feature = "runtime-benchmarks"))]
+pub type HostFunctions = sp_io::SubstrateHostFunctions;
 
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		cere_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		cere_runtime::native_version()
-	}
-}
+#[cfg(feature = "runtime-benchmarks")]
+pub type HostFunctions =
+	(sp_io::SubstrateHostFunctions, frame_benchmarking::benchmarking::HostFunctions);
 
-/// The native executor instance for Cere Dev.
-#[cfg(feature = "cere-dev")]
-pub struct CereDevExecutorDispatch;
+pub type ChainExecutor = WasmExecutor<HostFunctions>;
+pub type FullClient<RuntimeApi> = sc_service::TFullClient<Block, RuntimeApi, ChainExecutor>;
 
-#[cfg(feature = "cere-dev")]
-impl sc_executor::NativeExecutionDispatch for CereDevExecutorDispatch {
-	type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		cere_dev_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		cere_dev_runtime::native_version()
-	}
-}
+#[cfg(not(any(feature = "cere", feature = "cere-dev",)))]
+compile_error!("at least one runtime feature must be enabled");
 
 pub trait AbstractClient<Block, Backend>:
 	BlockchainEvents<Block>
@@ -102,9 +74,9 @@ where
 #[derive(Clone)]
 pub enum Client {
 	#[cfg(feature = "cere")]
-	Cere(Arc<FullClient<cere_runtime::RuntimeApi, CereExecutorDispatch>>),
+	Cere(Arc<FullClient<cere_runtime::RuntimeApi>>),
 	#[cfg(feature = "cere-dev")]
-	CereDev(Arc<FullClient<cere_dev_runtime::RuntimeApi, CereDevExecutorDispatch>>),
+	CereDev(Arc<FullClient<cere_dev_runtime::RuntimeApi>>),
 }
 
 macro_rules! with_client {