pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-06-12 13:31:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

cli: fix unused unsafe-pruning flag (#5803)

Browse Source
This commit is contained in:
André Silva
2020-04-27 21:01:35 +01:00
committed by GitHub
parent dc09f76189
commit 5662501258
2 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/client/cli/src/commands/mod.rs
+2 -2
View File
@@ -235,10 +235,10 @@ macro_rules! substrate_cli_subcommands {
} }
} }
fn pruning(&self, is_dev: bool, role: &::sc_service::Role) fn pruning(&self, unsafe_pruning: bool, role: &::sc_service::Role)
-> $crate::Result<::sc_service::config::PruningMode> { -> $crate::Result<::sc_service::config::PruningMode> {
match self { match self {
$($enum::$variant(cmd) => cmd.pruning(is_dev, role)),* $($enum::$variant(cmd) => cmd.pruning(unsafe_pruning, role)),*
} }
} }
substrate/client/cli/src/config.rs
+8 -3
View File
@@ -200,9 +200,9 @@ pub trait CliConfiguration: Sized {
/// ///
/// By default this is retrieved from `PruningMode` if it is available. Otherwise its /// By default this is retrieved from `PruningMode` if it is available. Otherwise its
/// `PruningMode::default()`. /// `PruningMode::default()`.
fn pruning(&self, is_dev: bool, role: &Role) -> Result<PruningMode> { fn pruning(&self, unsafe_pruning: bool, role: &Role) -> Result<PruningMode> {
self.pruning_params() self.pruning_params()
.map(|x| x.pruning(is_dev, role)) .map(|x| x.pruning(unsafe_pruning, role))
.unwrap_or(Ok(Default::default())) .unwrap_or(Ok(Default::default()))
} }
@@ -411,6 +411,11 @@ pub trait CliConfiguration: Sized {
let role = self.role(is_dev)?; let role = self.role(is_dev)?;
let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8); let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
let unsafe_pruning = self
.import_params()
.map(|p| p.unsafe_pruning)
.unwrap_or(false);
Ok(Configuration { Ok(Configuration {
impl_name: C::impl_name(), impl_name: C::impl_name(),
impl_version: C::impl_version(), impl_version: C::impl_version(),
@@ -428,7 +433,7 @@ pub trait CliConfiguration: Sized {
database: self.database_config(&config_dir, database_cache_size, database)?, database: self.database_config(&config_dir, database_cache_size, database)?,
state_cache_size: self.state_cache_size()?, state_cache_size: self.state_cache_size()?,
state_cache_child_ratio: self.state_cache_child_ratio()?, state_cache_child_ratio: self.state_cache_child_ratio()?,
pruning: self.pruning(is_dev, &role)?, pruning: self.pruning(unsafe_pruning || is_dev, &role)?,
wasm_method: self.wasm_method()?, wasm_method: self.wasm_method()?,
execution_strategies: self.execution_strategies(is_dev)?, execution_strategies: self.execution_strategies(is_dev)?,
rpc_http: self.rpc_http()?, rpc_http: self.rpc_http()?,