CLI: refactoring: remove Options from sc_service::Configuration's fields (#5271)

* WIP Forked at: d6aa8e954c Parent branch: origin/master * Rename IntoConfiguration to CliConfiguration * Renamed into_configuration to create_configuration * WIP Forked at: d6aa8e954c Parent branch: origin/master * WIP Forked at: d6aa8e954c Parent branch: origin/master * Move keystore params to its own module * Use in-memory keystore even for build-spec * Enforce proper value for node name * dev_key_seed * Telemetry endpoints * rustfmt * Converted all RunCmd * rustfmt * Added export-blocks * Missed something * Removed config_path in NetworkConfiguration (not used) * Fixed warnings * public_addresses is used but never set, keeping it * Merge Configuration.node and NetworkConfiguration.node_name ...because they are the same thing * Added: import-blocks * Adding a proc_macro to help impl SubstrateCli * WIP Forked at: d6aa8e954c Parent branch: origin/master * WIP Forked at: d6aa8e954c Parent branch: origin/master * WIP Forked at: d6aa8e954c Parent branch: origin/master * Re-export spec_factory from sc_cli * Re-added all the commands * Refactored node_key_params * Fixed previous refucktoring * Clean-up and removed full_version() * Renamed get_is_dev to not confuse with Configuration field * Fixed sc-cli-derive example * Fixing tests * Fixing tests and removing some (will re-add later) * Fixing more tests * Removes the need of type parameter * Converting bin/node and simplifying API * Converting more * Converting last command * WIP Forked at: d6aa8e954c Parent branch: origin/master * Fixing tests and added default for WasmExecutionMethod * Fixing stuff * Fixed something I broke oops * Update Cargo.lock * Moving things around * Convert everything to Result * Added new macros to simplify the impl of CliConfiguration * Added a macro to generate CliConfiguration automatically for subcommands * Revert... too many macros (this one is not really useful) This reverts commit 9c516dd38b40fbc420b02c1f8e61d5b2b1a4e434. * Renamed is_dev to get_is_dev Good enough for now * Fixed name roles (this is plural, not singular) * Clean-up * Re-export NodeKeyConfig and TelemetryEndpoints from sc_service * Improve styling/formatting * Added copyrights * Added doc and fixed warnings * Added myself to code owners * Yes it is needed according to the history * Revert formatting * Fixing conflict * Updated build.rs * Cargo.lock * Clean-up * Update client/cli-derive/Cargo.toml Co-Authored-By: Seun Lanlege <seunlanlege@gmail.com> * Fail if using proc_macro and build.rs is not set properly * Dropped all get_ in front of methods * Clean-up * Fixing proc macro missing env var * Get the configuration inside the Runtime (needed for polkadot) * Clean-up * Get is_dev from argument like the others * Get chain ID instead of chain spec from shared params * &self is passed to spec_factory/load_spec * Wrong text * Fix example * Officialize macro and made a cool doc * Renamed spec_factory to load_spec (substrate_cli_configuration) * Removed not so useful ChainSpec * Renamed SubstrateCLI to SubstrateCli * Added changelog for impl_version being full now * Renamed Runtime to Runner * Update changelog to show example * Removed option on database cache size * WIP Forked at: d6aa8e954c Parent branch: origin/master * Fix on removal of option * typo * Clean-up imports * Added info in Cargo.toml * typo * remarks * Moved function for build.rs to substrate-build-script-utils * Fixed example & test of cli-derive * Moved function for build.rs to substrate-build-script-utils * Renamed substrate_cli_configuration to substrate_cli oops It implements SubstrateCli not CliConfiguration! * Added documentation and wrapper macro * Removed option on database cache size * Removed option on database cache size * Clean-up * Reduce risk of errors due to typos * Removed option on database cache size * Added NOTE as suggested * Added doc as suggested * Fixed test * typo * renamed runtime to runner * Fixed weird argument * More commas * Moved client/cli-derive to client/cli/derive * Added 7 tests for the macros * Improve error message * Upgrade assert_cmd * Fixing missing stuff * Fixed unused import * Improve SubstrateCli doc * Applied suggestions * Fix and clean-up imports * Started replacing macros WIP * WIP Forked at: d6aa8e954c Parent branch: origin/master * WIP Forked at: d6aa8e954c Parent branch: origin/master * WIP Forked at: d6aa8e954c Parent branch: origin/master * Started removing substrate_cli * WIP Forked at: d6aa8e954c Parent branch: origin/master * WIP Forked at: d6aa8e954c Parent branch: origin/master * WIP Forked at: d6aa8e954c Parent branch: origin/master * fixed bug introduced while refactoring * Renamed NetworkConfigurationParams to NetworkParams for consistency sake * Fixed test * Update client/cli/src/commands/runcmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/runcmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/export_blocks_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/check_block_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update bin/node/cli/src/command.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update bin/node/cli/src/command.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/export_blocks_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Revert "Update client/cli/src/commands/export_blocks_cmd.rs" This reverts commit 5906776953392c02beac6bc0bf50f8cbe1a12a01. * Revert "Update client/cli/src/commands/check_block_cmd.rs" This reverts commit f705f42b7f3d732be001141afee210fe46a1ef47. * Revert "Update client/cli/src/commands/export_blocks_cmd.rs" This reverts commit 8d57c0550164449e6eb2d3bacb04c750c714fcea. * Revert "Update client/cli/src/commands/runcmd.rs" This reverts commit 93e74cf5d2e1c0dc49cdff8608d59fc40fc59338. * Revert "Update client/cli/src/commands/runcmd.rs" This reverts commit 11d527ba345c0d79f0d3b5b071933d95474d0614. * Update client/cli/src/commands/export_blocks_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/import_blocks_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/purge_chain_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Changed ::sc_cli to $crate in the macro * fixed tests * fixed conflicts * Fixing test * Update client/cli/src/commands/purge_chain_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/params/pruning_params.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Remove comment as suggested * Apply suggestion * Update client/cli/src/commands/purge_chain_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/purge_chain_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/commands/purge_chain_cmd.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update utils/frame/benchmarking-cli/src/command.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/runner.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/runner.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/runner.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/params/pruning_params.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/params/node_key_params.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/params/network_params.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/lib.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Update client/cli/src/config.rs Co-Authored-By: Bastian Köcher <bkchr@users.noreply.github.com> * Added doc * Fixed error introduced after applying suggestion * Revert "Update client/cli/src/params/pruning_params.rs" This reverts commit 0574d06a4f1efd86e94c1214420a12e7a4be0099. * Print error * Apply suggestions from code review * Remove useless Results * Fixed CI failing on polkadot approval Co-authored-by: Seun Lanlege <seunlanlege@gmail.com> Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>
2026-06-13 07:01:05 +00:00 · 2020-04-07 11:38:07 +02:00
parent fb9bbf306d
commit 3da069e359
66 changed files with 2916 additions and 2156 deletions
@@ -17,8 +17,10 @@
 use futures01::sync::mpsc as mpsc01;
 use log::{debug, info};
 use std::sync::Arc;
