From 206e38fb7c50323b0194e269c614255195959b6a Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Thu, 12 Nov 2015 16:08:37 +0900
Subject: [PATCH] Make use of trigger_callback easier to understand

---
 lib/network.py      | 7 +++----
 lib/synchronizer.py | 2 +-
 lib/wallet.py       | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/lib/network.py b/lib/network.py
index 2054b856c..43352e18f 100644
--- a/lib/network.py
+++ b/lib/network.py
@@ -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)
diff --git a/lib/synchronizer.py b/lib/synchronizer.py
index 9b512671a..8762ea0d4 100644
--- a/lib/synchronizer.py
+++ b/lib/synchronizer.py
@@ -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')
 
diff --git a/lib/wallet.py b/lib/wallet.py
index 7cbc81a07..80c208975 100644
--- a/lib/wallet.py
+++ b/lib/wallet.py
@@ -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'''