miner for swarm to read configs from swarm_temp and not from HOME/.0L (…

…#488)

ol/miner/src/commands.rs

@@ -14,8 +14,7 @@ use abscissa_core::{
     config::Override, Command, Configurable, FrameworkError, Help, Options, Runnable,
 };
 use std::path::PathBuf;
-use dirs;
-use libra_global_constants::NODE_HOME;
+use crate::entrypoint;
 
 /// MinerApp Configuration Filename
 pub const CONFIG_FILE: &str = "0L.toml";
@@ -49,14 +48,14 @@ impl Configurable<AppCfg> for MinerCmd {
         // If you'd like for a missing configuration file to be a hard error
         // instead, always return `Some(CONFIG_FILE)` here.
 
-        let mut config_path = dirs::home_dir()
-        .unwrap();
-        config_path.push(NODE_HOME);
+        let mut config_path = entrypoint::get_node_home();
         config_path.push(CONFIG_FILE);
 
         if config_path.exists() {
+            println!("initializing miner from config file: {:?}", config_path);
             Some(config_path)
         } else {
+            println!("miner config file not existing: {:?}", config_path);
             None
         }
     }

ol/miner/src/commands/start_cmd.rs

@@ -48,11 +48,12 @@ impl Runnable for StartCmd {
             ..
         } = entrypoint::get_args();
 
-        //TODO(mortonbits): In the case of swarm this needs to take from swarm_temp/0/, and not from  ~/.0L, as I think is happening here.
+        // config reading respects swarm setup
+        // so also cfg.get_waypoint will return correct data
         let cfg = app_config().clone();
 
         let waypoint = if waypoint.is_none() {
-            match cfg.get_waypoint(swarm_path.clone()) {
+            match cfg.get_waypoint(None) {
                 Some(w) => Some(w),
                 _ => {
                     status_err!("Cannot start without waypoint, exiting");

ol/miner/src/entrypoint.rs

@@ -5,6 +5,7 @@ use abscissa_core::{
     Options, Runnable    
 };
 use libra_types::{account_address::AccountAddress, waypoint::Waypoint};
+use libra_global_constants::NODE_HOME;
 use reqwest::Url;
 use std::path::PathBuf;
 
@@ -158,4 +159,28 @@ pub type EntryPointTxsCmd = EntryPoint<commands::MinerCmd>;
 /// get arguments passed in the entrypoin of this app, not the subcommands
 pub fn get_args() -> EntryPointTxsCmd {
   Command::from_env_args()
-}
+}
+
+/// returns node_home
+/// usually something like "/root/.0L"
+/// in case of swarm like "....../swarm_temp/0" for alice
+/// in case of swarm like "....../swarm_temp/1" for bob
+pub fn get_node_home() -> PathBuf {
+    let mut config_path = dirs::home_dir().unwrap();
+    config_path.push(NODE_HOME);
+    let entry_args = get_args();
+
+    if entry_args.swarm_path.is_some() {
+        config_path = PathBuf::from(entry_args.swarm_path.unwrap());
+        if entry_args.swarm_persona.is_some() {
+            let persona = &entry_args.swarm_persona.unwrap();
+            let all_personas = vec!["alice", "bob", "carol", "dave"];
+            let index = all_personas.iter().position(|&r| r == persona).unwrap();
+            config_path.push(index.to_string());
+        } else {
+            config_path.push("0"); // default
+        }
+    }
+
+    return config_path;
+ }