Code review feedback

Author: SamWilsn

src/ethereum/crypto/elliptic_curve.py

@@ -5,6 +5,7 @@
 
 import coincurve
 from Crypto.Util.asn1 import DerSequence
+from cryptography.exceptions import InvalidSignature
 from cryptography.hazmat.backends import default_backend
 from cryptography.hazmat.primitives import hashes
 from cryptography.hazmat.primitives.asymmetric import ec
@@ -97,22 +98,24 @@ def secp256r1_verify(
 ) -> None:
     """
     Verifies a P-256 signature.
+
     Parameters
     ----------
     r :
         the `r` component of the signature
     s :
         the `s` component of the signature
-    x:
+    x :
         the `x` coordinate of the public key
-    y:
+    y :
         the `y` coordinate of the public key
     msg_hash :
         Hash of the message being recovered.
-    Returns
-    -------
-    result : `ethereum.base_types.Bytes`
-        return 1 if the signature is valid, empty bytes otherwise
+
+    Raises
+    ------
+
+    Raises an `InvalidSignatureError` if the signature is not valid.
     """
     # Convert U256 to regular integers for DerSequence
     r_int = int(r)
@@ -124,9 +127,11 @@ def secp256r1_verify(
 
     pubnum = ec.EllipticCurvePublicNumbers(x_int, y_int, ec.SECP256R1())
     pubkey = pubnum.public_key(default_backend())
-    pubkey.verify(sig, msg_hash, ec.ECDSA(Prehashed(hashes.SHA256())))
 
-    return
+    try:
+        pubkey.verify(sig, msg_hash, ec.ECDSA(Prehashed(hashes.SHA256())))
+    except InvalidSignature as e:
+        raise InvalidSignatureError from e
 
 
 def is_on_curve_secp256r1(x: U256, y: U256) -> bool:

src/ethereum/osaka/vm/precompiled_contracts/p256verify.py

@@ -17,6 +17,7 @@
     secp256r1_verify,
 )
 from ethereum.crypto.hash import Hash32
+from ethereum.exceptions import InvalidSignatureError
 from ethereum.utils.byte import left_pad_zero_bytes
 
 from ...vm import Evm
@@ -75,11 +76,9 @@ def p256verify(evm: Evm) -> None:
     if public_key_x == U256(0) and public_key_y == U256(0):
         return
 
-    success_return_value = left_pad_zero_bytes(b"\x01", 32)
-
     try:
         secp256r1_verify(r, s, public_key_x, public_key_y, message_hash)
-    except Exception:
+    except InvalidSignatureError:
         return
 
-    evm.output = success_return_value
+    evm.output = left_pad_zero_bytes(b"\x01", 32)