Appease lint

Author: lithp

eth/db/header.py

@@ -1,5 +1,5 @@
 import functools
-from typing import Iterable, Tuple
+from typing import cast, Iterable, Tuple
 
 import rlp
 
@@ -89,7 +89,7 @@ def _get_canonical_head(cls, db: DatabaseAPI) -> BlockHeaderAPI:
     @classmethod
     def _get_canonical_head_hash(cls, db: DatabaseAPI) -> Hash32:
         try:
-            return db[SchemaV1.make_canonical_head_hash_lookup_key()]
+            return cast(Hash32, db[SchemaV1.make_canonical_head_hash_lookup_key()])
         except KeyError:
             raise CanonicalHeadNotFound("No canonical head set for this chain")
 

eth/db/trie_iteration.py

@@ -55,14 +55,14 @@ def __str__(self) -> str:
                 f"hash={self.keccak.hex()}"
                 f" path={self.path_rest}"
                 f" child={self.obj[1].hex()}"
-                 ")"
+                f")"
             )
         if self.kind == NodeKind.LEAF:
             return (
                 "TrieNode<Leaf>("
                 f"hash={self.keccak.hex()}"
                 f" path={self.path_rest[:10]}..."
-                 ")"
+                f")"
             )
         return f"TrieNode(kind={self.kind.name} hash={self.keccak.hex()})"
 
@@ -104,7 +104,7 @@ def _get_children_with_nibbles(node: TrieNode, prefix: Nibbles) -> Iterable[Tupl
 
 def _get_node(db: ChainDB, node_hash: Hash32) -> TrieNode:
     if len(node_hash) < 32:
-        node_rlp = node_hash
+        node_rlp = cast(bytes, node_hash)
     else:
         node_rlp = db.get(node_hash)
 

scripts/gethimport.py

@@ -9,7 +9,6 @@
 import os
 import os.path
 from pathlib import Path
-import shutil
 import snappy
 import struct
 import time
@@ -130,7 +129,7 @@ def get(self, number: int) -> bytes:
 
         # What happens if we're trying to read the last item? Won't this fail?
         # Is there always one extra entry in the index file?
-        self.index_file.seek((number+1) * 6)
+        self.index_file.seek((number + 1) * 6)
         entry_bytes = self.index_file.read(6)
         end_entry = GethFreezerIndexEntry.from_bytes(entry_bytes)
 
@@ -165,7 +164,6 @@ def first_index(self):
         return GethFreezerIndexEntry.from_bytes(first_index_bytes)
 
 
-
 class BlockBody(rlp.Serializable):
     "This is how geth stores block bodies"
     fields = [
@@ -276,7 +274,9 @@ def open_gethdb(location):
 
     last_block = gethdb.last_block_hash
     last_block_num = gethdb.block_num_for_hash(last_block)
-    logger.info(f'found geth chain tip: header_hash={humanize_hash(last_block)} block_number={last_block_num}')
+
+    context = f'header_hash={humanize_hash(last_block)} block_number={last_block_num}'
+    logger.info(f'found geth chain tip: {context}')
 
     genesis_hash = gethdb.header_hash_for_block_number(0)
     genesis_header = gethdb.block_header(0, genesis_hash)
@@ -352,8 +352,8 @@ def sweep_state(gethdb: GethDatabase, trinitydb: LevelDB):
     logger.debug('sweep_state: bulk-importing state entries')
 
     iterator = gethdb.db.iterator(
-        start=b'\x00'*32,
-        stop=b'\xff'*32,
+        start=b'\x00' * 32,
+        stop=b'\xff' * 32,
         include_start=True,
         include_stop=True,
     )
@@ -385,14 +385,16 @@ def import_state(gethdb: GethDatabase, chain):
         f'state_root={humanize_hash(state_root)}'
     )
 
+    leveldb = headerdb.db
     imported_leaf_count = 0
     importdb = ImportDatabase(gethdb=gethdb.db, trinitydb=leveldb.db)
     for path, leaf_data in iterate_leaves(importdb, state_root):
         account = rlp.decode(leaf_data, sedes=Account)
         addr_hash = nibbles_to_bytes(path)
 
         if account.code_hash != EMPTY_SHA3:
-            bytecode = importdb.get(account.code_hash)
+            # by fetching it, we're copying it into the trinity database
+            importdb.get(account.code_hash)
 
         if account.storage_root == BLANK_ROOT_HASH:
             imported_leaf_count += 1
@@ -401,14 +403,14 @@ def import_state(gethdb: GethDatabase, chain):
                 logger.debug(f'progress sha(addr)={addr_hash.hex()}')
             continue
 
-        for path, leaf_data in iterate_leaves(importdb, account.storage_root):
+        for path, _leaf_data in iterate_leaves(importdb, account.storage_root):
             item_addr = nibbles_to_bytes(path)
             imported_leaf_count += 1
 
             if imported_leaf_count % 1000 == 0:
                 logger.debug(f'progress sha(addr)={addr_hash.hex()} sha(item)={item_addr.hex()}')
 
-    loger.info('successfully imported state trie and all storage tries')
+    logger.info('successfully imported state trie and all storage tries')
 
 
 def import_block_body(gethdb, chain, block_number: int):
@@ -461,7 +463,7 @@ def process_blocks(gethdb, chain, end_block):
             transaction_class.from_base_transaction(txn) for txn in body.transactions
         ]
         block = block_class(header, transactions, body.uncles)
-        imported_block, _, _ = chain.import_block(block, perform_validation = True)
+        imported_block, _, _ = chain.import_block(block, perform_validation=True)
         logger.debug(f'imported block: {imported_block}')
 
 
@@ -478,7 +480,12 @@ def read_receipts(gethdb, block_number):
         if len(raw_gas_used) < 8:
             padded = (b'\x00' * (8 - len(raw_gas_used))) + raw_gas_used
             gas_used = struct.unpack('>Q', padded)[0]
-        logger.info(f'- post_state_or_status={post_state} gas_used={gas_used} len(logs)={len(logs)}')
+        context = ' '.join([
+            f'post_state_or_status={post_state}',
+            f'gas_used={gas_used}',
+            f'len(logs)={len(logs)}'
+        ])
+        logger.info(f'- {context}')
 
 
 def read_geth(gethdb):