Companion for Substrate#14474 (#7434)

* Companion for Substrate#14474

This removes the requirement to pass the native dispatch.

* Adapt

* Better

* Remove patch

* ...

* Fix

* Update Substrate

polkadot/Cargo.toml

@@ -178,7 +178,6 @@ snow = { opt-level = 3 }
 substrate-bip39 = {opt-level = 3}
 twox-hash = { opt-level = 3 }
 uint = { opt-level = 3 }
-wasmi = { opt-level = 3 }
 x25519-dalek = { opt-level = 3 }
 yamux = { opt-level = 3 }
 zeroize = { opt-level = 3 }
@@ -212,8 +211,6 @@ runtime-metrics = [ "polkadot-cli/runtime-metrics" ]
 pyroscope = ["polkadot-cli/pyroscope"]
 jemalloc-allocator = ["polkadot-node-core-pvf-prepare-worker/jemalloc-allocator", "polkadot-overseer/jemalloc-allocator"]
 
-
-
 # Configuration for building a .deb package - for use with `cargo-deb`
 [package.metadata.deb]
 name = "polkadot"

polkadot/cli/src/command.rs

@@ -603,34 +603,19 @@ pub fn run() -> Result<()> {
 					set_default_ss58_version(chain_spec);
 					ensure_dev(chain_spec).map_err(Error::Other)?;
 
-					#[cfg(feature = "kusama-native")]
+					if cfg!(feature = "runtime-benchmarks") {
-					if chain_spec.is_kusama() {
+						runner.sync_run(|config| {
-						return runner.sync_run(|config| {
+							cmd.run::<service::Block, ()>(config)
-							cmd.run::<service::kusama_runtime::Block, service::KusamaExecutorDispatch>(config)
 								.map_err(|e| Error::SubstrateCli(e))
 						})
+					} else {
+						Err(sc_cli::Error::Input(
+							"Benchmarking wasn't enabled when building the node. \
+				You can enable it with `--features runtime-benchmarks`."
+								.into(),
+						)
+						.into())
 					}
-
-					#[cfg(feature = "westend-native")]
-					if chain_spec.is_westend() {
-						return runner.sync_run(|config| {
-							cmd.run::<service::westend_runtime::Block, service::WestendExecutorDispatch>(config)
-								.map_err(|e| Error::SubstrateCli(e))
-						})
-					}
-
-					// else we assume it is polkadot.
-					#[cfg(feature = "polkadot-native")]
-					{
-						return runner.sync_run(|config| {
-							cmd.run::<service::polkadot_runtime::Block, service::PolkadotExecutorDispatch>(config)
-								.map_err(|e| Error::SubstrateCli(e))
-						})
-					}
-
-					#[cfg(not(feature = "polkadot-native"))]
-					#[allow(unreachable_code)]
-					Err(service::Error::NoRuntime.into())
 				},
 				BenchmarkCmd::Machine(cmd) => runner.sync_run(|config| {
 					cmd.run(&config, SUBSTRATE_REFERENCE_HARDWARE.clone())

polkadot/node/test/client/src/lib.rs

@@ -21,8 +21,6 @@
 mod block_builder;
 
 use polkadot_primitives::Block;
-use sc_service::client;
-use sp_core::storage::Storage;
 use sp_runtime::BuildStorage;
 
 pub use block_builder::*;