rebase cleanup

Author: pipermerriam

p2p/peer.py

@@ -1063,16 +1063,16 @@ async def request_stuff() -> None:
             peer_pool.logger.info("Waiting for peer connection...")
             await asyncio.sleep(0.2)
         peer = peer_pool.highest_td_peer
-        headers = await peer.requests.get_block_headers(2440319, max_headers=100)
-        hashes = [header.hash for header in headers]
+        headers = await cast(ETHPeer, peer).requests.get_block_headers(2440319, max_headers=100)
+        hashes = tuple(header.hash for header in headers)
         if peer_class == ETHPeer:
             peer = cast(ETHPeer, peer)
             peer.sub_proto._send_get_block_bodies(hashes)
             peer.sub_proto._send_get_receipts(hashes)
         else:
             peer = cast(LESPeer, peer)
             request_id = 1
-            peer.sub_proto.send_get_block_bodies(hashes, request_id + 1)
+            peer.sub_proto.send_get_block_bodies(list(hashes), request_id + 1)
             peer.sub_proto.send_get_receipts(hashes[0], request_id + 2)
 
     sigint_received = asyncio.Event()

trinity/protocol/eth/managers.py

@@ -6,7 +6,6 @@
 )
 
 from cytoolz import (
-    concat,
     compose,
 )
 
@@ -178,7 +177,7 @@ async def _normalize_response(self,
         return receipt_bundles
 
     def _get_item_count(self, msg: ReceiptsByBlock) -> int:
-        return len(concat(msg))
+        return sum(len(item) for item in msg)
 
 
 # (BlockBody, (txn_root, txn_trie_data), uncles_hash)

trinity/protocol/eth/proto.py

@@ -73,7 +73,7 @@ def send_handshake(self, head_info: 'ChainInfo') -> None:
     #
     # Node Data
     #
-    def send_get_node_data(self, request: Union[NodeDataRequest, Tuple[Hash32, ...]]) -> None:
+    def send_get_node_data(self, request: NodeDataRequest) -> None:
         self._send_get_node_data(request.node_hashes)
 
     def _send_get_node_data(self, node_hashes: Tuple[Hash32, ...]) -> None: