fixed no-password option so it now passes the test

JoinMarket-Org · Apr 14, 2017 · 49ec790 · 49ec790
1 parent e40c423
commit 49ec790
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/joinmarket/wallet.py b/joinmarket/wallet.py
@@ -179,14 +179,15 @@ def read_wallet_file_data(self, filename, pwd=None):
         decrypted = False
         trieddefault = False
         while not decrypted:
-            if not trieddefault:
-                password = ''
-                trieddefault = True
+            if pwd:
+                password = pwd
             else:
-                if pwd:
-                    password = pwd
+                if not trieddefault:
+                    password = ''
+                    trieddefault = True
                 else:
                     password = getpass('Enter wallet decryption passphrase: ')
+
             password_key = btc.bin_dbl_sha256(password)
             encrypted_seed = walletdata['encrypted_seed']
             try: