AaronFiore/electrum
1
0
Fork 0
Code Activity

update to aiorpcx 0.18

Browse Source
This commit is contained in:
SomberNight
2019-05-27 19:35:30 +02:00
parent eaf203dbb5
commit 41f160dd74
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/requirements/requirements.txt
View File

@@ -5,7 +5,7 @@ protobuf
dnspython dnspython
jsonrpclib-pelix jsonrpclib-pelix
qdarkstyle<3.0 qdarkstyle<3.0
aiorpcx>=0.17,<0.18 aiorpcx>=0.18,<0.19
aiohttp>=3.3.0 aiohttp>=3.3.0
aiohttp_socks aiohttp_socks
certifi certifi

15
electrum/interface.py
View File

@@ -39,6 +39,7 @@ import aiorpcx
from aiorpcx import RPCSession, Notification, NetAddress from aiorpcx import RPCSession, Notification, NetAddress
from aiorpcx.curio import timeout_after, TaskTimeout from aiorpcx.curio import timeout_after, TaskTimeout
from aiorpcx.jsonrpc import JSONRPC from aiorpcx.jsonrpc import JSONRPC
from aiorpcx.rawsocket import RSClient
import certifi import certifi
from .util import ignore_exceptions, log_exceptions, bfh, SilentTaskGroup from .util import ignore_exceptions, log_exceptions, bfh, SilentTaskGroup
@@ -172,7 +173,7 @@ class ErrorGettingSSLCertFromServer(Exception): pass
class ConnectError(Exception): pass class ConnectError(Exception): pass
class _Connector(aiorpcx.Connector): class _RSClient(RSClient):
async def create_connection(self): async def create_connection(self):
try: try:
return await super().create_connection() return await super().create_connection()
@@ -392,9 +393,9 @@ class Interface(Logger):
async def get_certificate(self): async def get_certificate(self):
sslc = ssl.SSLContext() sslc = ssl.SSLContext()
try: try:
async with _Connector(RPCSession, async with _RSClient(session_factory=RPCSession,
host=self.host, port=self.port, host=self.host, port=self.port,
ssl=sslc, proxy=self.proxy) as session: ssl=sslc, proxy=self.proxy) as session:
return session.transport._ssl_protocol._sslpipe._sslobj.getpeercert(True) return session.transport._ssl_protocol._sslpipe._sslobj.getpeercert(True)
except ValueError: except ValueError:
return None return None
@@ -430,9 +431,9 @@ class Interface(Logger):
return self.network.default_server == self.server return self.network.default_server == self.server
async def open_session(self, sslc, exit_early=False): async def open_session(self, sslc, exit_early=False):
async with _Connector(NotificationSession, async with _RSClient(session_factory=NotificationSession,
host=self.host, port=self.port, host=self.host, port=self.port,
ssl=sslc, proxy=self.proxy) as session: ssl=sslc, proxy=self.proxy) as session:
self.session = session # type: NotificationSession self.session = session # type: NotificationSession
self.session.interface = self self.session.interface = self
self.session.set_default_timeout(self.network.get_network_timeout_seconds(NetworkTimeout.Generic)) self.session.set_default_timeout(self.network.get_network_timeout_seconds(NetworkTimeout.Generic))