First version of code changes

trinity/protocol/les/exchanges.py

@@ -11,9 +11,7 @@
 from trinity.protocol.common.exchanges import (
     BaseExchange,
 )
-# Q: What is the order to imports?  and why sometimes new line between imports and sometimes not?
 from trinity.protocol.common.types import BlockBodyBundles
-from trinity.rlp.block_body import BlockBody
 from trinity.utils.les import (
     gen_request_id,
 )
@@ -69,8 +67,8 @@ async def __call__(  # type: ignore
             timeout,
         )
 
-# Q: Where can I find the correct signature for this class?
-class GetBlockBodiesExchange(LESExchange[Tuple[BlockBody, ...]]):
+
+class GetBlockBodiesExchange(LESExchange[BlockBodyBundles]):
     _normalizer = GetBlockBodiesNormalizer()
     request_class = GetBlockBodiesRequest
     tracker_class = GetBlockBodiesTracker

trinity/protocol/les/normalizers.py

@@ -8,22 +8,33 @@
 from eth.rlp.headers import BlockHeader
 
 from trinity.protocol.common.normalizers import BaseNormalizer
-from trinity.rlp.block_body import BlockBody
+from trinity.protocol.common.types import BlockBodyBundles
+
 
 TResult = TypeVar('TResult')
 LESNormalizer = BaseNormalizer[Dict[str, Any], TResult]
 
 
-# Q: Shouldn't this be named GetBlockHeadersNormalizer?
 class BlockHeadersNormalizer(LESNormalizer[Tuple[BlockHeader, ...]]):
     @staticmethod
     def normalize_result(message: Dict[str, Any]) -> Tuple[BlockHeader, ...]:
         result = message['headers']
         return result
 
 
-class GetBlockBodiesNormalizer(LESNormalizer[Tuple[BlockBody, ...]]):
+class GetBlockBodiesNormalizer(LESNormalizer[BlockBodyBundles]):
     @staticmethod
-    def normalize_result(message: Dict[str, Any]) -> Tuple[BlockBody, ...]:
-        result = message['bodies']
-        return result
+    def normalize_result(message: Dict[str, Any]) -> BlockBodyBundles:
+        bodies = message['bodies']
+
+        uncles_hashes = tuple(map(
+            compose(keccak, rlp.encode),
+            tuple(body.uncles for body in bodies)
+        ))
+        transaction_roots_and_trie_data = tuple(map(
+            make_trie_root_and_nodes,
+            tuple(body.transactions for body in bodies)
+        ))
+
+        body_bundles = tuple(zip(bodies, transaction_roots_and_trie_data, uncles_hashes))
+        return body_bundles

trinity/protocol/les/requests.py

@@ -45,8 +45,9 @@ def __init__(self,
         self.reverse = reverse
         self.request_id = request_id
 
+LESRequest = BaseRequest[Dict[str, Any]]
 
-class GetBlockHeadersRequest(BaseRequest[Dict[str, Any]]):
+class GetBlockHeadersRequest(LESRequest):
     cmd_type = GetBlockHeaders
     response_type = BlockHeaders
 
@@ -67,7 +68,7 @@ def __init__(self,
         }
 
 
-class GetBlockBodiesRequest(BaseRequest[Tuple[Hash32, ...]]):
+class GetBlockBodiesRequest(LESRequest):
     cmd_type = GetBlockBodies
     response_type = BlockBodies
 

trinity/protocol/les/trackers.py

@@ -6,7 +6,7 @@
 from eth.rlp.headers import BlockHeader
 
 from trinity.protocol.common.trackers import BasePerformanceTracker
-from trinity.rlp.block_body import BlockBody
+from trinity.protocol.common.types import BlockBodyBundles
 from trinity.utils.headers import sequence_builder
 
 from .requests import (
@@ -43,17 +43,16 @@ def _get_result_item_count(self, result: Tuple[BlockHeader, ...]) -> int:
 
 BaseGetBlockBodiesTracker = BasePerformanceTracker[
     GetBlockBodiesRequest,
-    Tuple[BlockBody, ...],
+    BlockBodyBundles,
 ]
 
 
-# Q: Where can I find the signature for this class?
 class GetBlockBodiesTracker(BaseGetBlockBodiesTracker):
     def _get_request_size(self, request: GetBlockBodiesRequest) -> Optional[int]:
         return len(request.command_payload['block_hashes'])
 
-    def _get_result_size(self, result: Tuple[BlockBody, ...]) -> int:
+    def _get_result_size(self, result: BlockBodyBundles) -> int:
         return len(result)
 
-    def _get_result_item_count(self, result: Tuple[BlockBody, ...]) -> int:
+    def _get_result_item_count(self, result: BlockBodyBundles) -> int:
         return len(result)

trinity/protocol/les/validators.py

@@ -39,9 +39,7 @@ def validate_result(self, response: BlockBodyBundles) -> None:
         }
         unexpected_keys = actual_keys.difference(expected_keys)
         if unexpected_keys:
-            raise ValidationError(
-                "Got {0} unexpected block bodies".format(len(unexpected_keys))
-            )
+            raise ValidationError(f"Got {len(unexpected_keys)} unexpected block bodies")
 
 
 def match_payload_request_id(request: Dict[str, Any], response: Dict[str, Any]) -> None: