AaronFiore/electrum
1
0
Fork 0
Code Activity

Make the verifier a thread job instead of a thread

Browse Source 
The verifier, like the synchronizer, now runs as part of the
network proxy thread.
This commit is contained in:
Neil Booth
2015-08-26 17:07:36 +09:00
parent 01491dd1d0
commit b64c42b1eb
3 changed files with 37 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/wallet.py
View File

@@ -1086,9 +1086,7 @@ class Abstract_Wallet(object):
return True
return False
def set_verifier(self, verifier):
self.verifier = verifier
def prepare_for_verifier(self):
# review transactions that are in the history
for addr, hist in self.history.items():
for tx_hash, tx_height in hist:
@@ -1107,9 +1105,9 @@ class Abstract_Wallet(object):
from verifier import SPV
self.network = network
if self.network is not None:
self.prepare_for_verifier()
self.verifier = SPV(self.network, self)
self.verifier.start()
self.set_verifier(self.verifier)
network.add_job(self.verifier)
self.synchronizer = Synchronizer(self, network)
network.add_job(self.synchronizer)
else:
@@ -1118,9 +1116,10 @@ class Abstract_Wallet(object):
def stop_threads(self):
if self.network:
self.verifier.stop()
self.network.remove_job(self.synchronizer)
self.network.remove_job(self.verifier)
self.synchronizer = None
self.verifier = None
self.storage.put('stored_height', self.get_local_height(), True)
def restore(self, cb):