From 2d66a4f5aad9720e67963f17614451d2bf77b9ea Mon Sep 17 00:00:00 2001
From: Neil Booth <kyuupichan@gmail.com>
Date: Wed, 8 Aug 2018 12:07:36 +0900
Subject: [PATCH] aiorpcX 0.7.0 has better string text for TaskTimeout

---
 electrumx/server/peers.py | 8 +++-----
 electrumx_rpc             | 2 --
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/electrumx/server/peers.py b/electrumx/server/peers.py
index 737e943..64e5fd7 100644
--- a/electrumx/server/peers.py
+++ b/electrumx/server/peers.py
@@ -231,16 +231,14 @@ class PeerManager(object):
                 is_good = True
                 break
             except BadPeerError as e:
-                self.logger.error(f'{peer_text} marking bad: ({e!r})')
+                self.logger.error(f'{peer_text} marking bad: ({e})')
                 peer.mark_bad()
                 break
             except RPCError as e:
                 self.logger.error(f'{peer_text} RPC error: {e.message} '
                                   f'({e.code})')
-            except TaskTimeout as e:
-                self.logger.error(f'{peer_text} timed out after {e.args[0]}s')
-            except (OSError, SOCKSError, ConnectionError) as e:
-                self.logger.info(f'{peer_text} {e!r}')
+            except (OSError, SOCKSError, ConnectionError, TaskTimeout) as e:
+                self.logger.info(f'{peer_text} {e}')
 
         if is_good:
             now = time.time()
diff --git a/electrumx_rpc b/electrumx_rpc
index c8bc1d0..cd7a1ac 100755
--- a/electrumx_rpc
+++ b/electrumx_rpc
@@ -128,8 +128,6 @@ def main():
         except OSError:
             print('cannot connect - is ElectrumX catching up, not running, or '
                   f'is {port} the wrong RPC port?')
-        except TaskTimeout as e:
-            print(f'request timed out after {e.args[0]}s')
         except Exception as e:
             print(f'error making request: {e!r}')