WIP

Forked at: 9195fac
Parent branch: origin/master

bin/node/cli/src/command.rs

@@ -41,8 +41,8 @@ where
 			&version,
 		),
 		Some(Subcommand::Factory(cli_args)) => {
-			sc_cli::init(&mut config, load_spec, &cli_args.shared_params, &version)?;
-
+			sc_cli::init(&cli_args.shared_params, &version)?;
+			sc_cli::load_spec(&mut config, &cli_args.shared_params, load_spec)?;
 			sc_cli::fill_import_params(
 				&mut config,
 				&cli_args.import_params,

client/service/test/src/lib.rs

@@ -183,10 +183,10 @@ fn node_config<G, E: Clone> (
 			password: None
 		},
 		config_dir: Some(root.clone()),
-		database: DatabaseConfig::Path {
+		database: Some(DatabaseConfig::Path {
 			path: root.join("db"),
 			cache_size: None
-		},
+		}),
 		state_cache_size: 16777216,
 		state_cache_child_ratio: None,
 		pruning: Default::default(),