[#86] Add support for providing --data-dir to CLI (#87)

* [#86] Add support for providing `--data-dir` to CLI

minor comment

Add readme example

* Fix merge conflict and update code to new models

README.md

@@ -50,3 +50,5 @@ Here are some CLI arguments you can pass to `zecwallet-cli`. Please run `zecwall
     * Example: `./zecwallet-cli --seed "twenty four words seed phrase"`
  * `--recover`: Attempt to recover the seed phrase from a corrupted wallet
 
+ * `--data-dir`: uses the specified path as data directory.
+    * Example: `./zecwallet-cli --server 127.0.0.1:9067 --data-dir /Users/ZecWalletRocks/my-test-wallet` will use the provided directory to store `zecwallet-light-wallet.dat` and logs. If the provided directory does not exist, it will create it.

cli/src/lib.rs

@@ -43,7 +43,13 @@ macro_rules! configure_clapapp {
                 .value_name("server")
                 .help("Lightwalletd server to connect to.")
                 .takes_value(true)
-                .default_value(lightclient::lightclient_config::DEFAULT_SERVER))
+                .default_value(lightclient::lightclient_config::DEFAULT_SERVER)
+                .takes_value(true))
+            .arg(Arg::with_name("data-dir")
+                .long("data-dir")
+                .value_name("data-dir")
+                .help("Absolute path to use as data directory")
+                .takes_value(true))
             .arg(Arg::with_name("COMMAND")
                 .help("Command to execute. If a command is not specified, zecwallet-cli will start in interactive mode.")
                 .required(false)
@@ -74,12 +80,13 @@ pub fn startup(
     server: http::Uri,
     seed: Option<String>,
     birthday: u64,
+    data_dir: Option<String>,
     first_sync: bool,
     print_updates: bool,
 ) -> io::Result<(Sender<(String, Vec<String>)>, Receiver<String>)> {
     // Try to get the configuration
-    let (config, latest_block_height) = LightClientConfig::create(MainNetwork, server.clone())?;
-
+    let (config, latest_block_height) = LightClientConfig::create(MainNetwork, server.clone(), data_dir)?;
+    
     let lightclient = match seed {
         Some(phrase) => Arc::new(LightClient::new_from_phrase(phrase, &config, birthday, false)?),
         None => {
@@ -242,4 +249,6 @@ pub fn attempt_recover_seed(_password: Option<String>) {
         data_dir: None,
         params: MainNetwork,
     };
+
 }
+

cli/src/main.rs

@@ -29,6 +29,8 @@ pub fn main() {
 
     let maybe_server = matches.value_of("server").map(|s| s.to_string());
 
+    let maybe_data_dir = matches.value_of("data-dir").map(|s| s.to_string());
+
     let seed = matches.value_of("seed").map(|s| s.to_string());
     let maybe_birthday = matches.value_of("birthday");
 
@@ -60,7 +62,7 @@ pub fn main() {
 
     let nosync = matches.is_present("nosync");
 
-    let startup_chan = startup(server, seed, birthday, !nosync, command.is_none());
+    let startup_chan = startup(server, seed, birthday, maybe_data_dir ,!nosync, command.is_none());
     let (command_tx, resp_rx) = match startup_chan {
         Ok(c) => c,
         Err(e) => {

lib/src/lightclient/lightclient_config.rs

@@ -108,7 +108,7 @@ impl<P: consensus::Parameters> LightClientConfig<P> {
         }
     }
 
-    pub fn create(params: P, server: http::Uri) -> io::Result<(LightClientConfig<P>, u64)> {
+    pub fn create(params: P, server: http::Uri, data_dir: Option<String>) -> io::Result<(LightClientConfig<P>, u64)> {
         use std::net::ToSocketAddrs;
 
         let s = server.clone();
@@ -131,16 +131,19 @@ impl<P: consensus::Parameters> LightClientConfig<P> {
                 Ok::<_, std::io::Error>((info.chain_name, info.sapling_activation_height, info.block_height))
             })
         {
+
+            // Create a Light Client Config
             let config = LightClientConfig {
                 server: s,
                 chain_name,
                 monitor_mempool: false,
                 sapling_activation_height,
                 anchor_offset: DEFAULT_ANCHOR_OFFSET,
-                data_dir: None,
+                data_dir: data_dir,
                 params,
             };
 
+
             Ok((config, block_height))
         } else {
             return Err(io::Error::new(
@@ -194,6 +197,7 @@ impl<P: consensus::Parameters> LightClientConfig<P> {
             PathBuf::from(&self.data_dir.as_ref().unwrap()).into_boxed_path()
         } else {
             let mut zcash_data_location;
+            // If there's some --data-dir path provided, use it
             if self.data_dir.is_some() {
                 zcash_data_location = PathBuf::from(&self.data_dir.as_ref().unwrap());
             } else {