Explorar el Código

fixed config parsing error

lunar-mining hace 5 años
padre
commit
7fc0658b94

+ 2 - 0
Cargo.lock

@@ -992,12 +992,14 @@ dependencies = [
  "regex",
  "rocksdb",
  "rusqlite",
+ "serde",
  "serde_json",
  "sha2",
  "signal-hook",
  "simplelog",
  "smol",
  "surf",
+ "toml",
  "zcash_primitives",
  "zcash_proofs",
  "zeromq",

+ 2 - 0
Cargo.toml

@@ -64,6 +64,8 @@ surf = "2.2.0"
 http-types = "2.9.0"
 async-h1 = "2.3.0"
 async-native-tls = "0.3.3"
+toml = "0.5.8"
+serde = "1.0.126"
 
 # zmq
 zeromq = { git="https://github.com/zeromq/zmq.rs", default-features = false, features = ["async-std-runtime", "all-transport"] }

+ 2 - 2
src/bin/darkfid.rs

@@ -227,11 +227,11 @@ async fn start(
 fn main() -> Result<()> {
     use simplelog::*;
 
-    let mut config = DarkfidCliConfig::load(PathBuf::from("darkfid_config_file"))?;
+    let mut config = DarkfidCliConfig::load(PathBuf::from("darkfid_config"))?;
     let options = Arc::new(DarkfidCli::load(&mut config)?);
 
     if options.change_config {
-        config.save(PathBuf::from("darkfid_config_file"))?;
+        config.save(PathBuf::from("darkfid_config"))?;
         return Ok(());
     }
 

+ 2 - 2
src/bin/drk.rs

@@ -109,11 +109,11 @@ async fn start(config: Arc<DrkCliConfig>, options: Arc<DrkCli>) -> Result<()> {
 fn main() -> Result<()> {
     use simplelog::*;
 
-    let mut config = DrkCliConfig::load(PathBuf::from("drk_config_file"))?;
+    let mut config = DrkCliConfig::load(PathBuf::from("drk_config"))?;
     let options = Arc::new(DrkCli::load(&mut config)?);
 
     if options.change_config {
-        config.save(PathBuf::from("drk_config_file"))?;
+        config.save(PathBuf::from("drk_config"))?;
         return Ok(());
     }
 

+ 1 - 0
src/cli/client_cli/cli_config.rs

@@ -1,6 +1,7 @@
 use crate::serial::{deserialize, serialize, Decodable, Encodable};
 use crate::util::join_config_path;
 use crate::Result;
+use log::*;
 
 use std::{fs::OpenOptions, io::prelude::*, path::PathBuf};
 

+ 1 - 1
src/cli/client_cli/darkfid_cli.rs

@@ -102,7 +102,7 @@ impl DarkfidCli {
                             println!("Change Log Path To {}", config.log_path);
                         }
                         if let Some(v) = c.value_of("password") {
-                            config.log_path = v.to_string();
+                            config.password = v.to_string();
                             println!("Updated password.");
                         }
                     }

+ 1 - 1
src/wallet/walletdb.rs

@@ -64,7 +64,7 @@ impl WalletDB {
         }
         else {
             println!("Password is empty. You must set a password to use the wallet.");
-            return Err(Error::EmptyPassword);
+            return Err(Error::EmptyPassword)
         }
         Ok(())
     }