electrum

commit 3aa76f18085b561a4f55bdbb6d6ee71ac22b031a
parent 9d3c8efddabce6899aba225774d16d686dfbefd6
Author: ThomasV <thomasv@gitorious>
Date:   Tue, 15 Oct 2013 18:23:47 +0200

fix bug with chunk requestor

Diffstat:
M
gui/qt/main_window.py
 | 
3
++-
M
lib/blockchain.py
 | 
7
+++++--

2 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/gui/qt/main_window.py b/gui/qt/main_window.py
@@ -679,11 +679,12 @@ class ElectrumWindow(QMainWindow):
         self.history_list.clear()
         for item in self.wallet.get_tx_history(self.current_account):
             tx_hash, conf, is_mine, value, fee, balance, timestamp = item
+            time_str = _("unknown")
             if conf > 0:
                 try:
                     time_str = datetime.datetime.fromtimestamp( timestamp).isoformat(' ')[:-3]
                 except:
-                    time_str = _("unknown")
+                    time_str = _("error")
 
             if conf == -1:
                 time_str = 'unverified'
diff --git a/lib/blockchain.py b/lib/blockchain.py
@@ -226,6 +226,7 @@ class Blockchain(threading.Thread):
             socket.setdefaulttimeout(30)
             print_error("downloading ", self.headers_url )
             urllib.urlretrieve(self.headers_url, filename)
+            print_error("done.")
         except:
             print_error( "download failed. creating file", filename )
             open(filename,'wb+').close()
@@ -381,11 +382,12 @@ class Blockchain(threading.Thread):
         queue = Queue.Queue()
         min_index = (self.local_height + 1)/2016
         max_index = (height + 1)/2016
+
         for n in range(min_index, max_index + 1):
-            print_error( "requesting chunk", n )
             i.send([ ('blockchain.block.get_chunk',[n])], lambda i,r:queue.put(r))
             requested_chunks.append(n)
-            break
+
+        print_error( "requested chunks:", requested_chunks )
 
         while requested_chunks:
             try:
@@ -406,6 +408,7 @@ class Blockchain(threading.Thread):
             try:
                 self.verify_chunk(index, result)
             except:
+                print_error('Verify chunk failed!!')
                 return False
             requested_chunks.remove(index)