client: use appropriate ExecutionContext for initial sync / regular import (#6180)

* client: use appropriate ExecutionContext for sync/import

* client: remove dead code

* client: ExecutionContext: distinguish between own and foreign imports

* client: fix cli parameter doc

* Revert "client: ExecutionContext: distinguish between own and foreign imports"

This reverts commit 0fac11520704c364a82432c5b927e987ba043cdb.

* primitives: add docs for ExecutionContext

* cli: execution strategy docs

* cli: use different execution context for importing block on validator

* cli: remove defaults from execution context flags
This commit is contained in:
André Silva
2020-06-12 13:22:21 +01:00
committed by GitHub
parent 50604fb445
commit 2b59d57c4c
6 changed files with 58 additions and 39 deletions
+10 -4
View File
@@ -246,9 +246,14 @@ pub trait CliConfiguration: Sized {
///
/// By default this is retrieved from `ImportParams` if it is available. Otherwise its
/// `ExecutionStrategies::default()`.
fn execution_strategies(&self, is_dev: bool) -> Result<ExecutionStrategies> {
Ok(self.import_params()
.map(|x| x.execution_strategies(is_dev))
fn execution_strategies(
&self,
is_dev: bool,
is_validator: bool,
) -> Result<ExecutionStrategies> {
Ok(self
.import_params()
.map(|x| x.execution_strategies(is_dev, is_validator))
.unwrap_or(Default::default()))
}
@@ -417,6 +422,7 @@ pub trait CliConfiguration: Sized {
let node_key = self.node_key(&net_config_dir)?;
let role = self.role(is_dev)?;
let max_runtime_instances = self.max_runtime_instances()?.unwrap_or(8);
let is_validator = role.is_network_authority();
let unsafe_pruning = self
.import_params()
@@ -442,7 +448,7 @@ pub trait CliConfiguration: Sized {
state_cache_child_ratio: self.state_cache_child_ratio()?,
pruning: self.pruning(unsafe_pruning, &role)?,
wasm_method: self.wasm_method()?,
execution_strategies: self.execution_strategies(is_dev)?,
execution_strategies: self.execution_strategies(is_dev, is_validator)?,
rpc_http: self.rpc_http()?,
rpc_ws: self.rpc_ws()?,
rpc_methods: self.rpc_methods()?,