Add timeout option to GetBlockHeadersExchange

Author: carver

trinity/protocol/common/exchanges.py

@@ -66,6 +66,7 @@ async def get_result(
             normalizer,
             result_validator.validate_result,
             message_validator,
+            timeout=timeout
         )
 
     @abstractmethod

trinity/protocol/eth/exchanges.py

@@ -60,13 +60,20 @@ async def __call__(  # type: ignore
             block_number_or_hash: BlockIdentifier,
             max_headers: int = None,
             skip: int = 0,
-            reverse: bool = True) -> Tuple[BlockHeader, ...]:
+            reverse: bool = True,
+            timeout: int = None) -> Tuple[BlockHeader, ...]:
 
         original_request_args = (block_number_or_hash, max_headers, skip, reverse)
         validator = GetBlockHeadersValidator(*original_request_args)
         request = GetBlockHeadersRequest(*original_request_args)
 
-        return await self.get_result(request, self._normalizer, validator, noop_payload_validator)
+        return await self.get_result(
+            request,
+            self._normalizer,
+            validator,
+            noop_payload_validator,
+            timeout,
+        )
 
 
 BaseNodeDataExchange = BaseExchange[Tuple[Hash32, ...], Tuple[bytes, ...], NodeDataBundles]

trinity/protocol/les/exchanges.py

@@ -40,7 +40,8 @@ async def __call__(  # type: ignore
             block_number_or_hash: BlockIdentifier,
             max_headers: int = None,
             skip: int = 0,
-            reverse: bool = True) -> Tuple[BlockHeader, ...]:
+            reverse: bool = True,
+            timeout: int = None) -> Tuple[BlockHeader, ...]:
 
         original_request_args = (block_number_or_hash, max_headers, skip, reverse)
         validator = GetBlockHeadersValidator(*original_request_args)
@@ -53,4 +54,5 @@ async def __call__(  # type: ignore
             self._normalizer,
             validator,
             match_payload_request_id,
+            timeout,
         )