LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-28 16:01:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

standardize error messages in synchronizer

Browse source
This commit is contained in:
ThomasV 2015-03-14 09:29:44 +01:00
parent 8e7ce452f6
commit 4ebefc6e4c
1 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
lib/synchronizer.py
View file

@ -23,7 +23,6 @@ import Queue
import bitcoin import bitcoin
import util import util
from util import print_error
from transaction import Transaction from transaction import Transaction
@ -34,7 +33,6 @@ class WalletSynchronizer(util.DaemonThread):
self.wallet = wallet self.wallet = wallet
self.network = network self.network = network
self.was_updated = True self.was_updated = True
self.lock = threading.Lock()
self.queue = Queue.Queue() self.queue = Queue.Queue()
self.address_queue = Queue.Queue() self.address_queue = Queue.Queue()
@ -70,7 +68,7 @@ class WalletSynchronizer(util.DaemonThread):
missing_tx.append( (tx_hash, tx_height) ) missing_tx.append( (tx_hash, tx_height) )
if missing_tx: if missing_tx:
print_error("missing tx", missing_tx) self.print_error("missing tx", missing_tx)
# subscriptions # subscriptions
self.subscribe_to_addresses(self.wallet.addresses(True)) self.subscribe_to_addresses(self.wallet.addresses(True))
@ -124,7 +122,7 @@ class WalletSynchronizer(util.DaemonThread):
result = r.get('result') result = r.get('result')
error = r.get('error') error = r.get('error')
if error: if error:
print_error("error", r) self.print_error("error", r)
continue continue
if method == 'blockchain.address.subscribe': if method == 'blockchain.address.subscribe':
@ -136,7 +134,7 @@ class WalletSynchronizer(util.DaemonThread):
elif method == 'blockchain.address.get_history': elif method == 'blockchain.address.get_history':
addr = params[0] addr = params[0]
print_error("receiving history", addr, result) self.print_error("receiving history", addr, result)
if result == ['*']: if result == ['*']:
assert requested_histories.pop(addr) == '*' assert requested_histories.pop(addr) == '*'
self.wallet.receive_history_callback(addr, result) self.wallet.receive_history_callback(addr, result)
@ -175,10 +173,10 @@ class WalletSynchronizer(util.DaemonThread):
self.wallet.receive_tx_callback(tx_hash, tx, tx_height) self.wallet.receive_tx_callback(tx_hash, tx, tx_height)
self.was_updated = True self.was_updated = True
requested_tx.remove( (tx_hash, tx_height) ) requested_tx.remove( (tx_hash, tx_height) )
print_error("received tx:", tx_hash, len(tx.raw)) self.print_error("received tx:", tx_hash, len(tx.raw))
else: else:
print_error("Error: Unknown message:" + method + ", " + repr(params) + ", " + repr(result) ) self.print_error("Error: Unknown message:" + method + ", " + repr(params) + ", " + repr(result) )
if self.was_updated and not requested_tx: if self.was_updated and not requested_tx:
self.network.trigger_callback('updated') self.network.trigger_callback('updated')