CLI cleanup

node/src/cli/mod.rs

@@ -4,9 +4,10 @@ pub use config::Config;
 
 use clap::{App, Arg};
 use node::utils::{read_file, read_toml};
-use slog::*;
+use slog::Logger;
+use std::io;
 
-pub(super) fn cli(log: &Logger) -> Config {
+pub(super) fn cli(_log: &Logger) -> Result<Config, io::Error> {
     let app = App::new("Ferret")
         .version("0.0.1")
         .author("ChainSafe Systems <info@chainsafe.io>")
@@ -23,24 +24,14 @@ pub(super) fn cli(log: &Logger) -> Config {
         )
         .get_matches();
 
-    if app.is_present("Ferret") {
-        info!(log, "Ferret was run!");
-    }
-
-    if let Some(ref config_file) = app.value_of("config") {
+    if let Some(config_file) = app.value_of("config") {
         // Read from config file
-        let toml = match read_file(config_file.to_string()) {
-            Ok(contents) => contents,
-            Err(e) => panic!("{:?}", e),
-        };
+        let toml = read_file(config_file.to_string())?;
 
         // Parse and return the configuration file
-        return match read_toml(&toml) {
-            Ok(contents) => contents,
-            Err(e) => panic!("{:?}", e),
-        };
+        return Ok(read_toml(&toml)?);
     };
     // TODO in future parse all flags and append to a configuraiton object
     // Retrun defaults
-    Config::default()
+    Ok(Config::default())
 }

node/src/main.rs

@@ -14,7 +14,7 @@ fn main() {
     info!(log, "Starting Ferret");
 
     // Capture CLI inputs
-    let config = cli(&log);
+    let config = cli(&log).expect("CLI error");
 
     // Create the tokio runtime
     let rt = Runtime::new().unwrap();