AaronFiore/electrum
1
0
Fork 0
Code Activity

network.send method

Browse Source
This commit is contained in:
ThomasV
2013-11-11 16:18:40 +01:00
parent 4eb767492b
commit 1f13b2f4f3
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/network.py
View File

@@ -97,6 +97,14 @@ class Network(threading.Thread):
self.interface.send( messages, callback ) self.interface.send( messages, callback )
def send(self, messages, callback):
if self.interface and self.interface.is_connected:
self.interface.send( messages, callback )
return True
else:
return False
def register_callback(self, event, callback): def register_callback(self, event, callback):
with self.lock: with self.lock:
if not self.callbacks.get(event): if not self.callbacks.get(event):

5
lib/verifier.py
View File

@@ -33,7 +33,6 @@ class TxVerifier(threading.Thread):
self.storage = storage self.storage = storage
self.network = network self.network = network
self.blockchain = network.blockchain self.blockchain = network.blockchain
self.interface = network.interface
self.transactions = {} # requested verifications (with height sent by the requestor) self.transactions = {} # requested verifications (with height sent by the requestor)
self.verified_tx = storage.get('verified_tx3',{}) # height, timestamp of verified transactions self.verified_tx = storage.get('verified_tx3',{}) # height, timestamp of verified transactions
self.merkle_roots = storage.get('merkle_roots',{}) # hashed by me self.merkle_roots = storage.get('merkle_roots',{}) # hashed by me
@@ -106,8 +105,8 @@ class TxVerifier(threading.Thread):
if tx_hash not in self.verified_tx: if tx_hash not in self.verified_tx:
if self.merkle_roots.get(tx_hash) is None and tx_hash not in requested_merkle: if self.merkle_roots.get(tx_hash) is None and tx_hash not in requested_merkle:
print_error('requesting merkle', tx_hash) print_error('requesting merkle', tx_hash)
self.interface.send([ ('blockchain.transaction.get_merkle',[tx_hash, tx_height]) ], lambda i,r: self.queue.put(r)) if self.network.send([ ('blockchain.transaction.get_merkle',[tx_hash, tx_height]) ], lambda i,r: self.queue.put(r)):
requested_merkle.append(tx_hash) requested_merkle.append(tx_hash)
try: try:
r = self.queue.get(timeout=1) r = self.queue.get(timeout=1)