From 60617d4d3999726e9be918d9fd4e5e7550237813 Mon Sep 17 00:00:00 2001 From: Dmitriy Ryajov Date: Wed, 5 Aug 2020 19:36:54 -0600 Subject: [PATCH] merge fixes --- libp2p/muxers/mplex/lpchannel.nim | 2 -- libp2p/stream/chronosstream.nim | 2 -- 2 files changed, 4 deletions(-) diff --git a/libp2p/muxers/mplex/lpchannel.nim b/libp2p/muxers/mplex/lpchannel.nim index 51d261327..33b6b9610 100644 --- a/libp2p/muxers/mplex/lpchannel.nim +++ b/libp2p/muxers/mplex/lpchannel.nim @@ -69,8 +69,6 @@ template withWriteLock(lock: AsyncLock, body: untyped): untyped = template withEOFExceptions(body: untyped): untyped = try: body - except CancelledError as exc: - raise exc except LPStreamEOFError as exc: trace "muxed connection EOF", exc = exc.msg except LPStreamClosedError as exc: diff --git a/libp2p/stream/chronosstream.nim b/libp2p/stream/chronosstream.nim index 366bc44eb..b536c9a6a 100644 --- a/libp2p/stream/chronosstream.nim +++ b/libp2p/stream/chronosstream.nim @@ -41,8 +41,6 @@ proc init*(C: type ChronosStream, template withExceptions(body: untyped) = try: body - except CancelledError as exc: - raise exc except TransportIncompleteError: # for all intents and purposes this is an EOF raise newLPStreamEOFError()