Added export-blocks

bin/node-template/node/src/command.rs

@@ -59,7 +59,7 @@ pub fn run() -> sc_cli::Result<()> {
 		Some(subcommand) => {
 			let runtime = Cli::create_runtime(&subcommand)?;
 			runtime.run_subcommand(
-				&subcommand,
+				subcommand,
 				|config: _| Ok(new_full_start!(config).0),
 			)
 		},

client/cli/src/commands/export_blocks_cmd.rs

@@ -22,13 +22,11 @@ use log::info;
 use structopt::StructOpt;
 use sc_service::{
 	Configuration, ChainSpecExtension, RuntimeGenesis, ServiceBuilderCommand, ChainSpec,
-	config::DatabaseConfig, Roles,
+	config::DatabaseConfig, Roles, PruningMode,
 };
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
 use crate::error;
-use crate::VersionInfo;
-use crate::runtime::run_until_exit;
 use crate::params::{SharedParams, BlockNumber, PruningParams};
 
 /// The `export-blocks` command used to export blocks.
@@ -65,7 +63,7 @@ pub struct ExportBlocksCmd {
 
 impl ExportBlocksCmd {
 	/// Run the export-blocks command
-	pub fn run<G, E, B, BC, BB>(
+	pub async fn run<G, E, B, BC, BB>(
 		self,
 		config: Configuration<G, E>,
 		builder: B,
@@ -82,6 +80,7 @@ impl ExportBlocksCmd {
 		if let DatabaseConfig::Path { ref path, .. } = &config.database {
 			info!("DB path: {}", path.display());
 		}
+
 		let from = self.from.as_ref().and_then(|f| f.parse().ok()).unwrap_or(1);
 		let to = self.to.as_ref().and_then(|t| t.parse().ok());
 
@@ -92,26 +91,6 @@ impl ExportBlocksCmd {
 			None => Box::new(io::stdout()),
 		};
 
-		run_until_exit(config, |config| {
-			Ok(builder(config)?.export_blocks(file, from.into(), to, json))
-		})
-	}
-
-	/// Update and prepare a `Configuration` with command line parameters
-	pub fn update_config<G, E, F>(
-		&self,
-		mut config: &mut Configuration<G, E>,
-		spec_factory: F,
-		version: &VersionInfo,
-	) -> error::Result<()> where
-		G: RuntimeGenesis,
-		E: ChainSpecExtension,
-		F: FnOnce(&str) -> Result<Option<ChainSpec<G, E>>, String>,
-	{
-		self.shared_params.update_config(&mut config, spec_factory, version)?;
-		self.pruning_params.update_config(&mut config, Roles::FULL, true)?;
-		config.use_in_memory_keystore()?;
-
-		Ok(())
+		builder(config)?.export_blocks(file, from.into(), to, json).await.map_err(|e| e.into())
 	}
 }

client/cli/src/commands/mod.rs

@@ -15,7 +15,7 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 mod runcmd;
-//mod export_blocks_cmd;
+mod export_blocks_cmd;
 mod build_spec_cmd;
 //mod import_blocks_cmd;
 //mod check_block_cmd;
@@ -32,7 +32,8 @@ use std::sync::Arc;
 use app_dirs::{AppInfo, AppDataType};
 use sc_service::{
 	Configuration, ChainSpecExtension, RuntimeGenesis, ServiceBuilderCommand, ChainSpec,
-	config::KeystoreConfig, config::DatabaseConfig, config::NetworkConfiguration,
+	config::KeystoreConfig, config::DatabaseConfig, config::NetworkConfiguration, Roles,
+	PruningMode,
 };
 use sp_runtime::traits::{Block as BlockT, Header as HeaderT};
 
@@ -43,8 +44,8 @@ use crate::params::SharedParams;
 
 pub use crate::commands::runcmd::RunCmd;
 pub use crate::commands::build_spec_cmd::BuildSpecCmd;
-/*
 pub use crate::commands::export_blocks_cmd::ExportBlocksCmd;
+/*
 pub use crate::commands::import_blocks_cmd::ImportBlocksCmd;
 pub use crate::commands::check_block_cmd::CheckBlockCmd;
 pub use crate::commands::revert_cmd::RevertCmd;
@@ -64,10 +65,10 @@ pub enum Subcommand {
 	/// Build a spec.json file, outputing to stdout.
 	BuildSpec(BuildSpecCmd),
 
-	/*
 	/// Export blocks to a file.
 	ExportBlocks(ExportBlocksCmd),
 
+	/*
 	/// Import blocks from file.
 	ImportBlocks(ImportBlocksCmd),
 
@@ -89,8 +90,8 @@ impl Subcommand {
 
 		match self {
 			BuildSpec(params) => &params.shared_params,
-			/*
 			ExportBlocks(params) => &params.shared_params,
+			/*
 			ImportBlocks(params) => &params.shared_params,
 			CheckBlock(params) => &params.shared_params,
 			Revert(params) => &params.shared_params,
@@ -99,33 +100,6 @@ impl Subcommand {
 		}
 	}
 
-	/// Run any `CoreParams` command
-	pub fn run<G, E, B, BC, BB>(
-		&self,
-		config: Configuration<G, E>,
-		builder: B,
-	) -> error::Result<()>
-	where
-		B: FnOnce(Configuration<G, E>) -> Result<BC, sc_service::error::Error>,
-		G: RuntimeGenesis,
-		E: ChainSpecExtension,
-		BC: ServiceBuilderCommand<Block = BB> + Unpin,
-		BB: sp_runtime::traits::Block + Debug,
-		<<<BB as BlockT>::Header as HeaderT>::Number as std::str::FromStr>::Err: std::fmt::Debug,
-		<BB as BlockT>::Hash: std::str::FromStr,
-	{
-		match self {
-			Subcommand::BuildSpec(cmd) => cmd.run(config),
-			/*
-			Subcommand::ExportBlocks(cmd) => cmd.run(config, builder),
-			Subcommand::ImportBlocks(cmd) => cmd.run(config, builder),
-			Subcommand::CheckBlock(cmd) => cmd.run(config, builder),
-			Subcommand::PurgeChain(cmd) => cmd.run(config),
-			Subcommand::Revert(cmd) => cmd.run(config, builder),
-			*/
-		}
-	}
-
 	/// Initialize substrate. This must be done only once.
 	///
 	/// This method:
@@ -164,4 +138,11 @@ impl CliConfiguration for Subcommand
 		G: RuntimeGenesis,
 		E: ChainSpecExtension,
 	{ self.get_shared_params().init::<C, G, E>() }
+
+	fn get_pruning(&self, is_dev: bool) -> error::Result<PruningMode> {
+		match self {
+			Subcommand::BuildSpec(_) => Ok(Default::default()),
+			Subcommand::ExportBlocks(cmd) => cmd.pruning_params.get_pruning(Roles::FULL, is_dev),
+		}
+	}
 }

client/cli/src/commands/runcmd.rs

@@ -20,10 +20,7 @@ use crate::params::KeystoreParams;
 use crate::params::NetworkConfigurationParams;
 use crate::params::SharedParams;
 use crate::params::TransactionPoolParams;
-use crate::runtime::run_service_until_exit;
 use crate::{CliConfiguration, SubstrateCLI};
-use chrono::prelude::*;
-use log::info;
 use regex::Regex;
 use sc_client_api::execution_extensions::ExecutionStrategies;
 use sc_service::{
@@ -272,33 +269,6 @@ impl RunCmd {
 			None
 		}
 	}
-
-	/// Run the command that runs the node
-	pub fn run<C: SubstrateCLI<G, E>, G, E, FNL, FNF, SL, SF>(
-		config: Configuration<G, E>,
-		new_light: FNL,
-		new_full: FNF,
-	) -> error::Result<()>
-	where
-		G: RuntimeGenesis,
-		E: ChainSpecExtension,
-		FNL: FnOnce(Configuration<G, E>) -> Result<SL, sc_service::error::Error>,
-		FNF: FnOnce(Configuration<G, E>) -> Result<SF, sc_service::error::Error>,
-		SL: AbstractService + Unpin,
-		SF: AbstractService + Unpin,
-	{
-		info!("{}", C::get_impl_name());
-		info!("  version {}", C::get_impl_version());
-		//info!("  by {}, {}-{}", version.author, version.copyright_start_year, Local::today().year());
-		info!("Chain specification: {}", config.chain_spec.name());
-		info!("Node name: {}", config.name);
-		info!("Roles: {}", config.display_role());
-
-		match config.roles {
-			Roles::LIGHT => run_service_until_exit(config, new_light),
-			_ => run_service_until_exit(config, new_full),
-		}
-	}
 }
 
 impl CliConfiguration for RunCmd {

client/cli/src/config.rs

@@ -67,7 +67,7 @@ pub trait CliConfiguration: Sized {
 	fn get_state_cache_child_ratio(&self) -> Option<usize> {
 		Default::default()
 	}
-	fn get_pruning(&self, is_dev: bool) -> Result<PruningMode> {
+	fn get_pruning(&self, _is_dev: bool) -> Result<PruningMode> {
 		Ok(Default::default())
 	}
 	fn get_chain_spec<C: SubstrateCLI<G, E>, G, E>(&self) -> Result<ChainSpec<G, E>>