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

Service various cleanups (#3238)

Browse Source 
* Remove generic from sign()

* Remove mandatory RuntimeGenesis trait req

* Remove requirement from Configuration

* Relax trait bounds of core/cli

* Move method

* The config field is no longer public

* Remove Components from bounds of functions

* Implement DerefMut for LightComponents

* Implement Executor for Full/LightComponents

* Fix bad merge

* Fix forgotten config()

* Fix build
This commit is contained in:
Pierre Krieger
2019-08-08 16:14:30 +02:00
committed by Gavin Wood
parent fe18b4055d
commit bafc7202ca
8 changed files with 133 additions and 88 deletions
Download Patch File Download Diff File Expand all files Collapse all files
substrate/core/cli/src/lib.rs
+38 -34
View File
@@ -27,6 +27,7 @@ pub mod informant;
use client::ExecutionStrategies;
use service::{
config::Configuration,
ServiceFactory, FactoryFullConfiguration, RuntimeGenesis,
FactoryGenesis, PruningMode, ChainSpec,
};
@@ -220,17 +221,17 @@ where
fdlimit::raise_fd_limit();
match cli_args {
params::CoreParams::Run(params) => run_node::<F, _, _, _, _>(
params::CoreParams::Run(params) => run_node(
params, spec_factory, exit, run_service, impl_name, version,
).map(|_| None),
params::CoreParams::BuildSpec(params) =>
build_spec::<F, _>(params, spec_factory, version).map(|_| None),
build_spec(params, spec_factory, version).map(|_| None),
params::CoreParams::ExportBlocks(params) =>
export_blocks::<F, _, _>(params, spec_factory, exit, version).map(|_| None),
params::CoreParams::ImportBlocks(params) =>
import_blocks::<F, _, _>(params, spec_factory, exit, version).map(|_| None),
params::CoreParams::PurgeChain(params) =>
purge_chain::<F, _>(params, spec_factory, version).map(|_| None),
purge_chain(params, spec_factory, version).map(|_| None),
params::CoreParams::Revert(params) =>
revert_chain::<F, _>(params, spec_factory, version).map(|_| None),
params::CoreParams::Custom(params) => Ok(Some(params)),
@@ -292,8 +293,8 @@ fn parse_ed25519_secret(hex: &String) -> error::Result<network::config::Ed25519S
}
/// Fill the given `PoolConfiguration` by looking at the cli parameters.
fn fill_transaction_pool_configuration<F: ServiceFactory>(
options: &mut FactoryFullConfiguration<F>,
fn fill_transaction_pool_configuration<C, G>(
options: &mut Configuration<C, G>,
params: TransactionPoolParams,
) -> error::Result<()> {
// ready queue
@@ -384,12 +385,13 @@ fn fill_config_keystore_password<C, G>(
Ok(())
}
fn create_run_node_config<F, S>(
fn create_run_node_config<C, G, S>(
cli: RunCmd, spec_factory: S, impl_name: &'static str, version: &VersionInfo
) -> error::Result<FactoryFullConfiguration<F>>
) -> error::Result<Configuration<C, G>>
where
F: ServiceFactory,
S: FnOnce(&str) -> Result<Option<ChainSpec<FactoryGenesis<F>>>, String>,
C: Default,
G: RuntimeGenesis,
S: FnOnce(&str) -> Result<Option<ChainSpec<G>>, String>,
{
let spec = load_spec(&cli.shared_params, spec_factory)?;
let mut config = service::Configuration::default_with_spec(spec.clone());
@@ -471,7 +473,7 @@ where
is_dev,
)?;
fill_transaction_pool_configuration::<F>(&mut config, cli.pool_config)?;
fill_transaction_pool_configuration(&mut config, cli.pool_config)?;
config.dev_key_seed = cli.keyring.account
.map(|a| format!("//{}", a)).or_else(|| {
@@ -516,7 +518,7 @@ where
Ok(config)
}
fn run_node<F, S, RS, E, RP>(
fn run_node<C, G, S, RS, E, RP>(
cli: MergeParameters<RunCmd, RP>,
spec_factory: S,
exit: E,
@@ -526,12 +528,13 @@ fn run_node<F, S, RS, E, RP>(
) -> error::Result<()>
where
RP: StructOpt + Clone,
F: ServiceFactory,
C: Default,
G: RuntimeGenesis,
E: IntoExit,
S: FnOnce(&str) -> Result<Option<ChainSpec<FactoryGenesis<F>>>, String>,
RS: FnOnce(E, RunCmd, RP, FactoryFullConfiguration<F>) -> Result<(), String>,
S: FnOnce(&str) -> Result<Option<ChainSpec<G>>, String>,
RS: FnOnce(E, RunCmd, RP, Configuration<C, G>) -> Result<(), String>,
{
let config = create_run_node_config::<F, _>(cli.left.clone(), spec_factory, impl_name, version)?;
let config = create_run_node_config(cli.left.clone(), spec_factory, impl_name, version)?;
run_service(exit, cli.left, cli.right, config).map_err(Into::into)
}
@@ -544,13 +547,13 @@ where
// 9803-9874 Unassigned
// 9926-9949 Unassigned
fn with_default_boot_node<F>(
spec: &mut ChainSpec<FactoryGenesis<F>>,
fn with_default_boot_node<G>(
spec: &mut ChainSpec<G>,
cli: BuildSpecCmd,
version: &VersionInfo,
) -> error::Result<()>
where
F: ServiceFactory
G: RuntimeGenesis
{
if spec.boot_nodes().is_empty() {
let base_path = base_path(&cli.shared_params, version);
@@ -568,20 +571,20 @@ where
Ok(())
}
fn build_spec<F, S>(
fn build_spec<G, S>(
cli: BuildSpecCmd,
spec_factory: S,
version: &VersionInfo,
) -> error::Result<()>
where
F: ServiceFactory,
S: FnOnce(&str) -> Result<Option<ChainSpec<FactoryGenesis<F>>>, String>,
G: RuntimeGenesis,
S: FnOnce(&str) -> Result<Option<ChainSpec<G>>, String>,
{
info!("Building chain spec");
let raw_output = cli.raw;
let mut spec = load_spec(&cli.shared_params, spec_factory)?;
with_default_boot_node::<F>(&mut spec, cli, version)?;
let json = service::chain_ops::build_spec::<FactoryGenesis<F>>(spec, raw_output)?;
with_default_boot_node(&mut spec, cli, version)?;
let json = service::chain_ops::build_spec(spec, raw_output)?;
print!("{}", json);
@@ -589,12 +592,13 @@ where
}
/// Creates a configuration including the database path.
pub fn create_config_with_db_path<F, S>(
pub fn create_config_with_db_path<C, G, S>(
spec_factory: S, cli: &SharedParams, version: &VersionInfo,
) -> error::Result<FactoryFullConfiguration<F>>
) -> error::Result<Configuration<C, G>>
where
F: ServiceFactory,
S: FnOnce(&str) -> Result<Option<ChainSpec<FactoryGenesis<F>>>, String>,
C: Default,
G: RuntimeGenesis,
S: FnOnce(&str) -> Result<Option<ChainSpec<G>>, String>,
{
let spec = load_spec(cli, spec_factory)?;
let base_path = base_path(cli, version);
@@ -616,7 +620,7 @@ where
E: IntoExit,
S: FnOnce(&str) -> Result<Option<ChainSpec<FactoryGenesis<F>>>, String>,
{
let config = create_config_with_db_path::<F, _>(spec_factory, &cli.shared_params, version)?;
let config = create_config_with_db_path(spec_factory, &cli.shared_params, version)?;
info!("DB path: {}", config.database_path.display());
let from = cli.from.unwrap_or(1);
@@ -649,7 +653,7 @@ where
E: IntoExit,
S: FnOnce(&str) -> Result<Option<ChainSpec<FactoryGenesis<F>>>, String>,
{
let mut config = create_config_with_db_path::<F, _>(spec_factory, &cli.shared_params, version)?;
let mut config = create_config_with_db_path(spec_factory, &cli.shared_params, version)?;
config.execution_strategies = ExecutionStrategies {
importing: cli.execution.into(),
other: cli.execution.into(),
@@ -679,21 +683,21 @@ where
F: ServiceFactory,
S: FnOnce(&str) -> Result<Option<ChainSpec<FactoryGenesis<F>>>, String>,
{
let config = create_config_with_db_path::<F, _>(spec_factory, &cli.shared_params, version)?;
let config = create_config_with_db_path(spec_factory, &cli.shared_params, version)?;
let blocks = cli.num;
Ok(service::chain_ops::revert_chain::<F>(config, blocks.into())?)
}
fn purge_chain<F, S>(
fn purge_chain<G, S>(
cli: PurgeChainCmd,
spec_factory: S,
version: &VersionInfo,
) -> error::Result<()>
where
F: ServiceFactory,
S: FnOnce(&str) -> Result<Option<ChainSpec<FactoryGenesis<F>>>, String>,
G: RuntimeGenesis,
S: FnOnce(&str) -> Result<Option<ChainSpec<G>>, String>,
{
let config = create_config_with_db_path::<F, _>(spec_factory, &cli.shared_params, version)?;
let config = create_config_with_db_path::<(), _, _>(spec_factory, &cli.shared_params, version)?;
let db_path = config.database_path;
if cli.yes == false {