commit
ed2db4be80
|
@ -334,14 +334,14 @@ class Network(util.DaemonThread):
|
|||
for request in requests:
|
||||
message_id = self.queue_request(request[0], request[1])
|
||||
self.unanswered_requests[message_id] = request
|
||||
for addr in self.subscribed_addresses:
|
||||
self.queue_request('blockchain.address.subscribe', [addr])
|
||||
self.queue_request('server.banner', [])
|
||||
self.queue_request('server.donation_address', [])
|
||||
self.queue_request('server.peers.subscribe', [])
|
||||
for i in bitcoin.FEE_TARGETS:
|
||||
self.queue_request('blockchain.estimatefee', [i])
|
||||
self.queue_request('blockchain.relayfee', [])
|
||||
for addr in self.subscribed_addresses:
|
||||
self.queue_request('blockchain.address.subscribe', [addr])
|
||||
|
||||
def get_status_value(self, key):
|
||||
if key == 'status':
|
||||
|
@ -441,6 +441,8 @@ class Network(util.DaemonThread):
|
|||
self.print_error("stopping network")
|
||||
for interface in self.interfaces.values():
|
||||
self.close_interface(interface)
|
||||
if self.interface:
|
||||
self.close_interface(self.interface)
|
||||
assert self.interface is None
|
||||
assert not self.interfaces
|
||||
self.connecting = set()
|
||||
|
@ -678,6 +680,7 @@ class Network(util.DaemonThread):
|
|||
# Responses to connection attempts?
|
||||
while not self.socket_queue.empty():
|
||||
server, socket = self.socket_queue.get()
|
||||
if server in self.connecting:
|
||||
self.connecting.remove(server)
|
||||
if socket:
|
||||
self.new_interface(server, socket)
|
||||
|
|
Loading…
Reference in New Issue