From 32fd35843f28e3e44b0ab7198f939bf7637d5eff Mon Sep 17 00:00:00 2001 From: NikVolf Date: Sun, 27 Mar 2016 03:45:43 +0300 Subject: [PATCH] in cli call --- parity/main.rs | 4 ++-- util/src/keys/store.rs | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/parity/main.rs b/parity/main.rs index 12dd569a3..e9fd24c01 100644 --- a/parity/main.rs +++ b/parity/main.rs @@ -505,13 +505,13 @@ impl Configuration { File::open(filename).and_then(|mut f| f.read_to_string(&mut buffer)).unwrap_or_else(|_| die!("{} Unable to read password file. Ensure it exists and permissions are correct.", filename)); buffer }).collect::>(); - + let account_service = AccountService::new(); for d in &self.args.flag_unlock { let a = Address::from_str(clean_0x(&d)).unwrap_or_else(|_| { die!("{}: Invalid address for --unlock. Must be 40 hex characters, without the 0x at the beginning.", d) }); - if passwords.iter().find(|p| account_service.unlock_account(&a, p).is_ok()).is_none() { + if passwords.iter().find(|p| account_service.unlock_account_no_expire(&a, p).is_ok()).is_none() { die!("No password given to unlock account {}. Pass the password using `--password`.", a); } } diff --git a/util/src/keys/store.rs b/util/src/keys/store.rs index 3a55ae222..09c121493 100644 --- a/util/src/keys/store.rs +++ b/util/src/keys/store.rs @@ -154,7 +154,6 @@ impl AccountService { pub fn unlock_account_no_expire(&self, account: &Address, pass: &str) -> Result<(), EncryptedHashMapError> { self.secret_store.write().unwrap().unlock_account_with_expiration(account, pass, None) } - }