Skip to content
This repository was archived by the owner on Nov 15, 2023. It is now read-only.

Getting configuration from commands #4643

Merged
gavofyork merged 10 commits into from
Jan 16, 2020
Merged

Getting configuration from commands #4643

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b555169
Expose a method that allows converting RunCmd to Configuration
cecton Jan 13, 2020
66be588
WIP
cecton Jan 13, 2020
3ead9ce
WIP
cecton Jan 13, 2020
7c53455
WIP
cecton Jan 13, 2020
6995304
WIP
cecton Jan 15, 2020
1484209
WIP
cecton Jan 15, 2020
aa18852
Merge remote-tracking branch 'origin/master' into cecton-getting-conf…
cecton Jan 16, 2020
a5f77e4
WIP
cecton Jan 16, 2020
b9891a8
WIP
cecton Jan 16, 2020
9b8b472
WIP
cecton Jan 16, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
WIP
  • Loading branch information
@cecton
cecton committed Jan 16, 2020
commit 148420901e0199cb9b204e483e545d5f3c5018ca
37 changes: 21 additions & 16 deletions client/cli/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,8 +142,13 @@ pub fn load_spec<F, G, E>(cli: &SharedParams, factory: F) -> error::Result<Chain
Ok(spec)
}

fn base_path(cli: &SharedParams, version: &VersionInfo) -> PathBuf {
fn base_path(
cli: &SharedParams,
version: &VersionInfo,
default_base_path: Option<PathBuf>,
) -> PathBuf {
cli.base_path.clone()
.or(default_base_path)
.unwrap_or_else(||
app_dirs::get_app_root(
AppDataType::UserData,
Expand Down Expand Up @@ -300,7 +305,7 @@ impl<'a, CC, RP> ParseAndPrepare<'a, CC, RP> {
pub fn into_configuration<C, G, E, S>(
Copy link
Contributor

@tomusdrw tomusdrw Jan 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should existing node/cli and node-template/cli be using that function?

Copy link
Contributor Author

@cecton cecton Jan 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

(answered on #4643 (comment) )

self,
spec_factory: S,
base_path_override: Option<PathBuf>,
default_base_path: Option<PathBuf>,
) -> error::Result<Option<Configuration<C, G, E>>>
where
C: Default,
Expand All @@ -315,7 +320,7 @@ impl<'a, CC, RP> ParseAndPrepare<'a, CC, RP> {
spec_factory,
c.impl_name,
c.version,
base_path_override,
default_base_path,
)).transpose(),
ParseAndPrepare::BuildSpec(c) => {
let spec = load_spec(&c.params.shared_params, spec_factory)?;
Expand All @@ -324,43 +329,43 @@ impl<'a, CC, RP> ParseAndPrepare<'a, CC, RP> {
&spec,
&c.params.shared_params,
c.version,
base_path_override,
default_base_path,
)).transpose()
},
ParseAndPrepare::ExportBlocks(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
default_base_path,
)).transpose(),
ParseAndPrepare::ImportBlocks(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
default_base_path,
)).transpose(),
ParseAndPrepare::CheckBlock(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
default_base_path,
)).transpose(),
ParseAndPrepare::PurgeChain(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
default_base_path,
)).transpose(),
ParseAndPrepare::RevertChain(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
default_base_path,
)).transpose(),
ParseAndPrepare::CustomCommand(_) => Ok(None),
}
Expand Down Expand Up @@ -942,7 +947,7 @@ fn create_run_node_config<C, G, E, S>(
spec_factory: S,
impl_name: &'static str,
version: &VersionInfo,
base_path_override: Option<PathBuf>,
default_base_path: Option<PathBuf>,
) -> error::Result<Configuration<C, G, E>>
where
C: Default,
Expand All @@ -954,7 +959,7 @@ where
spec_factory,
&cli.shared_params,
&version,
base_path_override,
default_base_path,
)?;

fill_config_keystore_password_and_path(&mut config, &cli)?;
Expand Down Expand Up @@ -1092,7 +1097,7 @@ pub fn create_config_with_db_path<C, G, E, S>(
spec_factory: S,
cli: &SharedParams,
version: &VersionInfo,
base_path_override: Option<PathBuf>,
default_base_path: Option<PathBuf>,
) -> error::Result<Configuration<C, G, E>>
where
C: Default,
Expand All @@ -1101,7 +1106,7 @@ where
S: FnOnce(&str) -> Result<Option<ChainSpec<G, E>>, String>,
{
let spec = load_spec(cli, spec_factory)?;
let base_path = base_path_override.unwrap_or_else(|| base_path(cli, version));
let base_path = base_path(cli, version, default_base_path);
Copy link
Contributor

@tomusdrw tomusdrw Jan 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could delegate to create_build_spec_config to avoid duplication


let mut config = sc_service::Configuration::default_with_spec_and_base_path(
spec.clone(),
Expand All @@ -1121,14 +1126,14 @@ fn create_build_spec_config<C, G, E>(
spec: &ChainSpec<G, E>,
cli: &SharedParams,
version: &VersionInfo,
base_path_override: Option<PathBuf>,
default_base_path: Option<PathBuf>,
) -> error::Result<Configuration<C, G, E>>
where
C: Default,
G: RuntimeGenesis,
E: ChainSpecExtension,
{
let base_path = base_path_override.unwrap_or_else(|| base_path(&cli, version));
let base_path = base_path(&cli, version, default_base_path);
let cfg = sc_service::Configuration::<C,_,_>::default_with_spec_and_base_path(
spec.clone(),
Some(base_path),
Expand Down Expand Up @@ -1422,6 +1427,6 @@ mod tests {
let args = vec!["substrate", "--base-path=/foo"];
let pnp = parse_and_prepare::<NoCustom, NoCustom, _>(&version, "test", args);
let config = pnp.into_configuration::<(), _, _, _>(spec_factory, Some("/bar".into())).unwrap().unwrap();
assert_eq!(config.config_dir, Some("/bar".into()));
assert_eq!(config.config_dir, Some("/foo".into()));
}
}