AaronFiore/electrum
1
0
Fork 0
Code Activity

call wallet.wait_until_synchronized before commands

Browse Source
This commit is contained in:
ThomasV
2015-10-29 05:01:06 +01:00
parent b70f8c888a
commit 079cb311ec
5 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/wallet.py
View File

@@ -314,11 +314,6 @@ class Abstract_Wallet(PrintError):
def is_up_to_date(self):
with self.lock: return self.up_to_date
def update(self):
self.up_to_date = False
while not self.is_up_to_date():
time.sleep(0.1)
def is_imported(self, addr):
account = self.accounts.get(IMPORTED_ACCOUNT)
if account:
@@ -1135,21 +1130,23 @@ class Abstract_Wallet(PrintError):
self.verifier = None
self.storage.put('stored_height', self.get_local_height(), True)
def restore(self, callback):
def wait_until_synchronized(self, callback=None):
from i18n import _
def wait_for_wallet():
self.set_up_to_date(False)
while not self.is_up_to_date():
msg = "%s\n%s %d"%(
_("Please wait..."),
_("Addresses generated:"),
len(self.addresses(True)))
apply(callback, (msg,))
if callback:
msg = "%s\n%s %d"%(
_("Please wait..."),
_("Addresses generated:"),
len(self.addresses(True)))
apply(callback, (msg,))
time.sleep(0.1)
def wait_for_network():
while not self.network.is_connected():
msg = "%s \n" % (_("Connecting..."))
apply(callback, (msg,))
if callback:
msg = "%s \n" % (_("Connecting..."))
apply(callback, (msg,))
time.sleep(0.1)
# wait until we are connected, because the user might have selected another server
if self.network: