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

Move config path generation into the service config for reusability #3978

Merged
gavofyork merged 8 commits into from
Nov 1, 2019
Merged

Move config path generation into the service config for reusability #3978

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
4ecbc2b
Move config path generation into the service config for reusability
gnunicorn Oct 23, 2019
fc9f1b0
Make NoCostum Default and fix tests
gnunicorn Oct 31, 2019
8a1a25d
Apply suggestions from code review
gnunicorn Nov 1, 2019
3f12f75
remove function not used anymore
gnunicorn Nov 1, 2019
7be8cbf
Merge remote-tracking branch 'origin/master' into ben-make-config-pat…
gnunicorn Nov 1, 2019
0113741
Make path into an option
gnunicorn Nov 1, 2019
e31e204
remove database_path function and call it directly
gnunicorn Nov 1, 2019
bd0f5de
remove helper functions, use consts
gnunicorn Nov 1, 2019
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
Make NoCostum Default and fix tests
  • Loading branch information
@gnunicorn
gnunicorn committed Oct 31, 2019
commit fc9f1b036ce99e00145fd04214498bb3babbc286
2 changes: 1 addition & 1 deletion core/cli/src/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -835,7 +835,7 @@ impl<CC, RP> GetLogFilter for CoreParams<CC, RP> where CC: GetLogFilter {

/// A special commandline parameter that expands to nothing.
/// Should be used as custom subcommand/run arguments if no custom values are required.
#[derive(Clone, Debug)]
#[derive(Clone, Debug, Default)]
pub struct NoCustom {}

impl StructOpt for NoCustom {
Expand Down
1 change: 1 addition & 0 deletions core/service/test/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ fn node_config<G, E: Clone> (
network: network_config,
keystore_path: root.join("key"),
keystore_password: None,
config_dir: root.clone(),
database: DatabaseConfig::Path {
path: root.join("db"),
cache_size: None
Expand Down
2 changes: 1 addition & 1 deletion node-template/src/cli.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub fn run<I, T, E>(args: I, exit: E, version: VersionInfo) -> error::Result<()>
),
}
}),
ParseAndPrepare::BuildSpec(cmd) => cmd.run(load_spec),
ParseAndPrepare::BuildSpec(cmd) => cmd.run::<NoCustom, _, _, _>(load_spec),
ParseAndPrepare::ExportBlocks(cmd) => cmd.run_with_builder(|config: Config<_>|
Ok(new_full_start!(config).0), load_spec, exit),
ParseAndPrepare::ImportBlocks(cmd) => cmd.run_with_builder(|config: Config<_>|
Expand Down