Mysterious spontaneous linter issues

p2p/discovery.py

@@ -917,9 +917,9 @@ def _pack_v4(cmd_id: int, payload: Sequence[Any], privkey: datatypes.PrivateKey)
     See https://github.com/ethereum/devp2p/blob/master/rlpx.md#node-discovery for information on
     how UDP packets are structured.
     """
-    cmd_id = to_bytes(cmd_id)
+    cmd_id_bytes = to_bytes(cmd_id)
     expiration = rlp.sedes.big_endian_int.serialize(_get_msg_expiration())
-    encoded_data = cmd_id + rlp.encode(tuple(payload) + (expiration,))
+    encoded_data = cmd_id_bytes + rlp.encode(tuple(payload) + (expiration,))
     signature = privkey.sign_msg(encoded_data)
     message_hash = keccak(signature.to_bytes() + encoded_data)
     return message_hash + signature.to_bytes() + encoded_data

trinity/_utils/eip1085.py

@@ -124,14 +124,18 @@ def validate_raw_eip1085_genesis_config(genesis_config: RawEIP1085Dict) -> None:
         raise ValidationError(str(err)) from err
 
 
+def hex_to_block_number(hex_encoded_number: str) -> BlockNumber:
+    return BlockNumber(to_int(hexstr=hex_encoded_number))
+
+
 @to_tuple
 def _extract_vm_config(vm_config: Dict[str, str]) -> Iterable[VMFork]:
     if 'frontierForkBlock' in vm_config.keys():
-        yield to_int(hexstr=vm_config['frontierForkBlock']), FrontierVM
+        yield hex_to_block_number(vm_config['frontierForkBlock']), FrontierVM
     if 'homesteadForkBlock' in vm_config.keys():
-        homestead_fork_block = to_int(hexstr=vm_config['homesteadForkBlock'])
+        homestead_fork_block = hex_to_block_number(vm_config['homesteadForkBlock'])
         if 'DAOForkBlock' in vm_config:
-            dao_fork_block_number = to_int(hexstr=vm_config['DAOForkBlock'])
+            dao_fork_block_number = hex_to_block_number(vm_config['DAOForkBlock'])
 
             HomesteadVM = MainnetDAOValidatorVM.configure(
                 _dao_fork_block_number=dao_fork_block_number,
@@ -140,17 +144,17 @@ def _extract_vm_config(vm_config: Dict[str, str]) -> Iterable[VMFork]:
         else:
             yield homestead_fork_block, BaseHomesteadVM
     if 'EIP150ForkBlock' in vm_config.keys():
-        yield to_int(hexstr=vm_config['EIP150ForkBlock']), TangerineWhistleVM
+        yield hex_to_block_number(vm_config['EIP150ForkBlock']), TangerineWhistleVM
     if 'EIP158ForkBlock' in vm_config.keys():
-        yield to_int(hexstr=vm_config['EIP158ForkBlock']), SpuriousDragonVM
+        yield hex_to_block_number(vm_config['EIP158ForkBlock']), SpuriousDragonVM
     if 'byzantiumForkBlock' in vm_config.keys():
-        yield to_int(hexstr=vm_config['byzantiumForkBlock']), ByzantiumVM
+        yield hex_to_block_number(vm_config['byzantiumForkBlock']), ByzantiumVM
     if 'constantinopleForkBlock' in vm_config.keys():
-        yield to_int(hexstr=vm_config['constantinopleForkBlock']), ConstantinopleVM
+        yield hex_to_block_number(vm_config['constantinopleForkBlock']), ConstantinopleVM
     if 'petersburgForkBlock' in vm_config.keys():
-        yield to_int(hexstr=vm_config['petersburgForkBlock']), PetersburgVM
+        yield hex_to_block_number(vm_config['petersburgForkBlock']), PetersburgVM
     if 'istanbulForkBlock' in vm_config.keys():
-        yield to_int(hexstr=vm_config['istanbulForkBlock']), IstanbulVM
+        yield hex_to_block_number(vm_config['istanbulForkBlock']), IstanbulVM
 
 
 @to_tuple

trinity/protocol/eth/commands.py

@@ -13,6 +13,9 @@
 from eth.rlp.receipts import Receipt
 from eth.rlp.transactions import BaseTransactionFields
 
+from p2p.abc import (
+    SerializationCodecAPI,
+)
 from p2p.commands import BaseCommand, RLPCodec
 
 from trinity.protocol.common.payloads import BlockHeadersQuery
@@ -51,7 +54,7 @@ class Status(BaseCommand[StatusPayload]):
 
 class NewBlockHashes(BaseCommand[Tuple[NewBlockHash, ...]]):
     protocol_command_id = 1
-    serialization_codec = RLPCodec(
+    serialization_codec: SerializationCodecAPI[Tuple[NewBlockHash, ...]] = RLPCodec(
         sedes=NEW_BLOCK_HASHES_STRUCTURE,
         process_inbound_payload_fn=apply_formatter_to_array(lambda args: NewBlockHash(*args)),
     )