AaronFiore/electrum
1
0
Fork 0
Code Activity

clean-up hw-wallet "get_password_for_storage_encryption"-related code

Browse Source
This commit is contained in:
SomberNight
2020-02-28 19:47:56 +01:00
parent 88650ed8d6
commit f8ba660583
5 changed files with 36 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/keystore.py
View File

@@ -765,12 +765,8 @@ class Hardware_KeyStore(Xpub, KeyStore):
return False
def get_password_for_storage_encryption(self) -> str:
from .storage import get_derivation_used_for_hw_device_encryption
client = self.plugin.get_client(self)
derivation = get_derivation_used_for_hw_device_encryption()
xpub = client.get_xpub(derivation, "standard")
password = self.get_pubkey_from_xpub(xpub, ()).hex()
return password
return client.get_password_for_storage_encryption()
def has_usable_connection_with_device(self) -> bool:
if not hasattr(self, 'plugin'):