AaronFiore/electrum
1
0
Fork 0
Code Activity

lnpeer: no need to raise GracefulDisconnect twice

Browse Source
This commit is contained in:
ThomasV
2022-03-09 13:47:53 +01:00
parent 47917d9e6c
commit 61eebb2b77
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
electrum/lnpeer.py
View File

@@ -314,12 +314,11 @@ class Peer(Logger):
pass pass
async def wait_for_message(self, expected_name, channel_id): async def wait_for_message(self, expected_name, channel_id):
# errors and warnings are sent to the queue with name set to None, so that this task terminates
q = self.ordered_message_queues[channel_id] q = self.ordered_message_queues[channel_id]
name, payload = await asyncio.wait_for(q.get(), LN_P2P_NETWORK_TIMEOUT) name, payload = await asyncio.wait_for(q.get(), LN_P2P_NETWORK_TIMEOUT)
if payload.get('error'): if name is None:
raise GracefulDisconnect(f'Waiting for {expected_name} failed due to an error sent by the peer.') return
elif payload.get('warning'):
raise GracefulDisconnect(f'Waiting for {expected_name} failed due to a warning sent by the peer.')
if name != expected_name: if name != expected_name:
raise Exception(f"Received unexpected '{name}'") raise Exception(f"Received unexpected '{name}'")
return payload return payload