+use sc_network::config::TransportConfig;
 use sc_service::{
-	AbstractService, RpcSession, Role, Configuration, config::{DatabaseConfig, KeystoreConfig},
+	AbstractService, RpcSession, Role, Configuration,
+	config::{DatabaseConfig, KeystoreConfig, NetworkConfiguration},
 	GenericChainSpec, RuntimeGenesis
 };
 use wasm_bindgen::prelude::*;
@@ -43,29 +45,57 @@ where
 	let name = chain_spec.name().to_string();

 	let transport = ExtTransport::new(ffi::websocket_transport());
-	let mut config = Configuration::default();
-	config.network.boot_nodes = chain_spec.boot_nodes().to_vec();
-	config.telemetry_endpoints = chain_spec.telemetry_endpoints().clone();
-	config.chain_spec = Some(Box::new(chain_spec));
-	config.network.transport = sc_network::config::TransportConfig::Normal {
+	let mut network = NetworkConfiguration::new(
+		format!("{} (Browser)", name),
+		"unknown",
+		Default::default(),
+		&std::env::current_dir().expect("current directory must exist"),
+	);
+	network.boot_nodes = chain_spec.boot_nodes().to_vec();
+	network.transport = TransportConfig::Normal {
 		wasm_external_transport: Some(transport.clone()),
 		allow_private_ipv4: true,
 		enable_mdns: false,
 		use_yamux_flow_control: true,
 	};
-	config.task_executor = Some(Arc::new(move |fut| {
-		wasm_bindgen_futures::spawn_local(fut)
-	}));
-	config.telemetry_external_transport = Some(transport);
-	config.role = Role::Light;
-	config.name = format!("{} (Browser)", name);
-	config.database = Some({
-		info!("Opening Indexed DB database '{}'...", name);
-		let db = kvdb_web::Database::open(name, 10)
-			.await?;
-		DatabaseConfig::Custom(Arc::new(db))
-	});
-	config.keystore = KeystoreConfig::InMemory;
+
+	let config = Configuration {
+		network,
+		telemetry_endpoints: chain_spec.telemetry_endpoints().clone(),
+		chain_spec: Box::new(chain_spec),
+		task_executor: Arc::new(move |fut| wasm_bindgen_futures::spawn_local(fut)),
+		telemetry_external_transport: Some(transport),
+		role: Role::Light,
+		database: {
+			info!("Opening Indexed DB database '{}'...", name);
+			let db = kvdb_web::Database::open(name, 10).await?;
+
+			DatabaseConfig::Custom(Arc::new(db))
+		},
+		keystore: KeystoreConfig::InMemory,
+		default_heap_pages: Default::default(),
+		dev_key_seed: Default::default(),
+		disable_grandpa: Default::default(),
+		execution_strategies: Default::default(),
+		force_authoring: Default::default(),
+		impl_name: "parity-substrate",
+		impl_version: "0.0.0",
+		offchain_worker: Default::default(),
+		prometheus_config: Default::default(),
+		pruning: Default::default(),
+		rpc_cors: Default::default(),
+		rpc_http: Default::default(),
+		rpc_ws: Default::default(),
+		rpc_ws_max_connections: Default::default(),
+		state_cache_child_ratio: Default::default(),
+		state_cache_size: Default::default(),
+		tracing_receiver: Default::default(),
+		tracing_targets: Default::default(),
+		transaction_pool: Default::default(),
+		wasm_method: Default::default(),
+		max_runtime_instances: 8,
+		announce_block: true,
+	};

 	Ok(config)
 }
