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 69953044d9f9269d54496aa1111c3cbc61dbed6a
83 changes: 67 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 @@ -300,6 +300,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>,
) -> error::Result<Option<Configuration<C, G, E>>>
where
C: Default,
Expand All @@ -313,7 +314,8 @@ impl<'a, CC, RP> ParseAndPrepare<'a, CC, RP> {
c.params.left,
spec_factory,
c.impl_name,
c.version
c.version,
base_path_override,
)).transpose(),
ParseAndPrepare::BuildSpec(c) => {
let spec = load_spec(&c.params.shared_params, spec_factory)?;
Expand All @@ -322,37 +324,43 @@ impl<'a, CC, RP> ParseAndPrepare<'a, CC, RP> {
&spec,
&c.params.shared_params,
c.version,
base_path_override,
)).transpose()
},
ParseAndPrepare::ExportBlocks(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
)).transpose(),
ParseAndPrepare::ImportBlocks(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
)).transpose(),
ParseAndPrepare::CheckBlock(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
)).transpose(),
ParseAndPrepare::PurgeChain(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version
c.version,
base_path_override,
)).transpose(),
ParseAndPrepare::RevertChain(c) =>
Some(create_config_with_db_path(
spec_factory,
&c.params.shared_params,
c.version,
base_path_override,
)).transpose(),
ParseAndPrepare::CustomCommand(_) => Ok(None),
}
Expand Down Expand Up @@ -385,7 +393,11 @@ impl<'a, RP> ParseAndPrepareRun<'a, RP> {
RS: FnOnce(Exit, RunCmd, RP, Configuration<C, G, CE>) -> Result<(), E>
{
let config = create_run_node_config(
self.params.left.clone(), spec_factory, self.impl_name, self.version,
self.params.left.clone(),
spec_factory,
self.impl_name,
self.version,
None,
)?;

run_service(exit, self.params.left, self.params.right, config).map_err(Into::into)
Expand Down Expand Up @@ -418,6 +430,7 @@ impl<'a> ParseAndPrepareBuildSpec<'a> {
&spec,
&self.params.shared_params,
self.version,
None,
)?;
let node_key = node_key_config(
self.params.node_key_params,
Expand Down Expand Up @@ -465,7 +478,12 @@ impl<'a> ParseAndPrepareExport<'a> {
E: ChainSpecExtension,
Exit: IntoExit
{
let config = create_config_with_db_path(spec_factory, &self.params.shared_params, self.version)?;
let config = create_config_with_db_path(
spec_factory,
&self.params.shared_params,
self.version,
None,
)?;

if let DatabaseConfig::Path { ref path, .. } = &config.database {
info!("DB path: {}", path.display());
Expand Down Expand Up @@ -527,7 +545,12 @@ impl<'a> ParseAndPrepareImport<'a> {
E: ChainSpecExtension,
Exit: IntoExit
{
let mut config = create_config_with_db_path(spec_factory, &self.params.shared_params, self.version)?;
let mut config = create_config_with_db_path(
spec_factory,
&self.params.shared_params,
self.version,
None,
)?;
fill_import_params(&mut config, &self.params.import_params, sc_service::Roles::FULL)?;

let file: Box<dyn ReadPlusSeek + Send> = match self.params.input {
Expand Down Expand Up @@ -587,7 +610,12 @@ impl<'a> CheckBlock<'a> {
E: ChainSpecExtension,
Exit: IntoExit
{
let mut config = create_config_with_db_path(spec_factory, &self.params.shared_params, self.version)?;
let mut config = create_config_with_db_path(
spec_factory,
&self.params.shared_params,
self.version,
None,
)?;
fill_import_params(&mut config, &self.params.import_params, sc_service::Roles::FULL)?;

let input = if self.params.input.starts_with("0x") { &self.params.input[2..] } else { &self.params.input[..] };
Expand Down Expand Up @@ -627,7 +655,10 @@ impl<'a> ParseAndPreparePurge<'a> {
E: ChainSpecExtension,
{
let config = create_config_with_db_path::<(), _, _, _>(
spec_factory, &self.params.shared_params, self.version
spec_factory,
&self.params.shared_params,
self.version,
None,
)?;
let db_path = match config.database {
DatabaseConfig::Path { path, .. } => path,
Expand Down Expand Up @@ -691,7 +722,10 @@ impl<'a> ParseAndPrepareRevert<'a> {
E: ChainSpecExtension,
{
let config = create_config_with_db_path(
spec_factory, &self.params.shared_params, self.version
spec_factory,
&self.params.shared_params,
self.version,
None,
)?;
let blocks = self.params.num.parse()?;
builder(config)?.revert_chain(blocks)?;
Expand Down Expand Up @@ -904,15 +938,24 @@ pub fn fill_import_params<C, G, E>(
}

fn create_run_node_config<C, G, E, S>(
cli: RunCmd, spec_factory: S, impl_name: &'static str, version: &VersionInfo,
cli: RunCmd,
spec_factory: S,
impl_name: &'static str,
version: &VersionInfo,
base_path_override: Option<PathBuf>,
) -> error::Result<Configuration<C, G, E>>
where
C: Default,
G: RuntimeGenesis,
E: ChainSpecExtension,
S: FnOnce(&str) -> Result<Option<ChainSpec<G, E>>, String>,
{
let mut config = create_config_with_db_path(spec_factory, &cli.shared_params, &version)?;
let mut config = create_config_with_db_path(
spec_factory,
&cli.shared_params,
&version,
base_path_override,
)?;

fill_config_keystore_password_and_path(&mut config, &cli)?;

Expand Down Expand Up @@ -1046,7 +1089,10 @@ fn interface_str(

/// Creates a configuration including the database path.
pub fn create_config_with_db_path<C, G, E, S>(
spec_factory: S, cli: &SharedParams, version: &VersionInfo,
spec_factory: S,
cli: &SharedParams,
version: &VersionInfo,
base_path_override: Option<PathBuf>,
) -> error::Result<Configuration<C, G, E>>
where
C: Default,
Expand All @@ -1055,7 +1101,7 @@ where
S: FnOnce(&str) -> Result<Option<ChainSpec<G, E>>, String>,
{
let spec = load_spec(cli, spec_factory)?;
let base_path = base_path(cli, version);
let base_path = base_path_override.unwrap_or_else(|| base_path(cli, version));

let mut config = sc_service::Configuration::default_with_spec_and_base_path(
spec.clone(),
Expand All @@ -1075,13 +1121,14 @@ fn create_build_spec_config<C, G, E>(
spec: &ChainSpec<G, E>,
cli: &SharedParams,
version: &VersionInfo,
base_path_override: Option<PathBuf>,
) -> error::Result<Configuration<C, G, E>>
where
C: Default,
G: RuntimeGenesis,
E: ChainSpecExtension,
{
let base_path = base_path(&cli, version);
let base_path = base_path_override.unwrap_or_else(|| base_path(&cli, version));
let cfg = sc_service::Configuration::<C,_,_>::default_with_spec_and_base_path(
spec.clone(),
Some(base_path),
Expand Down Expand Up @@ -1363,14 +1410,18 @@ mod tests {

let args = vec!["substrate", "--dev", "--state-cache-size=42"];
let pnp = parse_and_prepare::<NoCustom, NoCustom, _>(&version, "test", args);
let config = pnp.into_configuration::<(), _, _, _>(spec_factory).unwrap().unwrap();
let config = pnp.into_configuration::<(), _, _, _>(spec_factory, None).unwrap().unwrap();
assert_eq!(config.roles, sc_service::Roles::AUTHORITY);
assert_eq!(config.state_cache_size, 42);

let args = vec!["substrate", "import-blocks", "--dev"];
let pnp = parse_and_prepare::<NoCustom, NoCustom, _>(&version, "test", args);
let config = pnp.into_configuration::<(), _, _, _>(spec_factory).unwrap().unwrap();
// NOTE: only RunCmd (no subcommand) knows --dev
let config = pnp.into_configuration::<(), _, _, _>(spec_factory, None).unwrap().unwrap();
assert_eq!(config.roles, sc_service::Roles::FULL);

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()));
}
}