AaronFiore/electrum
1
0
Fork 0
Code Activity

python 3.8: adapt to breaking changes re asyncio.CancelledError

Browse Source 
(and TimeoutError)

closes #5798
This commit is contained in:
SomberNight
2019-12-11 23:07:47 +01:00
parent fa9b997c70
commit 308517d473
5 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
electrum/tests/test_lnpeer.py
View File

@@ -5,6 +5,8 @@ import os
from contextlib import contextmanager
from collections import defaultdict
import logging
import concurrent
from concurrent import futures
from electrum.network import Network
from electrum.ecc import ECPrivkey
@@ -236,7 +238,7 @@ class TestPeer(ElectrumTestCase):
gath = asyncio.gather(pay(), p1._message_loop(), p2._message_loop())
async def f():
await gath
with self.assertRaises(asyncio.CancelledError):
with self.assertRaises(concurrent.futures.CancelledError):
run(f())
def test_channel_usage_after_closing(self):

10
electrum/tests/test_lntransport.py
View File

@@ -38,7 +38,7 @@ class TestLNTransport(ElectrumTestCase):
asyncio.get_event_loop().run_until_complete(transport.handshake(epriv=e_priv))
def test_loop(self):
l = asyncio.get_event_loop()
loop = asyncio.get_event_loop()
responder_shaked = asyncio.Event()
server_shaked = asyncio.Event()
responder_key = ECPrivkey.generate_random_key()
@@ -50,7 +50,7 @@ class TestLNTransport(ElectrumTestCase):
self.assertEqual(await t.read_messages().__anext__(), b'hello from client')
responder_shaked.set()
server_future = asyncio.ensure_future(asyncio.start_server(cb, '127.0.0.1', 42898))
l.run_until_complete(server_future)
loop.run_until_complete(server_future)
async def connect():
peer_addr = LNPeerAddr('127.0.0.1', 42898, responder_key.get_public_key_bytes())
t = LNTransport(initiator_key.get_secret_bytes(), peer_addr)
@@ -59,6 +59,6 @@ class TestLNTransport(ElectrumTestCase):
self.assertEqual(await t.read_messages().__anext__(), b'hello from server')
server_shaked.set()
asyncio.ensure_future(connect())
l.run_until_complete(responder_shaked.wait())
l.run_until_complete(server_shaked.wait())
connect_future = asyncio.ensure_future(connect())
loop.run_until_complete(responder_shaked.wait())
loop.run_until_complete(server_shaked.wait())