diff --git a/substrate/core/cli/src/lib.rs b/substrate/core/cli/src/lib.rs
index 29d3d459326b1a523a012c129cc82549434f48ff..9f5c525b587b2475b534f8fe4284dcf850a06610 100644
--- a/substrate/core/cli/src/lib.rs
+++ b/substrate/core/cli/src/lib.rs
@@ -345,48 +345,6 @@ where
Ok((spec, config))
}
-fn get_db_path_for_subcommand(
- main_cmd: &clap::ArgMatches,
- sub_cmd: &clap::ArgMatches,
- version: &VersionInfo,
-) -> error::Result<PathBuf> {
- if main_cmd.is_present("chain") && sub_cmd.is_present("chain") {
- bail!(create_input_err("`--chain` option is present two times"));
- }
-
- fn check_contradicting_chain_dev_flags(
- m0: &clap::ArgMatches,
- m1: &clap::ArgMatches
- ) -> error::Result<()> {
- if m0.is_present("dev") && m1.is_present("chain") {
- bail!(create_input_err("`--dev` and `--chain` given on different levels"));
- }
-
- Ok(())
- }
-
- check_contradicting_chain_dev_flags(main_cmd, sub_cmd)?;
- check_contradicting_chain_dev_flags(sub_cmd, main_cmd)?;
-
- let spec_id = if sub_cmd.is_present("chain") || sub_cmd.is_present("dev") {
- get_chain_key(sub_cmd)
- } else {
- get_chain_key(main_cmd)
- };
-
- if main_cmd.is_present("base_path") && sub_cmd.is_present("base_path") {
- bail!(create_input_err("`--base_path` option is present two times"));
- }
-
- let base_path = if sub_cmd.is_present("base_path") {
- base_path(sub_cmd, version)
- } else {
- base_path(main_cmd, version)
- };
-
- Ok(db_path(&base_path, &spec_id))
-}
-
//
// IANA unassigned port ranges that we could use:
// 6717-6766 Unassigned
@@ -400,8 +358,7 @@ pub fn execute_default<'a, F, E>(
spec: ChainSpec<FactoryGenesis<F>>,
exit: E,
matches: &clap::ArgMatches<'a>,
- config: &FactoryFullConfiguration<F>,
- app_info: &VersionInfo,
+ config: &FactoryFullConfiguration<F>
) -> error::Result<Action<E>>
where
E: IntoExit,
@@ -413,34 +370,34 @@ where
init_logger(log_pattern);
fdlimit::raise_fd_limit();
- if let Some(matches) = matches.subcommand_matches("build-spec") {
- build_spec::<F>(matches, spec, config)?;
+ if let Some(sub_matches) = matches.subcommand_matches("build-spec") {
+ build_spec::<F>(sub_matches, spec, config)?;
return Ok(Action::ExecutedInternally);
} else if let Some(sub_matches) = matches.subcommand_matches("export-blocks") {
export_blocks::<F, _>(
- get_db_path_for_subcommand(matches, sub_matches, app_info)?,
- matches,
+ &config.database_path,
+ sub_matches,
spec,
exit.into_exit()
)?;
return Ok(Action::ExecutedInternally);
} else if let Some(sub_matches) = matches.subcommand_matches("import-blocks") {
import_blocks::<F, _>(
- get_db_path_for_subcommand(matches, sub_matches, app_info)?,
- matches,
+ &config.database_path,
+ sub_matches,
spec,
exit.into_exit()
)?;
return Ok(Action::ExecutedInternally);
} else if let Some(sub_matches) = matches.subcommand_matches("revert") {
revert_chain::<F>(
- get_db_path_for_subcommand(matches, sub_matches, app_info)?,
+ &config.database_path,
sub_matches,
spec
)?;
return Ok(Action::ExecutedInternally);
- } else if let Some(sub_matches) = matches.subcommand_matches("purge-chain") {
- purge_chain::<F>(get_db_path_for_subcommand(matches, sub_matches, app_info)?)?;
+ } else if let Some(_sub_matches) = matches.subcommand_matches("purge-chain") {
+ purge_chain::<F>(&config.database_path)?;
return Ok(Action::ExecutedInternally);
}
@@ -487,7 +444,7 @@ where
}
fn export_blocks<F, E>(
- db_path: PathBuf,
+ db_path: &str,
matches: &clap::ArgMatches,
spec: ChainSpec<FactoryGenesis<F>>,
exit: E
@@ -495,7 +452,7 @@ fn export_blocks<F, E>(
where F: ServiceFactory, E: Future<Item=(),Error=()> + Send + 'static,
{
let mut config = service::Configuration::default_with_spec(spec);
- config.database_path = db_path.to_string_lossy().into();
+ config.database_path = db_path.to_string();
info!("DB path: {}", config.database_path);
let from: u64 = match matches.value_of("from") {
Some(v) => v.parse().map_err(|_| "Invalid --from argument")?,
@@ -517,7 +474,7 @@ fn export_blocks<F, E>(
}
fn import_blocks<F, E>(
- db_path: PathBuf,
+ db_path: &str,
matches: &clap::ArgMatches,
spec: ChainSpec<FactoryGenesis<F>>,
exit: E
@@ -525,7 +482,7 @@ fn import_blocks<F, E>(
where F: ServiceFactory, E: Future<Item=(),Error=()> + Send + 'static,
{
let mut config = service::Configuration::default_with_spec(spec);
- config.database_path = db_path.to_string_lossy().into();
+ config.database_path = db_path.to_string();
if let Some(s) = matches.value_of("execution") {
config.block_execution_strategy = match s {
@@ -554,14 +511,14 @@ fn import_blocks<F, E>(
}
fn revert_chain<F>(
- db_path: PathBuf,
+ db_path: &str,
matches: &clap::ArgMatches,
spec: ChainSpec<FactoryGenesis<F>>
) -> error::Result<()>
where F: ServiceFactory,
{
let mut config = service::Configuration::default_with_spec(spec);
- config.database_path = db_path.to_string_lossy().into();
+ config.database_path = db_path.to_string();
let blocks = match matches.value_of("num") {
Some(v) => v.parse().map_err(|_| "Invalid block count specified")?,
@@ -572,7 +529,7 @@ fn revert_chain<F>(
}
fn purge_chain<F>(
- db_path: PathBuf,
+ db_path: &str,
) -> error::Result<()>
where F: ServiceFactory,
{
diff --git a/substrate/core/client/db/src/lib.rs b/substrate/core/client/db/src/lib.rs
index 944540b98b0931635c79322de01da9220673d290..0b61334b4ea4a14ead780a8f79f860eaf4d093a4 100644
--- a/substrate/core/client/db/src/lib.rs
+++ b/substrate/core/client/db/src/lib.rs
@@ -898,9 +898,11 @@ impl<Block> client::backend::Backend<Block, Blake2Hasher> for Backend<Block> whe
fn revert(&self, n: NumberFor<Block>) -> Result<NumberFor<Block>, client::error::Error> {
use client::blockchain::HeaderBackend;
+
let mut best = self.blockchain.info()?.best_number;
- // if the best is lower to n(less then 256), just use best number in case overflow
- let n = if best < n { best } else { n };
+ let finalized = self.blockchain.info()?.finalized_number;
+ let revertible = best - finalized;
+ let n = if revertible < n { revertible } else { n };
for c in 0 .. n.as_() {
if best == As::sa(0) {
diff --git a/substrate/core/service/src/chain_ops.rs b/substrate/core/service/src/chain_ops.rs
index 15a4deb42a041ebc27a85d5d7dba4e140a1670d3..75d4688669f76a497eabf6c5afbeecfc6096a0e9 100644
--- a/substrate/core/service/src/chain_ops.rs
+++ b/substrate/core/service/src/chain_ops.rs
@@ -154,7 +154,12 @@ pub fn revert_chain<F>(config: FactoryFullConfiguration<F>, blocks: FactoryBlock
let client = new_client::<F>(&config)?;
let reverted = client.revert(blocks)?;
let info = client.info()?.chain;
- info!("Reverted {} blocks. Best: #{} ({})", reverted, info.best_number, info.best_hash);
+
+ if reverted.as_() == 0 {
+ info!("There aren't any non-finalized blocks to revert.");
+ } else {
+ info!("Reverted {} blocks. Best: #{} ({})", reverted, info.best_number, info.best_hash);
+ }
Ok(())
}
diff --git a/substrate/core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm b/substrate/core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm
index f4c066d33f85ff74d16d31737fcaba5415933c19..b36607245612f8dbfeb80b20d1d03030c10fb8db 100644
Binary files a/substrate/core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm and b/substrate/core/test-runtime/wasm/target/wasm32-unknown-unknown/release/substrate_test_runtime.compact.wasm differ
diff --git a/substrate/node/cli/src/lib.rs b/substrate/node/cli/src/lib.rs
index 8581e9478055e937231c2375b857aa00996ee11d..55ab1822ea44ee2718c00aa872756aaede60b04e 100644
--- a/substrate/node/cli/src/lib.rs
+++ b/substrate/node/cli/src/lib.rs
@@ -125,7 +125,7 @@ pub fn run<I, T, E>(args: I, exit: E, version: cli::VersionInfo) -> error::Resul
load_spec, &version, "substrate-node", &matches
)?;
- match cli::execute_default::<service::Factory, _>(spec, exit, &matches, &config, &version)? {
+ match cli::execute_default::<service::Factory, _>(spec, exit, &matches, &config)? {
cli::Action::ExecutedInternally => (),
cli::Action::RunService(exit) => {
info!("{}", version.name);
diff --git a/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm b/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm
index 9a6d6eeea5554976b6bb8fc5187a02fc7f5bc788..e7964a296fd83baf11e4f3e06177d147f4d87715 100644
Binary files a/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm and b/substrate/node/runtime/wasm/target/wasm32-unknown-unknown/release/node_runtime.compact.wasm differ