Reduce a bit of code duplication

Author: nazar-pc

crates/subspace-node/src/bin/subspace-node.rs

@@ -18,9 +18,8 @@
 
 use futures::future::TryFutureExt;
 use sc_cli::{ChainSpec, SubstrateCli};
-use sc_executor::NativeExecutionDispatch;
 use sp_core::crypto::Ss58AddressFormat;
-use subspace_node::{Cli, Subcommand};
+use subspace_node::{Cli, ExecutorDispatch, Subcommand};
 use subspace_runtime::RuntimeApi;
 
 /// Subspace node error.
@@ -49,25 +48,6 @@ impl From<String> for Error {
     }
 }
 
-struct ExecutorDispatch;
-
-impl NativeExecutionDispatch for ExecutorDispatch {
-    /// Only enable the benchmarking host functions when we actually want to benchmark.
-    #[cfg(feature = "runtime-benchmarks")]
-    type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-    /// Otherwise we only use the default Substrate host functions.
-    #[cfg(not(feature = "runtime-benchmarks"))]
-    type ExtendHostFunctions = ();
-
-    fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-        subspace_runtime::api::dispatch(method, data)
-    }
-
-    fn native_version() -> sc_executor::NativeVersion {
-        subspace_runtime::native_version()
-    }
-}
-
 fn set_default_ss58_version<C: AsRef<dyn ChainSpec>>(chain_spec: C) {
     let maybe_ss58_address_format = chain_spec
         .as_ref()

crates/subspace-node/src/lib.rs

@@ -20,9 +20,29 @@ mod chain_spec;
 
 use clap::Parser;
 use sc_cli::SubstrateCli;
-use sc_executor::RuntimeVersion;
+use sc_executor::{NativeExecutionDispatch, RuntimeVersion};
 use sc_service::ChainSpec;
 
+/// Executor dispatch for subspace runtime
+pub struct ExecutorDispatch;
+
+impl NativeExecutionDispatch for ExecutorDispatch {
+    /// Only enable the benchmarking host functions when we actually want to benchmark.
+    #[cfg(feature = "runtime-benchmarks")]
+    type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
+    /// Otherwise we only use the default Substrate host functions.
+    #[cfg(not(feature = "runtime-benchmarks"))]
+    type ExtendHostFunctions = ();
+
+    fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
+        subspace_runtime::api::dispatch(method, data)
+    }
+
+    fn native_version() -> sc_executor::NativeVersion {
+        subspace_runtime::native_version()
+    }
+}
+
 /// Utilities for working with a node.
 #[derive(Debug, clap::Subcommand)]
 pub enum Subcommand {

cumulus/parachain-template/node/Cargo.toml

@@ -20,7 +20,10 @@ name = "subspace-executor"
 path = "src/main.rs"
 
 [features]
-runtime-benchmarks = ["parachain-template-runtime/runtime-benchmarks"]
+runtime-benchmarks = [
+    "parachain-template-runtime/runtime-benchmarks",
+    "subspace-node/runtime-benchmarks",
+]
 
 [dependencies]
 codec = { package = "parity-scale-codec", version = "2.3.0" }

cumulus/parachain-template/node/src/service.rs

@@ -34,20 +34,6 @@ impl NativeExecutionDispatch for TemplateRuntimeExecutor {
 	}
 }
 
-struct SubspaceExecutorDispatch;
-
-impl NativeExecutionDispatch for SubspaceExecutorDispatch {
-	type ExtendHostFunctions = ();
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		subspace_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> sc_executor::NativeVersion {
-		subspace_runtime::native_version()
-	}
-}
-
 /// Starts a `ServiceBuilder` for a full service.
 ///
 /// Use this macro if you don't actually need the full service, but just the builder in order to
@@ -231,7 +217,7 @@ where
 		let span = tracing::info_span!(sc_tracing::logging::PREFIX_LOG_SPAN, name = "Primarychain");
 		let _enter = span.enter();
 
-		subspace_service::new_full::<subspace_runtime::RuntimeApi, SubspaceExecutorDispatch>(
+		subspace_service::new_full::<subspace_runtime::RuntimeApi, subspace_node::ExecutorDispatch>(
 			polkadot_config,
 			false,
 		)