Don't hardcode the network id for the account CLI

Author: joojis

codechain/codechain.yml

@@ -200,6 +200,11 @@ subcommands:
                 value_name: PATH
                 help: Specify the path for JSON key files to be found
                 takes_value: true
+            - chain:
+                short: c
+                long: chain
+                help: Set the blockchain type out of solo, solo_authority, tendermint, cuckoo, blake_pow, husky or a path to chain scheme file.
+                takes_value: true
         subcommands:
             - create:
                 about: create account

codechain/config/mod.rs

@@ -27,7 +27,7 @@ use cnetwork::{NetworkConfig, SocketAddr};
 use rpc::{RpcHttpConfig, RpcIpcConfig};
 use toml;
 
-use self::chain_type::ChainType;
+pub use self::chain_type::ChainType;
 use super::constants::DEFAULT_CONFIG_PATH;
 
 #[derive(Deserialize)]

codechain/subcommand/account_command.rs

@@ -27,6 +27,7 @@ use clap::ArgMatches;
 use clogger::{self, LoggerConfig};
 use primitives::clean_0x;
 
+use super::super::config::ChainType;
 use super::super::constants::DEFAULT_KEYS_PATH;
 
 pub fn run_account_command(matches: ArgMatches) -> Result<(), String> {
@@ -41,8 +42,8 @@ pub fn run_account_command(matches: ArgMatches) -> Result<(), String> {
     let dir = RootDiskDirectory::create(keys_path).expect("Cannot read key path directory");
     let keystore = KeyStore::open(Box::new(dir)).unwrap();
     let ap = AccountProvider::new(keystore);
-    // FIXME: Don't hardcode network_id.
-    let network_id: NetworkId = "tc".into();
+    let chain = matches.value_of("chain").unwrap_or("solo");
+    let network_id: NetworkId = ChainType::from_str(chain)?.scheme().map(|scheme| scheme.params().network_id)?;
 
     match matches.subcommand() {
         ("create", _) => create(&ap, network_id),