@@ -9,6 +9,7 @@ repository = "https://github.com/paritytech/substrate/"
 description = "Crate with utility functions for `build.rs` scripts."

 [dependencies]
+platforms = "0.2.1"

 [package.metadata.docs.rs]
 targets = ["x86_64-unknown-linux-gnu"]
@@ -0,0 +1,123 @@
+// Copyright 2019-2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+use std::{env, fs, fs::File, io, io::Read, path::PathBuf};
+
+/// Make sure the calling `build.rs` script is rerun when `.git/HEAD` changed.
+///
+/// The file is searched from the `CARGO_MANIFEST_DIR` upwards. If the file can not be found,
+/// a warning is generated.
+pub fn rerun_if_git_head_changed() {
+	let mut manifest_dir = PathBuf::from(
+		env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is always set by cargo."),
+	);
+	let manifest_dir_copy = manifest_dir.clone();
+
+	while manifest_dir.parent().is_some() {
+		match get_git_paths(&manifest_dir) {
+			Err(err) => {
+				eprintln!("cargo:warning=Unable to read the Git repository: {}", err);
+
+				return;
+			}
+			Ok(None) => {}
+			Ok(Some(paths)) => {
+				for p in paths {
+					println!("cargo:rerun-if-changed={}", p.display());
+				}
+
+				return;
+			}
+		}
+
+		manifest_dir.pop();
+	}
+
+	println!(
+		"cargo:warning=Could not find `.git/HEAD` searching from `{}` upwards!",
+		manifest_dir_copy.display(),
+	);
+}
+
+// Code taken from https://github.com/rustyhorde/vergen/blob/8d522db8c8e16e26c0fc9ea8e6b0247cbf5cca84/src/output/envvar.rs
+fn get_git_paths(path: &PathBuf) -> Result<Option<Vec<PathBuf>>, io::Error> {
+	let git_dir_or_file = path.join(".git");
+
+	if let Ok(metadata) = fs::metadata(&git_dir_or_file) {
+		if metadata.is_dir() {
+			// Echo the HEAD path
+			let git_head_path = git_dir_or_file.join("HEAD");
+
+			// Determine where HEAD points and echo that path also.
+			let mut f = File::open(&git_head_path)?;
+			let mut git_head_contents = String::new();
+			let _ = f.read_to_string(&mut git_head_contents)?;
+			let ref_vec: Vec<&str> = git_head_contents.split(": ").collect();
+
+			if ref_vec.len() == 2 {
+				let current_head_file = ref_vec[1];
+				let git_refs_path = PathBuf::from(".git").join(current_head_file);
+
+				Ok(Some(vec![git_head_path, git_refs_path]))
+			} else {
+				Err(io::Error::new(
+					io::ErrorKind::Other,
+					"You are most likely in a detached HEAD state",
+				))
+			}
+		} else if metadata.is_file() {
+			// We are in a worktree, so find out where the actual worktrees/<name>/HEAD file is.
+			let mut git_file = File::open(&git_dir_or_file)?;
+			let mut git_contents = String::new();
+			let _ = git_file.read_to_string(&mut git_contents)?;
+			let dir_vec: Vec<&str> = git_contents.split(": ").collect();
+			let git_path = dir_vec[1].trim();
+
+			// Echo the HEAD psth
+			let git_head_path = PathBuf::from(git_path).join("HEAD");
+
+			// Find out what the full path to the .git dir is.
+			let mut actual_git_dir = PathBuf::from(git_path);
+			actual_git_dir.pop();
+			actual_git_dir.pop();
+
+			// Determine where HEAD points and echo that path also.
+			let mut f = File::open(&git_head_path)?;
+			let mut git_head_contents = String::new();
+			let _ = f.read_to_string(&mut git_head_contents)?;
+			let ref_vec: Vec<&str> = git_head_contents.split(": ").collect();
+
+			if ref_vec.len() == 2 {
+				let current_head_file = ref_vec[1];
+				let git_refs_path = actual_git_dir.join(current_head_file);
+
+				Ok(Some(vec![git_head_path, git_refs_path]))
+			} else {
+				Err(io::Error::new(
+					io::ErrorKind::Other,
+					"You are most likely in a detached HEAD state",
+				))
+			}
+		} else {
+			Err(io::Error::new(
+				io::ErrorKind::Other,
+				"Invalid .git format (Not a directory or a file)",
+			))
+		}
+	} else {
+		Ok(None)
+	}
+}
@@ -16,29 +16,8 @@

 //! Crate with utility functions for `build.rs` scripts.

