(spec_factory),
+ ParseAndPrepare::CustomCommand(cmd) => return Ok(Some(cmd))
+ }?;
+
+ Ok(None)
+}
+
/// Create a `NodeKeyConfig` from the given `NodeKeyParams` in the context
/// of an optional network config storage directory.
fn node_key_config(params: NodeKeyParams, net_config_dir: &Option
)
@@ -292,8 +556,8 @@ fn parse_ed25519_secret(hex: &String) -> error::Result(
- options: &mut FactoryFullConfiguration,
+fn fill_transaction_pool_configuration(
+ options: &mut Configuration,
params: TransactionPoolParams,
) -> error::Result<()> {
// ready queue
@@ -366,18 +630,36 @@ fn input_keystore_password() -> Result {
.map_err(|e| format!("{:?}", e))
}
-fn create_run_node_config(
+/// Fill the password field of the given config instance.
+fn fill_config_keystore_password(
+ config: &mut service::Configuration,
+ cli: &RunCmd,
+) -> Result<(), String> {
+ config.keystore_password = if cli.password_interactive {
+ Some(input_keystore_password()?.into())
+ } else if let Some(ref file) = cli.password_filename {
+ Some(fs::read_to_string(file).map_err(|e| format!("{}", e))?.into())
+ } else if let Some(ref password) = cli.password {
+ Some(password.clone().into())
+ } else {
+ None
+ };
+
+ Ok(())
+}
+
+fn create_run_node_config(
cli: RunCmd, spec_factory: S, impl_name: &'static str, version: &VersionInfo
-) -> error::Result>
+) -> error::Result>
where
- F: ServiceFactory,
- S: FnOnce(&str) -> Result>>, String>,
+ C: Default,
+ G: RuntimeGenesis,
+ S: FnOnce(&str) -> Result>, String>,
{
let spec = load_spec(&cli.shared_params, spec_factory)?;
let mut config = service::Configuration::default_with_spec(spec.clone());
- if cli.interactive_password {
- config.password = input_keystore_password()?.into()
- }
+
+ fill_config_keystore_password(&mut config, &cli)?;
config.impl_name = impl_name;
config.impl_commit = version.commit;
@@ -401,7 +683,9 @@ where
let base_path = base_path(&cli.shared_params, version);
- config.keystore_path = cli.keystore_path.or_else(|| Some(keystore_path(&base_path, config.chain_spec.id())));
+ config.keystore_path = cli.keystore_path.unwrap_or_else(
+ || keystore_path(&base_path, config.chain_spec.id())
+ );
config.database_path = db_path(&base_path, config.chain_spec.id());
config.database_cache_size = cli.database_cache_size;
@@ -414,10 +698,12 @@ where
),
};
+ let is_dev = cli.shared_params.dev;
+
let role =
if cli.light {
service::Roles::LIGHT
- } else if cli.validator || cli.shared_params.dev {
+ } else if cli.validator || is_dev || cli.keyring.account.is_some() {
service::Roles::AUTHORITY
} else {
service::Roles::FULL
@@ -442,10 +728,6 @@ where
config.roles = role;
config.disable_grandpa = cli.no_grandpa;
- config.grandpa_voter = cli.grandpa_voter;
-
-
- let is_dev = cli.shared_params.dev;
let client_id = config.client_id();
fill_network_configuration(
@@ -457,32 +739,23 @@ where
is_dev,
)?;
- fill_transaction_pool_configuration::(
- &mut config,
- cli.pool_config,
- )?;
+ fill_transaction_pool_configuration(&mut config, cli.pool_config)?;
- if let Some(key) = cli.key {
- config.keys.push(key);
- }
-
- if cli.shared_params.dev && cli.keyring.account.is_none() {
- config.keys.push("//Alice".into());
- }
-
- if let Some(account) = cli.keyring.account {
- config.keys.push(format!("//{}", account));
- }
+ config.dev_key_seed = cli.keyring.account
+ .map(|a| format!("//{}", a)).or_else(|| {
+ if is_dev {
+ Some("//Alice".into())
+ } else {
+ None
+ }
+ });
let rpc_interface: &str = if cli.rpc_external { "0.0.0.0" } else { "127.0.0.1" };
let ws_interface: &str = if cli.ws_external { "0.0.0.0" } else { "127.0.0.1" };
- config.rpc_http = Some(
- parse_address(&format!("{}:{}", rpc_interface, 9933), cli.rpc_port)?
- );
- config.rpc_ws = Some(
- parse_address(&format!("{}:{}", ws_interface, 9944), cli.ws_port)?
- );
+ config.rpc_http = Some(parse_address(&format!("{}:{}", rpc_interface, 9933), cli.rpc_port)?);
+ config.rpc_ws = Some(parse_address(&format!("{}:{}", ws_interface, 9944), cli.ws_port)?);
+
config.rpc_ws_max_connections = cli.ws_max_connections;
config.rpc_cors = cli.rpc_cors.unwrap_or_else(|| if is_dev {
log::warn!("Running in --dev mode, RPC CORS has been disabled.");
@@ -511,26 +784,6 @@ where
Ok(config)
}
-fn run_node(
- cli: MergeParameters,
- spec_factory: S,
- exit: E,
- run_service: RS,
- impl_name: &'static str,
- version: &VersionInfo,
-) -> error::Result<()>
-where
- RP: StructOpt + Clone,
- F: ServiceFactory,
- E: IntoExit,
- S: FnOnce(&str) -> Result>>, String>,
- RS: FnOnce(E, RunCmd, RP, FactoryFullConfiguration) -> Result<(), String>,
- {
- 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)
-}
-
//
// IANA unassigned port ranges that we could use:
// 6717-6766 Unassigned
@@ -539,13 +792,13 @@ where
// 9803-9874 Unassigned
// 9926-9949 Unassigned
-fn with_default_boot_node(
- spec: &mut ChainSpec>,
+fn with_default_boot_node(
+ spec: &mut ChainSpec,
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);
@@ -563,33 +816,14 @@ where
Ok(())
}
-fn build_spec(
- cli: BuildSpecCmd,
- spec_factory: S,
- version: &VersionInfo,
-) -> error::Result<()>
-where
- F: ServiceFactory,
- S: FnOnce(&str) -> Result>>, String>,
-{
- info!("Building chain spec");
- let raw_output = cli.raw;
- let mut spec = load_spec(&cli.shared_params, spec_factory)?;
- with_default_boot_node::(&mut spec, cli, version)?;
- let json = service::chain_ops::build_spec::>(spec, raw_output)?;
-
- print!("{}", json);
-
- Ok(())
-}
-
/// Creates a configuration including the database path.
-pub fn create_config_with_db_path(
+pub fn create_config_with_db_path(
spec_factory: S, cli: &SharedParams, version: &VersionInfo,
-) -> error::Result>
+) -> error::Result>
where
- F: ServiceFactory,
- S: FnOnce(&str) -> Result>>, String>,
+ C: Default,
+ G: RuntimeGenesis,
+ S: FnOnce(&str) -> Result>, String>,
{
let spec = load_spec(cli, spec_factory)?;
let base_path = base_path(cli, version);
@@ -600,112 +834,10 @@ where
Ok(config)
}
-fn export_blocks(
- cli: ExportBlocksCmd,
- spec_factory: S,
- exit: E,
- version: &VersionInfo,
-) -> error::Result<()>
-where
- F: ServiceFactory,
- E: IntoExit,
- S: FnOnce(&str) -> Result>>, String>,
-{
- 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);
- let to = cli.to;
- let json = cli.json;
-
- let file: Box