Introduce DEFAULT_KEYS_PATH constant

Author: kseo

codechain/account_command.rs

@@ -24,6 +24,8 @@ use ckeystore::KeyStore;
 use clap::ArgMatches;
 use clogger::{self, LoggerConfig};
 
+use super::constants::DEFAULT_KEYS_PATH;
+
 pub fn run_account_command(matches: ArgMatches) -> Result<(), String> {
     if matches.subcommand.is_none() {
         println!("{}", matches.usage());
@@ -32,7 +34,7 @@ pub fn run_account_command(matches: ArgMatches) -> Result<(), String> {
 
     clogger::init(&LoggerConfig::new(0)).expect("Logger must be successfully initialized");
 
-    let keys_path = matches.value_of("keys-path").unwrap_or("keys");
+    let keys_path = matches.value_of("keys-path").unwrap_or(DEFAULT_KEYS_PATH);
     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);

codechain/config/mod.rs

@@ -53,7 +53,7 @@ pub struct Operating {
     pub quiet: bool,
     pub instance_id: Option<usize>,
     pub db_path: String,
-    pub keys_path: String,
+    pub keys_path: Option<String>,
     pub chain: ChainType,
 }
 
@@ -171,7 +171,7 @@ impl Operating {
             self.db_path = db_path.to_string();
         }
         if let Some(keys_path) = matches.value_of("keys-path") {
-            self.keys_path = keys_path.to_string();
+            self.keys_path = Some(keys_path.to_string());
         }
         if let Some(chain) = matches.value_of("chain") {
             self.chain = chain.parse()?;

codechain/constants.rs

@@ -0,0 +1,17 @@
+// Copyright 2018 Kodebox, Inc.
+// This file is part of CodeChain.
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as
+// published by the Free Software Foundation, either version 3 of the
+// License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+pub const DEFAULT_KEYS_PATH: &'static str = "keys";

codechain/main.rs

@@ -49,6 +49,7 @@ extern crate toml;
 
 mod account_command;
 mod config;
+mod constants;
 mod rpc;
 mod rpc_apis;
 
@@ -255,8 +256,11 @@ fn run_node(matches: ArgMatches) -> Result<(), String> {
     clogger::init(&LoggerConfig::new(instance_id)).expect("Logger must be successfully initialized");
 
     // FIXME: Handle IO error.
-    let keystore_dir =
-        RootDiskDirectory::create(config.operating.keys_path.clone()).expect("Cannot read key path directory");
+    let keys_path = match config.operating.keys_path {
+        Some(ref keys_path) => keys_path.clone(),
+        None => constants::DEFAULT_KEYS_PATH.to_string(),
+    };
+    let keystore_dir = RootDiskDirectory::create(keys_path).expect("Cannot read key path directory");
     let keystore = KeyStore::open(Box::new(keystore_dir)).unwrap();
     let ap = AccountProvider::new(keystore);
     let miner = new_miner(&config, &spec, ap.clone())?;