-use std::{env, path::PathBuf};
+mod version;
+mod git;

-/// Make sure the calling `build.rs` script is rerun when `.git/HEAD` changed.
-///
-/// The file is searched from the `CARGO_MANIFEST_DIR` upwards. If the file can not be found,
-/// a warning is generated.
-pub fn rerun_if_git_head_changed() {
-	let mut manifest_dir = PathBuf::from(
-		env::var("CARGO_MANIFEST_DIR").expect("`CARGO_MANIFEST_DIR` is always set by cargo.")
-	);
-	let manifest_dir_copy = manifest_dir.clone();
-
-	while manifest_dir.parent().is_some() {
-		if manifest_dir.join(".git/HEAD").exists() {
-			println!("cargo:rerun-if-changed={}", manifest_dir.join(".git/HEAD").display());
-			return
-		}
-
-		manifest_dir.pop();
-	}
-
-	println!(
-		"cargo:warning=Could not find `.git/HEAD` searching from `{}` upwards!",
-		manifest_dir_copy.display(),
-	);
-}
+pub use git::*;
+pub use version::*;
@@ -0,0 +1,59 @@
+// Copyright 2019-2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+use platforms::*;
+use std::process::Command;
+
+/// Generate the `cargo:` key output
+pub fn generate_cargo_keys() {
+	let output = Command::new("git")
+		.args(&["rev-parse", "--short", "HEAD"])
+		.output();
+
+	match output {
+		Ok(o) if o.status.success() => {
+			let sha = String::from_utf8_lossy(&o.stdout).trim().to_owned();
+
+			println!("cargo:rustc-env=SUBSTRATE_CLI_IMPL_VERSION={}", get_version(sha.as_str()))
+		}
+		Ok(o) => eprintln!("cargo:warning=Git command failed with status: {}", o.status),
+		Err(err) => eprintln!("cargo:warning=Failed to execute git command: {}", err),
+	}
+}
+
+fn get_platform() -> String {
+	let env_dash = if TARGET_ENV.is_some() { "-" } else { "" };
+
+	format!(
+		"{}-{}{}{}",
+		TARGET_ARCH.as_str(),
+		TARGET_OS.as_str(),
+		env_dash,
+		TARGET_ENV.map(|x| x.as_str()).unwrap_or(""),
+	)
+}
+
+fn get_version(impl_commit: &str) -> String {
+	let commit_dash = if impl_commit.is_empty() { "" } else { "-" };
+
+	format!(
+		"{}{}{}-{}",
+		std::env::var("CARGO_PKG_VERSION").unwrap_or_default(),
+		commit_dash,
+		impl_commit,
+		get_platform(),
+	)
+}
@@ -0,0 +1,141 @@
+// Copyright 2020 Parity Technologies (UK) Ltd.
+// This file is part of Substrate.
+
+// Substrate is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+
+// Substrate is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+
+// You should have received a copy of the GNU General Public License
+// along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
+
+use crate::BenchmarkCmd;
+use codec::{Decode, Encode};
+use frame_benchmarking::{Analysis, BenchmarkBatch};
+use sc_cli::{SharedParams, CliConfiguration, ExecutionStrategy, Result};
+use sc_client::StateMachine;
+use sc_client_db::BenchmarkingState;
+use sc_executor::NativeExecutor;
+use sp_externalities::Extensions;
+use sc_service::{Configuration, NativeExecutionDispatch};
+use sp_runtime::{
+	traits::{Block as BlockT, Header as HeaderT, NumberFor},
+};
+use sp_core::{tasks, testing::KeyStore, traits::KeystoreExt};
+use std::fmt::Debug;
+
+impl BenchmarkCmd {
+	/// Runs the command and benchmarks the chain.
+	pub fn run<BB, ExecDispatch>(&self, config: Configuration) -> Result<()>
+	where
+		BB: BlockT + Debug,
+		<<<BB as BlockT>::Header as HeaderT>::Number as std::str::FromStr>::Err: std::fmt::Debug,
+		<BB as BlockT>::Hash: std::str::FromStr,
+		ExecDispatch: NativeExecutionDispatch + 'static,
+	{
+		let spec = config.chain_spec;
+		let wasm_method = self.wasm_method.into();
+		let strategy = self.execution.unwrap_or(ExecutionStrategy::Native);
+
+		let genesis_storage = spec.build_storage()?;
+		let mut changes = Default::default();
+		let cache_size = Some(self.database_cache_size as usize);
+		let state = BenchmarkingState::<BB>::new(genesis_storage, cache_size)?;
+		let executor = NativeExecutor::<ExecDispatch>::new(
+			wasm_method,
+			None, // heap pages
+			2, // The runtime instances cache size.
+		);
+
+		let mut extensions = Extensions::default();
+		extensions.register(KeystoreExt(KeyStore::new()));
+
+		let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
+			&state,
+			None,
+			&mut changes,
+			&executor,
+			"Benchmark_dispatch_benchmark",
+			&(
+				&self.pallet,
+				&self.extrinsic,
+				self.lowest_range_values.clone(),
+				self.highest_range_values.clone(),
+				self.steps.clone(),
+				self.repeat,
+			).encode(),
+			extensions,
+			&sp_state_machine::backend::BackendRuntimeCode::new(&state).runtime_code()?,
+			tasks::executor(),
+		)
+		.execute(strategy.into())
+		.map_err(|e| format!("Error executing runtime benchmark: {:?}", e))?;
+
+		let results = <std::result::Result<Vec<BenchmarkBatch>, String> as Decode>::decode(&mut &result[..])
+			.map_err(|e| format!("Failed to decode benchmark results: {:?}", e))?;
+
+		match results {
+			Ok(batches) => for batch in batches.into_iter() {
+				// Print benchmark metadata
+				println!(
+					"Pallet: {:?}, Extrinsic: {:?}, Lowest values: {:?}, Highest values: {:?}, Steps: {:?}, Repeat: {:?}",
+					String::from_utf8(batch.pallet).expect("Encoded from String; qed"),
+					String::from_utf8(batch.benchmark).expect("Encoded from String; qed"),
+					self.lowest_range_values,
+					self.highest_range_values,
+					self.steps,
+					self.repeat,
+				);
+
+				if self.raw_data {
+					// Print the table header
+					batch.results[0].0.iter().for_each(|param| print!("{:?},", param.0));
+
+					print!("extrinsic_time,storage_root_time\n");
+					// Print the values
+					batch.results.iter().for_each(|result| {
+						let parameters = &result.0;
+						parameters.iter().for_each(|param| print!("{:?},", param.1));
+						// Print extrinsic time and storage root time
+						print!("{:?},{:?}\n", result.1, result.2);
+					});
+
+					println!();
+				}
+
+				// Conduct analysis.
+				if !self.no_median_slopes {
+					if let Some(analysis) = Analysis::median_slopes(&batch.results) {
+						println!("Median Slopes Analysis\n========\n{}", analysis);
+					}
+				}
+				if !self.no_min_squares {
+					if let Some(analysis) = Analysis::min_squares_iqr(&batch.results) {
+						println!("Min Squares Analysis\n========\n{}", analysis);
+					}
+				}
+			},
+			Err(error) => eprintln!("Error: {:?}", error),
+		}
+
+		Ok(())
+	}
+}
+
+impl CliConfiguration for BenchmarkCmd {
+	fn shared_params(&self) -> &SharedParams {
+		&self.shared_params
+	}
+
+	fn chain_id(&self, _is_dev: bool) -> Result<String> {
+		Ok(match self.shared_params.chain {
+			Some(ref chain) => chain.clone(),
+			None => "dev".into(),
+		})
+	}
+}
@@ -14,21 +14,10 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.

