Use logger without init in protocol server

Author: carver

trinity/protocol/common/servers.py

@@ -15,23 +15,19 @@
     Hash32,
 )
 from eth.rlp.headers import BlockHeader
-
 from p2p import protocol
+from p2p.cancellable import CancellableMixin
 from p2p.peer import BasePeer, PeerSubscriber
 from p2p.protocol import (
     Command,
     _DecodedMsgType,
 )
 from p2p.service import BaseService
 
-from trinity.protocol.common.peer import BaseChainPeerPool
-
-from eth.tools.logging import TraceLogger
-
-from p2p.cancellable import CancellableMixin
-
 from trinity.db.header import AsyncHeaderDB
+from trinity.protocol.common.peer import BaseChainPeerPool
 from trinity.protocol.common.requests import BaseHeaderRequest
+from trinity.utils.logging import HasTraceLogger
 
 
 class BaseRequestServer(BaseService, PeerSubscriber):
@@ -83,10 +79,9 @@ async def _handle_msg(self, peer: BasePeer, cmd: Command, msg: _DecodedMsgType)
         pass
 
 
-class BasePeerRequestHandler(CancellableMixin):
-    def __init__(self, db: AsyncHeaderDB, logger: TraceLogger, token: CancelToken) -> None:
+class BasePeerRequestHandler(CancellableMixin, HasTraceLogger):
+    def __init__(self, db: AsyncHeaderDB, token: CancelToken) -> None:
         self.db = db
-        self.logger = logger
         self.cancel_token = token
 
     async def lookup_headers(self,

trinity/protocol/eth/servers.py

@@ -31,7 +31,6 @@
 
 from eth.rlp.receipts import Receipt
 from eth.rlp.transactions import BaseTransactionFields
-from eth.tools.logging import TraceLogger
 
 from trinity.protocol.eth.constants import (
     MAX_BODIES_FETCH,
@@ -43,8 +42,8 @@
 
 
 class ETHPeerRequestHandler(BasePeerRequestHandler):
-    def __init__(self, db: AsyncChainDB, logger: TraceLogger, token: CancelToken) -> None:
-        super().__init__(db, logger, token)
+    def __init__(self, db: AsyncChainDB, token: CancelToken) -> None:
+        super().__init__(db, token)
         self.db: AsyncChainDB = db
 
     async def handle_get_block_headers(
@@ -142,7 +141,7 @@ def __init__(
             peer_pool: ETHPeerPool,
             token: CancelToken = None) -> None:
         super().__init__(peer_pool, token)
-        self._handler = ETHPeerRequestHandler(db, self.logger, self.cancel_token)
+        self._handler = ETHPeerRequestHandler(db, self.cancel_token)
 
     async def _handle_msg(self, base_peer: BasePeer, cmd: Command,
                           msg: protocol._DecodedMsgType) -> None:

trinity/protocol/les/servers.py

@@ -54,7 +54,7 @@ def __init__(
             peer_pool: LESPeerPool,
             token: CancelToken = None) -> None:
         super().__init__(peer_pool, token)
-        self._handler = LESPeerRequestHandler(db, self.logger, self.cancel_token)
+        self._handler = LESPeerRequestHandler(db, self.cancel_token)
 
     async def _handle_msg(self, base_peer: BasePeer, cmd: Command,
                           msg: _DecodedMsgType) -> None: