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

Make use of trigger_callback easier to understand

Browse source
This commit is contained in:
Neil Booth 2015-11-12 16:08:37 +09:00
parent 51ebdc5ce8
commit 206e38fb7c
3 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
lib/network.py
View file

@ -198,10 +198,10 @@ class Network(util.DaemonThread):
with self.lock: with self.lock:
self.callbacks[event].append(callback) self.callbacks[event].append(callback)
def trigger_callback(self, event, params=()): def trigger_callback(self, event, *args):
with self.lock: with self.lock:
callbacks = self.callbacks[event][:] callbacks = self.callbacks[event][:]
[callback(*params) for callback in callbacks] [callback(*args) for callback in callbacks]
def read_recent_servers(self): def read_recent_servers(self):
if not self.config.path: if not self.config.path:
@ -294,11 +294,10 @@ class Network(util.DaemonThread):
return value return value
def notify(self, key): def notify(self, key):
value = self.get_status_value(key)
if key in ['status', 'updated']: if key in ['status', 'updated']:
self.trigger_callback(key) self.trigger_callback(key)
else: else:
self.trigger_callback(key, (value,)) self.trigger_callback(key, self.get_status_value(key))
def get_parameters(self): def get_parameters(self):
host, port, protocol = deserialize_server(self.default_server) host, port, protocol = deserialize_server(self.default_server)

2
lib/synchronizer.py
View file

@ -129,7 +129,7 @@ class Synchronizer(ThreadJob):
self.print_error("received tx %s height: %d bytes: %d" % self.print_error("received tx %s height: %d bytes: %d" %
(tx_hash, tx_height, len(tx.raw))) (tx_hash, tx_height, len(tx.raw)))
# callbacks # callbacks
self.network.trigger_callback('new_transaction', (tx,)) self.network.trigger_callback('new_transaction', tx)
if not self.requested_tx: if not self.requested_tx:
self.network.trigger_callback('updated') self.network.trigger_callback('updated')

2
lib/wallet.py
View file

@ -435,7 +435,7 @@ class Abstract_Wallet(PrintError):
self.storage.put('verified_tx3', self.verified_tx, True) self.storage.put('verified_tx3', self.verified_tx, True)
conf, timestamp = self.get_confirmations(tx_hash) conf, timestamp = self.get_confirmations(tx_hash)
self.network.trigger_callback('verified', (tx_hash, conf, timestamp)) self.network.trigger_callback('verified', tx_hash, conf, timestamp)
def get_unverified_txs(self): def get_unverified_txs(self):
'''Returns a map from tx hash to transaction height''' '''Returns a map from tx hash to transaction height'''