+mod command;
+
+use sc_cli::{ExecutionStrategy, WasmExecutionMethod};
 use std::fmt::Debug;
-use sp_runtime::{traits::{Block as BlockT, Header as HeaderT, NumberFor}};
-use sc_client::StateMachine;
-use sc_cli::{ExecutionStrategy, WasmExecutionMethod, VersionInfo};
-use sc_client_db::BenchmarkingState;
-use sc_service::{Configuration, ChainSpec};
-use sc_executor::{NativeExecutor, NativeExecutionDispatch};
-use codec::{Encode, Decode};
-use frame_benchmarking::{BenchmarkBatch, Analysis};
-use sp_core::{
-	tasks,
-	traits::KeystoreExt,
-	testing::KeyStore,
-};
-use sp_externalities::Extensions;

 /// The `benchmark` command used to benchmark FRAME Pallets.
 #[derive(Debug, structopt::StructOpt, Clone)]
@@ -96,128 +85,3 @@ pub struct BenchmarkCmd {
 	#[structopt(long = "db-cache", value_name = "MiB", default_value = "128")]
 	pub database_cache_size: u32,
 }
-
-impl BenchmarkCmd {
-	/// Initialize
-	pub fn init(&self, version: &sc_cli::VersionInfo) -> sc_cli::Result<()> {
-		self.shared_params.init(version)
-	}
-
-	/// Runs the command and benchmarks the chain.
-	pub fn run<BB, ExecDispatch>(
-		self,
-		config: Configuration,
-	) -> sc_cli::Result<()>
-	where
-		BB: BlockT + Debug,
-		<<<BB as BlockT>::Header as HeaderT>::Number as std::str::FromStr>::Err: std::fmt::Debug,
-		<BB as BlockT>::Hash: std::str::FromStr,
-		ExecDispatch: NativeExecutionDispatch + 'static,
-	{
-		let spec = config.chain_spec.expect("chain_spec is always Some");
-		let wasm_method = self.wasm_method.into();
-		let strategy = self.execution.unwrap_or(ExecutionStrategy::Native);
-
-		let genesis_storage = spec.build_storage()?;
-		let mut changes = Default::default();
-		let cache_size = Some(self.database_cache_size as usize);
-		let state = BenchmarkingState::<BB>::new(genesis_storage, cache_size)?;
-		let executor = NativeExecutor::<ExecDispatch>::new(
-			wasm_method,
-			None, // heap pages
-			2, // The runtime instances cache size.
-		);
-
-		let mut extensions = Extensions::default();
-		extensions.register(KeystoreExt(KeyStore::new()));
-
-		let result = StateMachine::<_, _, NumberFor<BB>, _>::new(
-			&state,
-			None,
-			&mut changes,
-			&executor,
-			"Benchmark_dispatch_benchmark",
-			&(
-				&self.pallet,
-				&self.extrinsic,
-				self.lowest_range_values.clone(),
-				self.highest_range_values.clone(),
-				self.steps.clone(),
-				self.repeat,
-			).encode(),
-			extensions,
-			&sp_state_machine::backend::BackendRuntimeCode::new(&state).runtime_code()?,
-			tasks::executor(),
-		)
-		.execute(strategy.into())
-		.map_err(|e| format!("Error executing runtime benchmark: {:?}", e))?;
-
-		let results = <Result<Vec<BenchmarkBatch>, String> as Decode>::decode(&mut &result[..])
-			.map_err(|e| format!("Failed to decode benchmark results: {:?}", e))?;
-
-		match results {
-			Ok(batches) => for batch in batches.into_iter() {
-				// Print benchmark metadata
-				println!(
-					"Pallet: {:?}, Extrinsic: {:?}, Lowest values: {:?}, Highest values: {:?}, Steps: {:?}, Repeat: {:?}",
-					String::from_utf8(batch.pallet).expect("Encoded from String; qed"),
-					String::from_utf8(batch.benchmark).expect("Encoded from String; qed"),
-					self.lowest_range_values,
-					self.highest_range_values,
-					self.steps,
-					self.repeat,
-				);
-
-				if self.raw_data {
-					// Print the table header
-					batch.results[0].0.iter().for_each(|param| print!("{:?},", param.0));
-
-					print!("extrinsic_time,storage_root_time\n");
-					// Print the values
-					batch.results.iter().for_each(|result| {
-						let parameters = &result.0;
-						parameters.iter().for_each(|param| print!("{:?},", param.1));
-						// Print extrinsic time and storage root time
-						print!("{:?},{:?}\n", result.1, result.2);
-					});
-
-					print!("\n");
-				}
-
-				// Conduct analysis.
-				if !self.no_median_slopes {
-					if let Some(analysis) = Analysis::median_slopes(&batch.results) {
-						println!("Median Slopes Analysis\n========\n{}", analysis);
-					}
-				}
-				if !self.no_min_squares {
-					if let Some(analysis) = Analysis::min_squares_iqr(&batch.results) {
-						println!("Min Squares Analysis\n========\n{}", analysis);
-					}
-				}
-			},
-			Err(error) => eprintln!("Error: {:?}", error),
-		}
-
-		Ok(())
-	}
-
-	/// Update and prepare a `Configuration` with command line parameters
-	pub fn update_config(
-		&self,
-		mut config: &mut Configuration,
-		spec_factory: impl FnOnce(&str) -> Result<Box<dyn ChainSpec>, String>,
-		_version: &VersionInfo,
-	) -> sc_cli::Result<()>
-	{
-		// Configure chain spec.
-		let chain_key = self.shared_params.chain.clone().unwrap_or("dev".into());
-		let spec = spec_factory(&chain_key)?;
-		config.chain_spec = Some(spec);
-
-		// Make sure to configure keystore.
-		config.use_in_memory_keystore()?;
-
-		Ok(())
-	}
-}