rem unnecessary checks

Author: souradeep-das

src/ethereum_spec_tools/evm_tools/t8n/env.py

@@ -88,13 +88,13 @@ def read_excess_blob_gas(self, data: Any, t8n: "T8N") -> None:
         if not t8n.fork.is_after_fork("ethereum.cancun"):
             return
 
-        if hasattr(data, "excess_blob_gas") and data.excess_blob_gas is not None:
+        if data.excess_blob_gas is not None:
             self.excess_blob_gas = U64(data.excess_blob_gas)
 
-        if hasattr(data, "parent_excess_blob_gas") and data.parent_excess_blob_gas is not None:
+        if data.parent_excess_blob_gas is not None:
             self.parent_excess_blob_gas = U64(data.parent_excess_blob_gas)
 
-        if hasattr(data, "parent_blob_gas_used") and data.parent_blob_gas_used is not None:
+        if data.parent_blob_gas_used is not None:
             self.parent_blob_gas_used = U64(data.parent_blob_gas_used)
 
         if self.excess_blob_gas is not None:
@@ -154,16 +154,16 @@ def read_base_fee_per_gas(self, data: Any, t8n: "T8N") -> None:
         self.base_fee_per_gas = None
 
         if t8n.fork.is_after_fork("ethereum.london"):
-            if hasattr(data, "base_fee_per_gas") and data.base_fee_per_gas is not None:
+            if data.base_fee_per_gas is not None:
                 self.base_fee_per_gas = Uint(data.base_fee_per_gas)
 
-            if hasattr(data, "parent_gas_used") and data.parent_gas_used is not None:
+            if data.parent_gas_used is not None:
                 self.parent_gas_used = Uint(data.parent_gas_used)
 
-            if hasattr(data, "parent_gas_limit") and data.parent_gas_limit is not None:
+            if data.parent_gas_limit is not None:
                 self.parent_gas_limit = Uint(data.parent_gas_limit)
 
-            if hasattr(data, "parent_base_fee_per_gas") and data.parent_base_fee_per_gas is not None:
+            if data.parent_base_fee_per_gas is not None:
                 self.parent_base_fee_per_gas = Uint(data.parent_base_fee_per_gas)
 
             if self.base_fee_per_gas is None:
@@ -221,7 +221,7 @@ def read_block_difficulty(self, data: Any, t8n: "T8N") -> None:
         self.parent_ommers_hash = None
         if t8n.fork.is_after_fork("ethereum.paris"):
             return
-        elif hasattr(data, "difficulty") and data.difficulty is not None:
+        elif data.difficulty is not None:
             self.block_difficulty = Uint(data.difficulty)
         else:
             self.parent_timestamp = U256(data.parent_timestamp)
@@ -233,7 +233,7 @@ def read_block_difficulty(self, data: Any, t8n: "T8N") -> None:
                 self.parent_difficulty,
             ]
             if t8n.fork.is_after_fork("ethereum.byzantium"):
-                if hasattr(data, "parent_ommers_hash") and data.parent_ommers_hash is not None:
+                if data.parent_ommers_hash is not None:
                     EMPTY_OMMER_HASH = keccak256(rlp.encode([]))
                     self.parent_ommers_hash = Hash32(
                         data.parent_ommers_hash
@@ -281,7 +281,7 @@ def read_ommers(self, data: Any, t8n: "T8N") -> None:
         needed to obtain the Header.
         """
         ommers = []
-        if hasattr(data, "ommers") and data.ommers is not None:
+        if data.ommers is not None:
             for ommer in data.ommers:
                 ommers.append(
                     Ommer(

src/ethereum_spec_tools/evm_tools/t8n/t8n_types.py

@@ -42,18 +42,16 @@ def __init__(self, t8n: "T8N", stdin: Optional[Dict] = None):
             )
 
             if t8n.fork.proof_of_stake and canonical_account == EMPTY_ACCOUNT:
-                addr_hex = addr_bytes.hex() if isinstance(addr_bytes, bytes) else str(addr_bytes)
-                raise StateWithEmptyAccount(f"Empty account at {addr_hex}.")
-
+                raise StateWithEmptyAccount(
+                    f"Empty account at {addr_bytes.hex()}."
+                )
             t8n.fork.set_account(state, addr_bytes, canonical_account)
 
             if account.storage and account.storage.root:
                 for storage_key, storage_value in account.storage.root.items():
-                    if isinstance(storage_key, int):
-                        storage_key_bytes = storage_key.to_bytes(32, byteorder='big')
-                    else:
-                        storage_key_bytes = storage_key
-
+                    storage_key_bytes = storage_key.to_bytes(
+                        32, byteorder='big'
+                    )
                     set_storage(
                         state,
                         addr_bytes,
@@ -260,17 +258,12 @@ def sign_transaction(self, json_tx: Any) -> None:
 def convert_pydantic_tx_to_canonical(tx, fork):
     """
     Convert a Pydantic Transaction to the canonical transaction class for the given fork.
-    fork: The fork object (e.g., self.fork from ForkLoad)
     """
-    if isinstance(tx, list):
-        return [convert_pydantic_tx_to_canonical(t, fork) for t in tx]
 
     def convert_access_list(access_list):
         if not access_list:
             return []
         AccessCls = getattr(fork, "Access", None)
-        if AccessCls is None:
-            from ethereum.arrow_glacier.transactions import Access as AccessCls
         return [
             AccessCls(
                 account=entry.address,
@@ -283,11 +276,9 @@ def convert_authorizations(auth_list):
         if not auth_list:
             return []
         AuthorizationCls = getattr(fork, "Authorization", None)
-        if AuthorizationCls is None:
-            from ethereum.osaka.fork_types import Authorization as AuthorizationCls
         result = []
         for entry in auth_list:
-            d = entry.dict() if hasattr(entry, "dict") else dict(entry)
+            d = entry.model_dump()
             result.append(
                 AuthorizationCls(
                     chain_id=U256(d.get("chain_id", 0)),
@@ -318,15 +309,7 @@ def convert_authorizations(auth_list):
     def to_bytes20(val):
         if val is None:
             return Bytes0()
-        if isinstance(val, Bytes20):
-            return val
-        if isinstance(val, (bytes, bytearray)) and len(val) == 20:
-            return Bytes20(val)
-        if isinstance(val, (bytes, bytearray)) and len(val) == 0:
-            return Bytes20(b"\x00" * 20)
-        if isinstance(val, (bytes, bytearray)):
-            return Bytes20(val.rjust(20, b"\x00"))
-        return Bytes20(bytes(val).rjust(20, b"\x00"))
+        return Bytes20(val)
 
     # build the canonical transaction
     if tx_cls.__name__ == "FeeMarketTransaction":