From: ThomasV <thomasv@gitorious>
Date: Thu, 15 Dec 2011 16:59:23 +0000 (+0300)
Subject: rename function; fix get_status
X-Git-Url: https://git.novaco.in/?a=commitdiff_plain;h=e3248100b04e291a137f67f26faa6176cae66280;hp=2c6d8a1dff02a206ead5f9a8eae80df35041fdf5;p=electrum-server.git

rename function; fix get_status
---

diff --git a/server.py b/server.py
index 3b6ac9c..b8f69c7 100755
--- a/server.py
+++ b/server.py
@@ -196,7 +196,7 @@ class MyStore(Datastore_class):
               JOIN pubkey ON (pubkey.pubkey_id = txout.pubkey_id)
              WHERE pubkey.pubkey_hash = ? """, (dbhash,))
 
-    def get_txpoints(self, addr):
+    def get_history(self, addr):
         
         if config.get('server','cache') == 'yes':
             cached_version = self.tx_cache.get( addr ) 
@@ -205,7 +205,8 @@ class MyStore(Datastore_class):
 
         version, binaddr = decode_check_address(addr)
         if binaddr is None:
-            return "err"
+            return None
+
         dbhash = self.binin(binaddr)
         rows = []
         rows += self.get_address_out_rows( dbhash )
@@ -415,7 +416,7 @@ def client_thread(ipaddr,conn):
                     if store.tx_cache.get( addr ) is not None: k += 1
 
                     # get addtess status, i.e. the last block for that address.
-                    tx_points = store.get_txpoints(addr)
+                    tx_points = store.get_history(addr)
                     if not tx_points:
                         status = None
                     else:
@@ -423,7 +424,7 @@ def client_thread(ipaddr,conn):
                         status = lastpoint['blk_hash']
                         # this is a temporary hack; move it up once old clients have disappeared
                         if status == 'mempool' and session['version'] != "old":
-                            status = status + ':%s'% lastpoint['tx_hash']
+                            status = status + ':%d'% len(tx_points)
 
                     last_status = addresses.get( addr )
                     if last_status != status:
@@ -439,7 +440,7 @@ def client_thread(ipaddr,conn):
         elif cmd == 'h': 
             # history
             address = data
-            out = repr( store.get_txpoints( address ) )
+            out = repr( store.get_history( address ) )
 
         elif cmd == 'load': 
             if config.get('server','password') == data: