LBRYFoundation/LBRY-Vault
1
0
Fork 0
mirror of https://github.com/LBRYFoundation/LBRY-Vault.git synced 2025-08-30 17:01:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

move get_index from network to session

Browse source
This commit is contained in:
SomberNight 2018-09-11 20:37:53 +02:00
parent e829d6bbcf
commit 8b8ca14c6d
No known key found for this signature in database
GPG key ID: B33B5F232C6271E9
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
electrum/interface.py
View file

@ -54,7 +54,7 @@ class NotificationSession(ClientSession):
# will catch the exception, count errors, and at some point disconnect # will catch the exception, count errors, and at some point disconnect
if isinstance(request, Notification): if isinstance(request, Notification):
params, result = request.args[:-1], request.args[-1] params, result = request.args[:-1], request.args[-1]
key = request.method + repr(params) key = self.get_index(request.method, params)
if key in self.subscriptions: if key in self.subscriptions:
self.cache[key] = result self.cache[key] = result
for queue in self.subscriptions[key]: for queue in self.subscriptions[key]:
@ -70,7 +70,7 @@ class NotificationSession(ClientSession):
timeout) timeout)
async def subscribe(self, method, params, queue): async def subscribe(self, method, params, queue):
key = method + repr(params) key = self.get_index(method, params)
if key in self.subscriptions: if key in self.subscriptions:
self.subscriptions[key].append(queue) self.subscriptions[key].append(queue)
result = self.cache[key] result = self.cache[key]
@ -88,6 +88,11 @@ class NotificationSession(ClientSession):
if queue in v: if queue in v:
v.remove(queue) v.remove(queue)
@classmethod
def get_index(cls, method, params):
"""Hashable index for subscriptions and cache"""
return str(method) + repr(params)
# FIXME this is often raised inside a TaskGroup, but then it's not silent :( # FIXME this is often raised inside a TaskGroup, but then it's not silent :(
class GracefulDisconnect(AIOSafeSilentException): pass class GracefulDisconnect(AIOSafeSilentException): pass

5
electrum/network.py
View file

@ -598,11 +598,6 @@ class Network(PrintError):
self.recent_servers = self.recent_servers[0:20] self.recent_servers = self.recent_servers[0:20]
self.save_recent_servers() self.save_recent_servers()
@classmethod
def get_index(cls, method, params):
""" hashable index for subscriptions and cache"""
return str(method) + (':' + str(params[0]) if params else '')
@with_interface_lock @with_interface_lock
def connection_down(self, server): def connection_down(self, server):
'''A connection to server either went down, or was never made. '''A connection to server either went down, or was never made.