minor fixes
authorthomasv <thomasv@gitorious>
Tue, 10 Sep 2013 14:13:30 +0000 (16:13 +0200)
committerthomasv <thomasv@gitorious>
Tue, 10 Sep 2013 14:13:30 +0000 (16:13 +0200)
lib/verifier.py
lib/wallet.py

index 097dd98..b2a9c9b 100644 (file)
@@ -27,12 +27,13 @@ from bitcoin import *
 class TxVerifier(threading.Thread):
     """ Simple Payment Verification """
 
-    def __init__(self, interface, blockchain, storage):
+    def __init__(self, network, storage):
         threading.Thread.__init__(self)
         self.daemon = True
         self.storage = storage
-        self.blockchain = blockchain
-        self.interface = interface
+        self.network = network
+        self.blockchain = network.blockchain
+        self.interface = network.interface
         self.transactions    = {}                                 # requested verifications (with height sent by the requestor)
         self.interface.register_channel('txverifier')
         self.verified_tx     = storage.get('verified_tx3',{})      # height, timestamp of verified transactions
@@ -143,7 +144,7 @@ class TxVerifier(threading.Thread):
             self.verified_tx[tx_hash] = (tx_height, timestamp, pos)
         print_error("verified %s"%tx_hash)
         self.storage.put('verified_tx3', self.verified_tx, True)
-        self.interface.trigger_callback('updated')
+        self.network.trigger_callback('updated')
 
 
     def hash_merkle_root(self, merkle_s, target_hash, pos):
index b247bfd..718f56e 100644 (file)
@@ -1351,7 +1351,7 @@ class Wallet:
         from verifier import TxVerifier
         self.network = network
         self.interface = network.interface
-        self.verifier = TxVerifier(self.interface, network.blockchain, self.storage)
+        self.verifier = TxVerifier(self.network, self.storage)
         self.verifier.start()
         self.set_verifier(self.verifier)
         self.synchronizer = WalletSynchronizer(self)