AaronFiore/electrum
1
0
Fork 0
Code Activity

network: clean-up. make external API clear. rm interface_lock (mostly).

Browse Source
This commit is contained in:
SomberNight
2018-09-25 16:38:26 +02:00
parent 7cc628dc79
commit 952e9b87e1
14 changed files with 254 additions and 282 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
electrum/gui/text.py
View File

@@ -365,7 +365,8 @@ class ElectrumGui:
self.wallet.labels[tx.txid()] = self.str_description
self.show_message(_("Please wait..."), getchar=False)
status, msg = self.network.broadcast_transaction_from_non_network_thread(tx)
status, msg = self.network.run_from_another_thread(
self.network.broadcast_transaction(tx))
if status:
self.show_message(_('Payment sent.'))
@@ -410,7 +411,8 @@ class ElectrumGui:
return False
if out.get('server') or out.get('proxy'):
proxy = electrum.network.deserialize_proxy(out.get('proxy')) if out.get('proxy') else proxy_config
self.network.set_parameters(NetworkParameters(host, port, protocol, proxy, auto_connect))
net_params = NetworkParameters(host, port, protocol, proxy, auto_connect)
self.network.run_from_another_thread(self.network.set_parameters(net_params))
def settings_dialog(self):
fee = str(Decimal(self.config.fee_per_kb()) / COIN)