Nits

crates/subcoin-node/src/cli/params.rs

@@ -19,6 +19,18 @@ pub enum Chain {
     BitcoinSignet,
 }
 
+impl Chain {
+    /// Returns the value of `id` in `SubstrateCli::load_spec(id)`.
+    fn chain_spec_id(&self) -> &'static str {
+        // Convert to kebab-case for consistency in CLI.
+        match self {
+            Self::BitcoinMainnet => "bitcoin-mainnet",
+            Self::BitcoinTestnet => "bitcoin-testnet",
+            Self::BitcoinSignet => "bitcoin-signet",
+        }
+    }
+}
+
 #[derive(Debug, Clone, Parser)]
 pub struct NetworkParams {
     /// Specify the remote peer address to connect.
@@ -107,7 +119,7 @@ impl CommonParams {
     pub fn as_shared_params(&self) -> sc_cli::SharedParams {
         // TODO: expose more flags?
         sc_cli::SharedParams {
-            chain: Some(format!("{:?}", self.chain)),
+            chain: Some(self.chain.chain_spec_id().to_string()),
             dev: false,
             base_path: self.base_path.clone(),
             log: self.log.clone(),

crates/subcoin-node/src/substrate_cli.rs

@@ -2,10 +2,6 @@ use subcoin_service::ChainSpec;
 
 const BITCOIN_MAINNET_CHAIN_SPEC: &str = include_str!("../res/chain-spec-raw-bitcoin-mainnet.json");
 
-fn chain_spec_bitcoin_mainnet() -> Result<ChainSpec, String> {
-    ChainSpec::from_json_bytes(BITCOIN_MAINNET_CHAIN_SPEC.as_bytes())
-}
-
 /// Fake CLI for satisfying the Substrate CLI interface.
 ///
 /// Primarily for creating a Substrate runner.
@@ -38,13 +34,11 @@ impl sc_cli::SubstrateCli for SubstrateCli {
     }
 
     fn load_spec(&self, id: &str) -> Result<Box<dyn sc_service::ChainSpec>, String> {
-        // TODO: different chain spec for different bitcoin network.
-        // parse network from id
-        // The chain spec here does not impact the chain but only for showing the proper
-        // network type on explorer.
-
         let chain_spec = match id {
-            "bitcoin-mainnet" => chain_spec_bitcoin_mainnet()?,
+            "bitcoin-mainnet" => ChainSpec::from_json_bytes(BITCOIN_MAINNET_CHAIN_SPEC.as_bytes())?,
+            "bitcoin-testnet" | "bitcoin-signet" => {
+                unimplemented!("Bitcoin testnet and signet are unsupported")
+            }
             path => ChainSpec::from_json_file(std::path::PathBuf::from(path))?,
         };