post-review update 1

ethereum · Aug 15, 2024 · 54384a9 · 54384a9
1 parent 992e009
commit 54384a9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 11 deletions.
diff --git a/src/ethereum/cancun/vm/precompiled_contracts/point_evaluation.py b/src/ethereum/cancun/vm/precompiled_contracts/point_evaluation.py
@@ -18,8 +18,6 @@
     verify_kzg_proof,
 )
 
-from ethereum.base_types import U256, Bytes
-
 from ...vm import Evm
 from ...vm.exceptions import KZGProofError
 from ...vm.gas import GAS_POINT_EVALUATION, charge_gas

diff --git a/src/ethereum/prague/vm/precompiled_contracts/bls12_381/__init__.py b/src/ethereum/prague/vm/precompiled_contracts/bls12_381/__init__.py
@@ -32,7 +32,6 @@
 from ...exceptions import InvalidParameter
 
 P = FQ.field_modulus
-P2 = FQ2.field_modulus
 
 K_DISCOUNT = {
     1: 1200,
@@ -265,21 +264,21 @@ def decode_G1_scalar_pair(data: Bytes) -> Tuple[Point2D, int]:
 
 def bytes_to_FQ(
     data: Bytes, optimized: bool = False
-) -> Union[FQ2, OPTIMIZED_FQ2]:
+) -> Union[FQ, OPTIMIZED_FQ]:
     """
-    Decode 64 bytes to a FQ2 element.
+    Decode 64 bytes to a FQ element.
 
     Parameters
     ----------
     data :
         The bytes data to decode.
     optimized :
-        Whether to use the optimized FQ2 implementation.
+        Whether to use the optimized FQ implementation.
 
     Returns
     -------
-    fq : FQ
-        The FQ2 element.
+    fq : Union[FQ, OPTIMIZED_FQ]
+        The FQ element.
 
     Raises
     ------
@@ -313,7 +312,7 @@ def bytes_to_FQ2(
 
     Returns
     -------
-    fq2 : FQ2
+    fq2 : Union[FQ2, OPTIMIZED_FQ2]
         The FQ2 element.
 
     Raises
@@ -325,9 +324,9 @@ def bytes_to_FQ2(
     c_0 = int.from_bytes(data[:64], "big")
     c_1 = int.from_bytes(data[64:], "big")
 
-    if c_0 >= P2:
+    if c_0 >= P:
         raise InvalidParameter("Invalid field element")
-    if c_1 >= P2:
+    if c_1 >= P:
         raise InvalidParameter("Invalid field element")
 
     if optimized: