WIP

client/cli/src/lib.rs

@@ -1188,7 +1188,7 @@ mod tests {
 			run_cmds.shared_params.base_path = Some(PathBuf::from("/test/path"));
 			run_cmds.keystore_path = keystore_path.clone().map(PathBuf::from);
 
-			let node_config = create_run_node_config::<(), _, _, _>(
+			let node_config = create_run_node_config(
 				run_cmds.clone(),
 				|_| Ok(Some(chain_spec.clone())),
 				"test",
@@ -1228,14 +1228,14 @@ mod tests {
 		let spec_factory = |_: &str| Ok(Some(chain_spec.clone()));
 
 		let args = vec!["substrate", "run", "--dev", "--state-cache-size=42"];
-		let pnp = parse_and_prepare(&version, "test", args);
-		let config = pnp.into_configuration::<(), _, _, _>(spec_factory).unwrap().unwrap();
+		let core_params = from_iter(args, &version);
+		let config = get_config(&core_params, spec_factory, "substrate", &version).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(&version, "test", args);
-		let config = pnp.into_configuration::<(), _, _, _>(spec_factory).unwrap().unwrap();
+		let core_params = from_iter(args, &version);
+		let config = get_config(&core_params, spec_factory, "substrate", &version).unwrap();
 		assert_eq!(config.roles, sc_service::Roles::FULL);
 	}
 }

client/service/test/src/lib.rs

@@ -133,7 +133,7 @@ fn node_config<G, E: Clone> (
 	key_seed: Option<String>,
 	base_port: u16,
 	root: &TempDir,
-) -> Configuration<(), G, E>
+) -> Configuration<G, E>
 {
 	let root = root.path().join(format!("node-{}", index));
 
@@ -186,7 +186,6 @@ fn node_config<G, E: Clone> (
 		state_cache_child_ratio: None,
 		pruning: Default::default(),
 		chain_spec: (*spec).clone(),
-		custom: Default::default(),
 		name: format!("Node {}", index),
 		wasm_method: sc_service::config::WasmExecutionMethod::Interpreted,
 		execution_strategies: Default::default(),
@@ -216,11 +215,11 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 	fn new(
 		temp: &TempDir,
 		spec: ChainSpec<G, E>,
-		full: impl Iterator<Item = impl FnOnce(Configuration<(), G, E>) -> Result<(F, U), Error>>,
-		light: impl Iterator<Item = impl FnOnce(Configuration<(), G, E>) -> Result<L, Error>>,
+		full: impl Iterator<Item = impl FnOnce(Configuration<G, E>) -> Result<(F, U), Error>>,
+		light: impl Iterator<Item = impl FnOnce(Configuration<G, E>) -> Result<L, Error>>,
 		authorities: impl Iterator<Item = (
 			String,
-			impl FnOnce(Configuration<(), G, E>) -> Result<(F, U), Error>
+			impl FnOnce(Configuration<G, E>) -> Result<(F, U), Error>
 		)>,
 		base_port: u16
 	) -> TestNet<G, E, F, L, U> {
@@ -243,9 +242,9 @@ impl<G, E, F, L, U> TestNet<G, E, F, L, U> where
 	fn insert_nodes(
 		&mut self,
 		temp: &TempDir,
-		full: impl Iterator<Item = impl FnOnce(Configuration<(), G, E>) -> Result<(F, U), Error>>,
-		light: impl Iterator<Item = impl FnOnce(Configuration<(), G, E>) -> Result<L, Error>>,
-		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration<(), G, E>) -> Result<(F, U), Error>)>
+		full: impl Iterator<Item = impl FnOnce(Configuration<G, E>) -> Result<(F, U), Error>>,
+		light: impl Iterator<Item = impl FnOnce(Configuration<G, E>) -> Result<L, Error>>,
+		authorities: impl Iterator<Item = (String, impl FnOnce(Configuration<G, E>) -> Result<(F, U), Error>)>
 	) {
 		let executor = self.runtime.executor();
 
@@ -303,9 +302,9 @@ pub fn connectivity<G, E, Fb, F, Lb, L>(
 	light_builder: Lb,
 ) where
 	E: Clone,
-	Fb: Fn(Configuration<(), G, E>) -> Result<F, Error>,
+	Fb: Fn(Configuration<G, E>) -> Result<F, Error>,
 	F: AbstractService,
-	Lb: Fn(Configuration<(), G, E>) -> Result<L, Error>,
+	Lb: Fn(Configuration<G, E>) -> Result<L, Error>,
 	L: AbstractService,
 {
 	const NUM_FULL_NODES: usize = 5;
@@ -402,9 +401,9 @@ pub fn sync<G, E, Fb, F, Lb, L, B, ExF, U>(
 	mut make_block_and_import: B,
 	mut extrinsic_factory: ExF
 ) where
-	Fb: Fn(Configuration<(), G, E>) -> Result<(F, U), Error>,
+	Fb: Fn(Configuration<G, E>) -> Result<(F, U), Error>,
 	F: AbstractService,
-	Lb: Fn(Configuration<(), G, E>) -> Result<L, Error>,
+	Lb: Fn(Configuration<G, E>) -> Result<L, Error>,
 	L: AbstractService,
 	B: FnMut(&F, &mut U),
 	ExF: FnMut(&F, &U) -> <F::Block as BlockT>::Extrinsic,
@@ -471,9 +470,9 @@ pub fn consensus<G, E, Fb, F, Lb, L>(
 	light_builder: Lb,
 	authorities: impl IntoIterator<Item = String>
 ) where
-	Fb: Fn(Configuration<(), G, E>) -> Result<F, Error>,
+	Fb: Fn(Configuration<G, E>) -> Result<F, Error>,
 	F: AbstractService,
-	Lb: Fn(Configuration<(), G, E>) -> Result<L, Error>,
+	Lb: Fn(Configuration<G, E>) -> Result<L, Error>,
 	L: AbstractService,
 	E: Clone,
 {

utils/browser/src/lib.rs

@@ -37,12 +37,11 @@ pub use console_log::init_with_level as init_console_log;
 /// Create a service configuration from a chain spec and the websocket transport.
 ///
 /// This configuration contains good defaults for a browser light client.
-pub async fn browser_configuration<C, G, E>(
+pub async fn browser_configuration<G, E>(
 	transport: Transport,
 	chain_spec: ChainSpec<G, E>,
-) -> Result<Configuration<C, G, E>, Box<dyn std::error::Error>>
+) -> Result<Configuration<G, E>, Box<dyn std::error::Error>>
 where
-	C: Default,
 	G: RuntimeGenesis,
 	E: Extension,
 {