BTCPrivate
/
electrum-bitcoinprivate
mirror of https://github.com/BTCPrivate/electrum-bitcoinprivate.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #3258 from SomberNight/wallet_check_password_dedup 

wallet.check_password() remove code duplication
This commit is contained in:
ThomasV 2017-11-09 22:21:01 +01:00 committed by GitHub
parent d0cb19a0b2 bdfd3e7190
commit 23c0269252
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/wallet.py
View File

@ -1339,6 +1339,9 @@ class Abstract_Wallet(PrintError):
def has_password(self):
return self.storage.get('use_encryption', False)
def check_password(self, password):
self.keystore.check_password(password)
def sign_message(self, address, message, password):
index = self.get_address_index(address)
return self.keystore.sign_message(index, message, password)
@ -1364,9 +1367,6 @@ class Simple_Wallet(Abstract_Wallet):
def can_change_password(self):
return self.keystore.can_change_password()
def check_password(self, password):
self.keystore.check_password(password)
def update_password(self, old_pw, new_pw, encrypt=False):
if old_pw is None and self.has_password():
raise InvalidPassword()
@ -1394,9 +1394,6 @@ class Imported_Wallet(Simple_Wallet):
def get_keystores(self):
return [self.keystore] if self.keystore else []
def check_password(self, password):
self.keystore.check_password(password)
def can_import_privkey(self):
return bool(self.keystore)
@ -1792,9 +1789,6 @@ class Multisig_Wallet(Deterministic_Wallet):
self.storage.set_password(new_pw, encrypt)
self.storage.write()
def check_password(self, password):
self.keystore.check_password(password)
def has_seed(self):
return self.keystore.has_seed()