Merge pull request #749 from chrisglass/clean-tests-wallet

Add tests to the wallet.py module.

diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
index b8dccc7..1715139 100644 (file)
--- a/gui/qt/main_window.py
+++ b/gui/qt/main_window.py
@@ -748,7 +748,7 @@ class ElectrumWindow(QMainWindow):
     def new_receive_address(self):
         domain = self.wallet.get_account_addresses(self.current_account, include_change=False)
         for addr in domain:
-            if not self.wallet.address_is_old(addr) and addr not in self.receive_requests.keys():
+            if not self.wallet.history.get(addr) and addr not in self.receive_requests.keys():
                 break
         else:
             if isinstance(self.wallet, Imported_Wallet):
@@ -765,7 +765,7 @@ class ElectrumWindow(QMainWindow):
         self.receive_requests = self.wallet.storage.get('receive_requests',{}) 
         domain = self.wallet.get_account_addresses(self.current_account, include_change=False)
         for addr in domain:
-            if not self.wallet.address_is_old(addr) and addr not in self.receive_requests.keys():
+            if not self.wallet.history.get(addr) and addr not in self.receive_requests.keys():
                 break
         else:
             addr = ''

diff --git a/lib/paymentrequest.py b/lib/paymentrequest.py
index 9d5bae9..6e97e21 100644 (file)
--- a/lib/paymentrequest.py
+++ b/lib/paymentrequest.py
@@ -249,7 +249,7 @@ class PaymentRequest:
 
         for o in pay_det.outputs:
             addr = transaction.get_address_from_output_script(o.script)[1]
-            self.outputs.append( (addr, o.amount) )
+            self.outputs.append( ('address', addr, o.amount) )
 
         self.memo = self.details.memo
 
@@ -269,7 +269,7 @@ class PaymentRequest:
         return self.details.expires
 
     def get_amount(self):
-        return sum(map(lambda x:x[1], self.outputs))
+        return sum(map(lambda x:x[2], self.outputs))
 
     def get_domain(self):
         return self.domain
@@ -294,7 +294,7 @@ class PaymentRequest:
         paymnt.transactions.append(raw_tx)
 
         ref_out = paymnt.refund_to.add()
-        ref_out.script = transaction.Transaction.pay_script(refund_addr)
+        ref_out.script = transaction.Transaction.pay_script('address', refund_addr)
         paymnt.memo = "Paid using Electrum"
         pm = paymnt.SerializeToString()
 

diff --git a/lib/transaction.py b/lib/transaction.py
index 45dda05..f15aa23 100644 (file)
--- a/lib/transaction.py
+++ b/lib/transaction.py
@@ -522,7 +522,7 @@ class Transaction:
             pubkey = public_key_from_private_key(privkey)
             address = address_from_private_key(privkey)
             u = network.synchronous_get([ ('blockchain.address.listunspent',[address])])[0]
-            pay_script = klass.pay_script(address)
+            pay_script = klass.pay_script('address', address)
             for item in u:
                 item['scriptPubKey'] = pay_script
                 item['redeemPubkey'] = pubkey

diff --git a/lib/wallet.py b/lib/wallet.py
index e14006e..3b68c2a 100644 (file)
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -1245,7 +1245,7 @@ class Deterministic_Wallet(Abstract_Wallet):
             return False
         prev_addresses = prev_addresses[max(0, i - limit):]
         for addr in prev_addresses:
-            if self.address_is_old(addr):
+            if self.history.get(addr):
                 return False
         return True