do the banner request in interface, not in wallet
This commit is contained in:
@@ -77,7 +77,8 @@ class Interface(threading.Thread):
|
||||
#json
|
||||
self.message_id = 0
|
||||
self.unanswered_requests = {}
|
||||
|
||||
#banner
|
||||
self.banner = ''
|
||||
|
||||
|
||||
def queue_json_response(self, c):
|
||||
@@ -106,6 +107,10 @@ class Interface(threading.Thread):
|
||||
if method == 'server.version':
|
||||
self.server_version = result
|
||||
|
||||
elif method == 'server.banner':
|
||||
self.banner = result
|
||||
self.trigger_callback('banner')
|
||||
|
||||
elif method == 'server.peers.subscribe':
|
||||
servers = {}
|
||||
for item in result:
|
||||
@@ -429,6 +434,7 @@ class Interface(threading.Thread):
|
||||
self.connect_event.set()
|
||||
if self.is_connected:
|
||||
self.send([('server.version', [ELECTRUM_VERSION, PROTOCOL_VERSION])])
|
||||
self.send([('server.banner',[])])
|
||||
self.trigger_callback('connected')
|
||||
else:
|
||||
self.trigger_callback('notconnected')
|
||||
|
||||
@@ -104,7 +104,6 @@ class Wallet:
|
||||
self.prevout_values = {} # my own transaction outputs
|
||||
self.spent_outputs = []
|
||||
self.receipt = None # next receipt
|
||||
self.banner = ''
|
||||
|
||||
# spv
|
||||
self.verifier = None
|
||||
@@ -951,7 +950,6 @@ class WalletSynchronizer(threading.Thread):
|
||||
self.interface = self.wallet.interface
|
||||
self.interface.register_channel('synchronizer')
|
||||
self.wallet.interface.register_callback('connected', lambda: self.wallet.set_up_to_date(False))
|
||||
self.wallet.interface.register_callback('connected', lambda: self.interface.send([('server.banner',[])],'synchronizer') )
|
||||
self.was_updated = True
|
||||
self.running = False
|
||||
self.lock = threading.Lock()
|
||||
@@ -1091,9 +1089,6 @@ class WalletSynchronizer(threading.Thread):
|
||||
self.wallet.tx_result = result
|
||||
self.wallet.tx_event.set()
|
||||
|
||||
elif method == 'server.banner':
|
||||
self.wallet.banner = result
|
||||
self.interface.trigger_callback('banner')
|
||||
else:
|
||||
print_error("Error: Unknown message:" + method + ", " + repr(params) + ", " + repr(result) )
|
||||
|
||||
|
||||
Reference in New Issue
Block a user