Uses ValueEnum

substrate/bin/utils/chain-spec-builder/src/lib.rs

@@ -117,10 +117,10 @@
 //! [sp-genesis-builder-list]: ../sp_genesis_builder/trait.GenesisBuilder.html#method.preset_names
 //! [sp-genesis-builder-get-preset]: ../sp_genesis_builder/trait.GenesisBuilder.html#method.get_preset
 
-use std::{fs, path::PathBuf, str::FromStr};
+use std::{fs, path::PathBuf};
 
 use clap::{Parser, Subcommand};
-use sc_chain_spec::{GenericChainSpec, GenesisConfigBuilderRuntimeCaller};
+use sc_chain_spec::{ChainType, GenericChainSpec, GenesisConfigBuilderRuntimeCaller};
 use serde_json::Value;
 
 /// A utility to easily create a chain spec definition.
@@ -155,8 +155,8 @@ pub struct CreateCmd {
 	#[arg(long, short = 'i', default_value = "custom")]
 	chain_id: String,
 	/// The chain type.
-	#[arg(long, short = 't', default_value = "Live")]
-	chain_type: String,
+	#[arg(value_enum, short = 't', default_value = "Live")]
+	chain_type: ChainType,
 	/// The path to runtime wasm blob.
 	#[arg(long, short)]
 	runtime_wasm_path: PathBuf,
@@ -259,13 +259,12 @@ pub fn generate_chain_spec_for_runtime(cmd: &CreateCmd) -> Result<String, String
 	let code = fs::read(cmd.runtime_wasm_path.as_path())
 		.map_err(|e| format!("wasm blob shall be readable {e}"))?;
 
-	let chain_type = sc_chain_spec::ChainType::from_str(&cmd.chain_type[..])
-		.map_err(|_| "chain type should be valid".to_string())?;
+	let chain_type = &cmd.chain_type;
 
 	let builder = GenericChainSpec::<()>::builder(&code[..], Default::default())
 		.with_name(&cmd.chain_name[..])
 		.with_id(&cmd.chain_id[..])
-		.with_chain_type(chain_type);
+		.with_chain_type(chain_type.clone());
 
 	let builder = match cmd.action {
 		GenesisBuildAction::NamedPreset(NamedPresetCmd { ref preset_name }) =>

substrate/client/chain-spec/Cargo.toml

@@ -16,6 +16,7 @@ workspace = true
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+clap = { version = "4.5.3", features = ["derive"] }
 codec = { package = "parity-scale-codec", version = "3.6.12", default-features = false, features = ["derive"] }
 memmap2 = "0.9.3"
 serde = { features = ["derive"], workspace = true, default-features = true }

substrate/client/chain-spec/src/lib.rs

@@ -327,8 +327,6 @@ mod genesis_block;
 mod genesis_config_builder;
 pub mod json_patch;
 
-use std::str::FromStr;
-
 pub use self::{
 	chain_spec::{
 		update_code_in_json_chain_spec, ChainSpec as GenericChainSpec, ChainSpecBuilder,
@@ -354,7 +352,7 @@ use sp_runtime::BuildStorage;
 ///
 /// This can be used by tools to determine the type of a chain for displaying
 /// additional information or enabling additional features.
-#[derive(serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
+#[derive(clap::ValueEnum, serde::Serialize, serde::Deserialize, Debug, PartialEq, Clone)]
 pub enum ChainType {
 	/// A development chain that runs mainly on one node.
 	Development,
@@ -363,6 +361,7 @@ pub enum ChainType {
 	/// A live chain.
 	Live,
 	/// Some custom chain type.
+	#[clap(skip)]
 	Custom(String),
 }
 
@@ -372,19 +371,6 @@ impl Default for ChainType {
 	}
 }
 
-impl FromStr for ChainType {
-	type Err = ();
-
-	fn from_str(s: &str) -> Result<Self, Self::Err> {
-		Ok(match s {
-			"Development" => ChainType::Development,
-			"Local" => ChainType::Local,
-			"Live" => ChainType::Live,
-			_ => ChainType::Custom(s.to_string()),
-		})
-	}
-}
-
 /// Arbitrary properties defined in chain spec as a JSON object
 pub type Properties = serde_json::map::Map<String, serde_json::Value>;