Browse Source

network.send method

283
ThomasV 11 years ago
parent
commit
1f13b2f4f3
  1. 8
      lib/network.py
  2. 3
      lib/verifier.py

8
lib/network.py

@ -97,6 +97,14 @@ class Network(threading.Thread):
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):
with self.lock:
if not self.callbacks.get(event):

3
lib/verifier.py

@ -33,7 +33,6 @@ class TxVerifier(threading.Thread):
self.storage = storage
self.network = network
self.blockchain = network.blockchain
self.interface = network.interface
self.transactions = {} # requested verifications (with height sent by the requestor)
self.verified_tx = storage.get('verified_tx3',{}) # height, timestamp of verified transactions
self.merkle_roots = storage.get('merkle_roots',{}) # hashed by me
@ -106,7 +105,7 @@ class TxVerifier(threading.Thread):
if tx_hash not in self.verified_tx:
if self.merkle_roots.get(tx_hash) is None and tx_hash not in requested_merkle:
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)
try:

Loading…
Cancel
Save