From: ThomasV <thomasv1@gmx.de>
Date: Wed, 25 Jun 2014 10:07:51 +0000 (+0200)
Subject: Merge pull request #733 from chrisglass/add-more-tests
X-Git-Url: https://git.novaco.in/?p=electrum-nvc.git;a=commitdiff_plain;h=935286fe1cd597cb32f57ddbb2da34dcaaea8b7f;hp=7525fe0696f2833ee456ed9e3e6747ba7f9af648

Merge pull request #733 from chrisglass/add-more-tests

Add more tests
---

diff --git a/lib/wallet.py b/lib/wallet.py
index eb9a039..467a11c 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -128,6 +128,10 @@ class WalletStorage:
 
 
 class Abstract_Wallet:
+    """
+    Wallet classes are created to handle various address generation methods.
+    Completion states (watching-only, single account, no seed, etc) are handled inside classes.
+    """
 
     def __init__(self, storage):
         self.storage = storage
@@ -1252,8 +1256,7 @@ class Deterministic_Wallet(Abstract_Wallet):
             return False
         prev_addresses = prev_addresses[max(0, i - limit):]
         for addr in prev_addresses:
-            num, is_used = self.is_used(addr)
-            if num > 0:
+            if self.address_is_old(addr):
                 return False
         return True
 
diff --git a/plugins/qrscanner.py b/plugins/qrscanner.py
index 66a05d9..e99a0bc 100644
--- a/plugins/qrscanner.py
+++ b/plugins/qrscanner.py
@@ -137,7 +137,7 @@ class Plugin(BasePlugin):
                 if self.config.get("video_device") == "default":
                     self.video_device_edit.setText("")
                 else:
-                    self.video_device_edit.setText(self.config.get("video_device"))
+                    self.video_device_edit.setText(self.config.get("video_device",''))
             else:
                 custom_device_label.setVisible(False)
                 self.video_device_edit.setVisible(False)