lint: silence messages on "improper" f-string formatting.

The messages silenced in this commit are all:

On Python 3 '{}'.format(b'abc') produces "b'abc'"; use !r if this is a desired behavior

Sadly, `mypy` doesn't say which particular fields are problematic; I've
tried my best to single them out - hopefully, nothing extraneous got in.

Author: veox

eth/chains/base.py

@@ -225,8 +225,8 @@ def from_genesis(cls,
             # the computed state from the initialized state database.
             raise ValidationError(
                 "The provided genesis state root does not match the computed "
-                f"genesis state root.  Got {state.state_root}.  "
-                f"Expected {genesis_params['state_root']}"
+                f"genesis state root.  Got {state.state_root!r}.  "
+                f"Expected {genesis_params['state_root']!r}"
             )
 
         genesis_header = BlockHeader(**genesis_params)
@@ -419,8 +419,8 @@ def import_block(self,
         except HeaderNotFound:
             raise ValidationError(
                 f"Attempt to import block #{block.number}.  "
-                f"Cannot import block {block.hash} before importing "
-                f"its parent block at {block.header.parent_hash}"
+                f"Cannot import block {block.hash!r} before importing "
+                f"its parent block at {block.header.parent_hash!r}"
             )
 
         base_header_for_import = self.create_header_from_parent(parent_header)

eth/consensus/clique/_utils.py

@@ -139,10 +139,10 @@ def validate_header_integrity(header: BlockHeaderAPI, epoch_length: int) -> None
         )
 
     if header.nonce != NONCE_AUTH and header.nonce != NONCE_DROP:
-        raise ValidationError(f"Invalid nonce: {header.nonce}")
+        raise ValidationError(f"Invalid nonce: {header.nonce!r}")
 
     if at_checkpoint and header.nonce != NONCE_DROP:
-        raise ValidationError(f"Invalid checkpoint nonce: {header.nonce}")
+        raise ValidationError(f"Invalid checkpoint nonce: {header.nonce!r}")
 
     if len(header.extra_data) < VANITY_LENGTH:
         raise ValidationError("Missing vanity bytes in extra data")
@@ -159,7 +159,7 @@ def validate_header_integrity(header: BlockHeaderAPI, epoch_length: int) -> None
         raise ValidationError("Checkpoint header must contain list of signers")
 
     if header.mix_hash != ZERO_HASH32:
-        raise ValidationError(f"Invalid mix hash: {header.mix_hash}")
+        raise ValidationError(f"Invalid mix hash: {header.mix_hash!r}")
 
     if header.uncles_hash != EMPTY_UNCLE_HASH:
         raise ValidationError(f"Invalid uncle hash: {header.uncle_hash}")

eth/consensus/clique/datatypes.py

@@ -46,7 +46,7 @@ def validate_for(self,
         if not signer_is_kicked and not signer_is_nominated:
             raise ValidationError(
                 "Must either kick an existing signer or nominate a new signer"
-                f"Subject: {subject} Current signers: {signers}"
+                f"Subject: {subject!r} Current signers: {signers}"
             )
 
 

eth/consensus/clique/snapshot_manager.py

@@ -220,16 +220,16 @@ def get_snapshot(self, block_number: int, block_hash: Hash32) -> Snapshot:
                 # Otherwise, we can retrieve it on the fly
                 header = self._chain_db.get_block_header_by_hash(block_hash)
             except HeaderNotFound:
-                raise SnapshotNotFound(f"Can not get snapshot for {block_hash} at {block_number}")
+                raise SnapshotNotFound(f"Can not get snapshot for {block_hash!r} at {block_number}")
             else:
                 if header.block_number != block_number:
                     raise SnapshotNotFound(
-                        f"Can not get snapshot for {block_hash} at {block_number}"
+                        f"Can not get snapshot for {block_hash!r} at {block_number}"
                     )
                 else:
                     return self._create_snapshot_from_checkpoint_header(header)
 
-        raise SnapshotNotFound(f"Can not get snapshot for {block_hash} at {block_number}")
+        raise SnapshotNotFound(f"Can not get snapshot for {block_hash!r} at {block_number}")
 
     def add_snapshot(self, mutable_snapshot: MutableSnapshot) -> Snapshot:
         """
@@ -256,7 +256,7 @@ def get_snapshot_from_db(self, block_hash: Hash32) -> Snapshot:
             encoded_key = self._chain_db.db[key]
         except KeyError as e:
             raise SnapshotNotFound(
-                f"Can not get on-disk snapshot for {block_hash}"
+                f"Can not get on-disk snapshot for {block_hash!r}"
             )
         else:
             return decode_snapshot(encoded_key)

eth/db/chain.py

@@ -84,7 +84,7 @@ def get_block_uncles(self, uncles_hash: Hash32) -> Tuple[BlockHeaderAPI, ...]:
             encoded_uncles = self.db[uncles_hash]
         except KeyError:
             raise HeaderNotFound(
-                f"No uncles found for hash {uncles_hash}"
+                f"No uncles found for hash {uncles_hash!r}"
             )
         else:
             return tuple(rlp.decode(encoded_uncles, sedes=rlp.sedes.CountableList(BlockHeader)))

eth/db/header.py

@@ -254,7 +254,7 @@ def _set_as_canonical_chain_head(
             header = cls._get_block_header_by_hash(db, block_hash)
         except HeaderNotFound:
             raise ValueError(
-                f"Cannot use unknown block hash as canonical head: {block_hash}"
+                f"Cannot use unknown block hash as canonical head: {block_hash!r}"
             )
 
         new_canonical_headers = tuple(reversed(

eth/tools/fixtures/helpers.py

@@ -76,13 +76,13 @@ def verify_state(expected_state: AccountState, state: StateAPI) -> None:
             if field == 'balance':
                 error_messages.append(
                     f"{to_normalized_address(account)}(balance) | "
-                    f"Actual: {actual_value} | Expected: {expected_value} | "
+                    f"Actual: {actual_value!r} | Expected: {expected_value!r} | "
                     f"Delta: {cast(int, actual_value) - cast(int, expected_value)}"
                 )
             else:
                 error_messages.append(
                     f"{to_normalized_address(account)}({field}) | "
-                    f"Actual: {actual_value} | Expected: {expected_value}"
+                    f"Actual: {actual_value!r} | Expected: {expected_value!r}"
                 )
         raise AssertionError(
             f"State DB did not match expected state on {len(error_messages)} values:{new_line}"

eth/validation.py

@@ -111,7 +111,7 @@ def validate_lt(value: int, maximum: int, title: str="Value") -> None:
 def validate_canonical_address(value: Address, title: str="Value") -> None:
     if not isinstance(value, bytes) or not len(value) == 20:
         raise ValidationError(
-            f"{title} {value} is not a valid canonical address"
+            f"{title} {value!r} is not a valid canonical address"
         )
 
 

eth/vm/base.py

@@ -502,7 +502,7 @@ def validate_block(self, block: BlockAPI) -> None:
         if tx_root_hash != block.header.transaction_root:
             raise ValidationError(
                 f"Block's transaction_root ({block.header.transaction_root}) "
-                f"does not match expected value: {tx_root_hash}"
+                f"does not match expected value: {tx_root_hash!r}"
             )
 
         if len(block.uncles) > MAX_UNCLES:

eth/vm/forks/frontier/validation.py

@@ -17,7 +17,7 @@ def validate_frontier_transaction(state: StateAPI,
 
     if sender_balance < gas_cost:
         raise ValidationError(
-            f"Sender {transaction.sender} cannot afford txn gas "
+            f"Sender {transaction.sender!r} cannot afford txn gas "
             f"{gas_cost} with account balance {sender_balance}"
         )