wizard: start wallet threads

diff --git a/gui/gui_classic.py b/gui/gui_classic.py
index ce13c07..2eef11e 100644 (file)
--- a/gui/gui_classic.py
+++ b/gui/gui_classic.py
@@ -2221,7 +2221,7 @@ class ElectrumGui:
         storage = WalletStorage(self.config)
         if not storage.file_exists:
             import installwizard
-            wizard = installwizard.InstallWizard(self.config, self.interface, storage)
+            wizard = installwizard.InstallWizard(self.config, self.interface, self.blockchain, storage)
             wallet = wizard.run()
             if not wallet: 
                 exit()

diff --git a/gui/installwizard.py b/gui/installwizard.py
index baa22e0..691e128 100644 (file)
--- a/gui/installwizard.py
+++ b/gui/installwizard.py
@@ -3,7 +3,7 @@ from PyQt4.QtCore import *
 import PyQt4.QtCore as QtCore
 from i18n import _
 
-from electrum import Wallet, mnemonic, WalletVerifier, WalletSynchronizer
+from electrum import Wallet, mnemonic
 
 from seed_dialog import SeedDialog
 from network_dialog import NetworkDialog
@@ -14,10 +14,11 @@ import sys
 
 class InstallWizard(QDialog):
 
-    def __init__(self, config, interface, storage):
+    def __init__(self, config, interface, blockchain, storage):
         QDialog.__init__(self)
         self.config = config
         self.interface = interface
+        self.blockchain = blockchain
         self.storage = storage
 
 
@@ -148,7 +149,6 @@ class InstallWizard(QDialog):
         if not a: exit()
 
         wallet = Wallet(self.storage)
-        wallet.interface = self.interface
 
         if a =='create':
             wallet.init_seed(None)
@@ -180,11 +180,7 @@ class InstallWizard(QDialog):
         #self.interface.start(wait = False)
 
         # start wallet threads
-        verifier = WalletVerifier(self.interface, self.storage)
-        verifier.start()
-        wallet.set_verifier(verifier)
-        synchronizer = WalletSynchronizer(wallet)
-        synchronizer.start()
+        wallet.start_threads(self.interface, self.blockchain)
 
 
         # generate the first addresses, in case we are offline

diff --git a/lib/blockchain.py b/lib/blockchain.py
index 03f2878..c84ea71 100644 (file)
--- a/lib/blockchain.py
+++ b/lib/blockchain.py
@@ -125,7 +125,7 @@ class BlockchainVerifier(threading.Thread):
                     requested_headers.remove(result.get('block_height'))
                 else:
                     self.height = result.get('block_height')
-                    self.interface.poke('synchronizer')
+                    ## fixme # self.interface.poke('synchronizer')
                 
                 self.pending_headers.sort(key=lambda x: x.get('block_height'))
                 # print "pending headers", map(lambda x: x.get('block_height'), self.pending_headers)