cleanup storage and fix tracvis test

2017-03-06 08:33:35 +01:00
parent ee2e9f6092
commit 411832c4ce
10 changed files with 62 additions and 71 deletions
--- a/gui/text.py
+++ b/gui/text.py
@@ -22,8 +22,9 @@ class ElectrumGui:
        if not storage.file_exists:
            print "Wallet not found. try 'electrum create'"
            exit()
-        password = getpass.getpass('Password:', stream=None) if storage.is_encrypted() else None
-        storage.read(password)
+        if storage.is_encrypted():
+            password = getpass.getpass('Password:', stream=None)
+            storage.decrypt(password)
        self.wallet = Wallet(storage)
        self.wallet.start_threads(self.network)
        self.contacts = StoreDict(self.config, 'contacts')