Unverified Commit 236ebda2 authored by Zeke Mostov's avatar Zeke Mostov Committed by GitHub
Browse files

Companion to #8966 (#3186)

* update rustls to be compat with jsronrpsee 0.2.0

* Stub try-cli when feat not enabled

* update Substrate

Co-authored-by: parity-processbot <>
parent 9fc3088f
Pipeline #141537 passed with stages
in 33 minutes and 19 seconds
This diff is collapsed.
...@@ -57,10 +57,14 @@ pub enum Subcommand { ...@@ -57,10 +57,14 @@ pub enum Subcommand {
)] )]
Benchmark(frame_benchmarking_cli::BenchmarkCmd), Benchmark(frame_benchmarking_cli::BenchmarkCmd),
/// Testing subcommand for runtime testing and trying. /// Try some command against runtime state.
#[cfg(feature = "try-runtime")] #[cfg(feature = "try-runtime")]
TryRuntime(try_runtime_cli::TryRuntimeCmd), TryRuntime(try_runtime_cli::TryRuntimeCmd),
/// Try some command against runtime state. Note: `try-runtime` feature must be enabled.
#[cfg(not(feature = "try-runtime"))]
TryRuntime,
/// Key management cli utilities /// Key management cli utilities
Key(sc_cli::KeySubcommand), Key(sc_cli::KeySubcommand),
} }
......
...@@ -395,7 +395,6 @@ pub fn run() -> Result<()> { ...@@ -395,7 +395,6 @@ pub fn run() -> Result<()> {
>(config).map_err(Error::SubstrateCli), task_manager)) >(config).map_err(Error::SubstrateCli), task_manager))
}) })
} }
// else we assume it is polkadot. // else we assume it is polkadot.
runner.async_run(|config| { runner.async_run(|config| {
Ok((cmd.run::< Ok((cmd.run::<
...@@ -403,7 +402,12 @@ pub fn run() -> Result<()> { ...@@ -403,7 +402,12 @@ pub fn run() -> Result<()> {
service::PolkadotExecutor, service::PolkadotExecutor,
>(config).map_err(Error::SubstrateCli), task_manager)) >(config).map_err(Error::SubstrateCli), task_manager))
}) })
} },
#[cfg(not(feature = "try-runtime"))]
Some(Subcommand::TryRuntime) => {
Err(Error::Other("TryRuntime wasn't enabled when building the node. \
You can enable it with `--features try-runtime`.".into()).into())
},
}?; }?;
Ok(()) Ok(())
} }
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment