Fix purge-chain and print DB info on startup (#5840)

* purge-chain accepts --db option

* print DB info on startup

* Small refactoring

* Added back &self

* Add DatabaseParams for PurgeChain, ImportParams and ExportBlocks

* Don't force default value

* Remove unused fields

* Update client/cli/src/commands/export_blocks_cmd.rs

* Fix stuff

Co-authored-by: Cecile Tonglet <cecile@parity.io>
Co-authored-by: Bastian Köcher <bkchr@users.noreply.github.com>

substrate/client/cli/src/params/database_params.rs

@@ -0,0 +1,47 @@
+// Copyright 2018-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::arg_enums::Database;
+use structopt::StructOpt;
+
+/// Parameters for block import.
+#[derive(Debug, StructOpt, Clone)]
+pub struct DatabaseParams {
+	/// Select database backend to use.
+	#[structopt(
+		long,
+		alias = "db",
+		value_name = "DB",
+		case_insensitive = true,
+	)]
+	pub database: Option<Database>,
+
+	/// Limit the memory the database cache can use.
+	#[structopt(long = "db-cache", value_name = "MiB")]
+	pub database_cache_size: Option<usize>,
+}
+
+impl DatabaseParams {
+	/// Limit the memory the database cache can use.
+	pub fn database(&self) -> Option<Database> {
+		self.database
+	}
+
+	/// Limit the memory the database cache can use.
+	pub fn database_cache_size(&self) -> Option<usize> {
+		self.database_cache_size
+	}
+}

substrate/client/cli/src/params/import_params.rs

@@ -15,14 +15,13 @@
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::arg_enums::{
-	ExecutionStrategy, TracingReceiver, WasmExecutionMethod, DEFAULT_EXECUTION_BLOCK_CONSTRUCTION,
-	DEFAULT_EXECUTION_IMPORT_BLOCK, DEFAULT_EXECUTION_OFFCHAIN_WORKER, DEFAULT_EXECUTION_OTHER,
-	DEFAULT_EXECUTION_SYNCING, Database,
+	ExecutionStrategy, TracingReceiver, WasmExecutionMethod,
+	DEFAULT_EXECUTION_BLOCK_CONSTRUCTION, DEFAULT_EXECUTION_IMPORT_BLOCK,
+	DEFAULT_EXECUTION_OFFCHAIN_WORKER, DEFAULT_EXECUTION_OTHER, DEFAULT_EXECUTION_SYNCING,
 };
+use crate::params::DatabaseParams;
 use crate::params::PruningParams;
-use crate::Result;
 use sc_client_api::execution_extensions::ExecutionStrategies;
-use sc_service::{PruningMode, Role};
 use structopt::StructOpt;
 
 /// Parameters for block import.
@@ -32,6 +31,10 @@ pub struct ImportParams {
 	#[structopt(flatten)]
 	pub pruning_params: PruningParams,
 
+	#[allow(missing_docs)]
+	#[structopt(flatten)]
+	pub database_params: DatabaseParams,
+
 	/// Force start with unsafe pruning settings.
 	///
 	/// When running as a validator it is highly recommended to disable state
@@ -54,22 +57,12 @@ pub struct ImportParams {
 	#[structopt(flatten)]
 	pub execution_strategies: ExecutionStrategiesParams,
 
-	/// Select database backend to use.
-	#[structopt(
-		long = "database",
-		alias = "db",
-		value_name = "DB",
-		case_insensitive = true,
-		default_value = "RocksDb"
-	)]
-	pub database: Database,
-
-	/// Limit the memory the database cache can use.
-	#[structopt(long = "db-cache", value_name = "MiB")]
-	pub database_cache_size: Option<usize>,
-
 	/// Specify the state cache size.
-	#[structopt(long = "state-cache-size", value_name = "Bytes", default_value = "67108864")]
+	#[structopt(
+		long = "state-cache-size",
+		value_name = "Bytes",
+		default_value = "67108864"
+	)]
 	pub state_cache_size: usize,
 
 	/// Comma separated list of targets for tracing.
@@ -132,21 +125,6 @@ impl ImportParams {
 			other: exec_all_or(exec.execution_other, DEFAULT_EXECUTION_OTHER),
 		}
 	}
-
-	/// Get the pruning mode from the parameters
-	pub fn pruning(&self, unsafe_pruning: bool, role: &Role) -> Result<PruningMode> {
-		self.pruning_params.pruning(unsafe_pruning, role)
-	}
-
-	/// Limit the memory the database cache can use.
-	pub fn database_cache_size(&self) -> Option<usize> {
-		self.database_cache_size
-	}
-
-	/// Limit the memory the database cache can use.
-	pub fn database(&self) -> Database {
-		self.database
-	}
 }
 
 /// Execution strategies parameters.

substrate/client/cli/src/params/mod.rs

@@ -14,18 +14,20 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
+mod database_params;
 mod import_params;
 mod keystore_params;
 mod network_params;
 mod node_key_params;
+mod offchain_worker_params;
 mod pruning_params;
 mod shared_params;
 mod transaction_pool_params;
-mod offchain_worker_params;
 
 use std::fmt::Debug;
 use std::str::FromStr;
 
+pub use crate::params::database_params::*;
 pub use crate::params::import_params::*;
 pub use crate::params::keystore_params::*;
 pub use crate::params::network_params::*;

substrate/client/cli/src/params/shared_params.rs

@@ -14,10 +14,8 @@
 // You should have received a copy of the GNU General Public License
 // along with Substrate.  If not, see <http://www.gnu.org/licenses/>.
 
-use sc_service::config::DatabaseConfig;
 use std::path::PathBuf;
 use structopt::StructOpt;
-use crate::arg_enums::Database;
 
 /// Shared parameters used by all `CoreParams`.
 #[derive(Debug, StructOpt, Clone)]
@@ -72,27 +70,6 @@ impl SharedParams {
 		}
 	}
 
-	/// Get the database configuration object for the parameters provided
-	pub fn database_config(
-		&self,
-		base_path: &PathBuf,
-		cache_size: usize,
-		database: Database,
-	) -> DatabaseConfig {
-		match database {
-			Database::RocksDb => DatabaseConfig::RocksDb {
-				path: base_path.join("db"),
-				cache_size,
-			},
-			Database::SubDb => DatabaseConfig::SubDb {
-				path: base_path.join("subdb"),
-			},
-			Database::ParityDb => DatabaseConfig::ParityDb {
-				path: base_path.join("paritydb"),
-			},
-		}
-	}
-
 	/// Get the filters for the logging
 	pub fn log_filters(&self) -> Option<String> {
 		self.log.clone()