Make use of trigger_callback easier to understand

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

View File

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

View File

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

View File

@ -435,7 +435,7 @@ class Abstract_Wallet(PrintError):
self.storage.put('verified_tx3', self.verified_tx, True)
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):
'''Returns a map from tx hash to transaction height'''