pezkuwichain/pezkuwi-subxt
1
0
Fork 0
mirror of https://github.com/pezkuwichain/pezkuwi-subxt.git synced 2026-04-27 20:57:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleanup CLI and introduce execution-all (#3098)

Browse Source 
* Cleanup CLI and introduce `execution-all`

`--execution-all` sets the execution strategies for all available
execution contexts.

* Rename parameter
This commit is contained in:
Bastian Köcher
2019-07-11 16:57:59 +02:00
committed by GitHub
parent b3dd034cce
commit f5e921281e
2 changed files with 38 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/cli/src/params.rs
+32 -16
View File
@@ -33,13 +33,12 @@ macro_rules! impl_get_log_filter {
arg_enum! {
/// How to execute blocks
#[derive(Debug, Clone)]
#[derive(Debug, Clone, Copy)]
pub enum ExecutionStrategy {
Native,
Wasm,
Both,
NativeElseWasm,
NativeWhenPossible,
}
}
@@ -50,7 +49,6 @@ impl Into<client::ExecutionStrategy> for ExecutionStrategy {
ExecutionStrategy::Wasm => client::ExecutionStrategy::AlwaysWasm,
ExecutionStrategy::Both => client::ExecutionStrategy::Both,
ExecutionStrategy::NativeElseWasm => client::ExecutionStrategy::NativeElseWasm,
ExecutionStrategy::NativeWhenPossible => client::ExecutionStrategy::NativeWhenPossible,
}
}
}
@@ -227,7 +225,7 @@ pub struct TransactionPoolParams {
pub struct ExecutionStrategies {
/// The means of execution used when calling into the runtime while syncing blocks.
#[structopt(
long = "syncing-execution",
long = "execution-syncing",
value_name = "STRATEGY",
raw(
possible_values = "&ExecutionStrategy::variants()",
@@ -235,11 +233,11 @@ pub struct ExecutionStrategies {
default_value = r#""NativeElseWasm""#
)
)]
pub syncing_execution: ExecutionStrategy,
pub execution_syncing: ExecutionStrategy,
/// The means of execution used when calling into the runtime while importing blocks.
#[structopt(
long = "importing-execution",
long = "execution-import-block",
value_name = "STRATEGY",
raw(
possible_values = "&ExecutionStrategy::variants()",
@@ -247,11 +245,11 @@ pub struct ExecutionStrategies {
default_value = r#""NativeElseWasm""#
)
)]
pub importing_execution: ExecutionStrategy,
pub execution_import_block: ExecutionStrategy,
/// The means of execution used when calling into the runtime while constructing blocks.
#[structopt(
long = "block-construction-execution",
long = "execution-block-construction",
value_name = "STRATEGY",
raw(
possible_values = "&ExecutionStrategy::variants()",
@@ -259,31 +257,49 @@ pub struct ExecutionStrategies {
default_value = r#""Wasm""#
)
)]
pub block_construction_execution: ExecutionStrategy,
pub execution_block_construction: ExecutionStrategy,
/// The means of execution used when calling into the runtime while using an off-chain worker.
#[structopt(
long = "offchain-worker-execution",
long = "execution-offchain-worker",
value_name = "STRATEGY",
raw(
possible_values = "&ExecutionStrategy::variants()",
case_insensitive = "true",
default_value = r#""NativeWhenPossible""#
default_value = r#""Native""#
)
)]
pub offchain_worker_execution: ExecutionStrategy,
pub execution_offchain_worker: ExecutionStrategy,
/// The means of execution used when calling into the runtime while not syncing, importing or constructing blocks.
#[structopt(
long = "other-execution",
long = "execution-other",
value_name = "STRATEGY",
raw(
possible_values = "&ExecutionStrategy::variants()",
case_insensitive = "true",
default_value = r#""Wasm""#
default_value = r#""Native""#
)
)]
pub other_execution: ExecutionStrategy,
pub execution_other: ExecutionStrategy,
/// The execution strategy that should be used by all execution contexts.
#[structopt(
long = "execution",
value_name = "STRATEGY",
raw(
possible_values = "&ExecutionStrategy::variants()",
case_insensitive = "true",
conflicts_with_all = "&[
\"execution_other\",
\"execution_offchain_worker\",
\"execution_block_construction\",
\"execution_import_block\",
\"execution_syncing\",
]"
)
)]
pub execution: Option<ExecutionStrategy>,
}
/// The `run` command used to run a node.
@@ -426,7 +442,7 @@ lazy_static::lazy_static! {
let conflicts_with = keyring::AuthorityKeyring::iter()
.filter(|b| a != *b)
.map(|b| b.to_string().to_lowercase())
.chain(["name", "key"].iter().map(|s| s.to_string()))
.chain(["name", "key"].iter().map(ToString::to_string))
.collect::<Vec<_>>();
let name = a.to_string().to_lowercase();