fix: delay hex-int validation error when None values for non-optional (…

…#2346)

src/ape/types/basic.py

@@ -6,7 +6,13 @@
 
 
 def _hex_int_validator(value, info):
+    if value is None:
+        # If not optional, will allow pydantic to (better) handle the error.
+        return value
+
+    # NOTE: Allows this module to load lazier.
     access = import_module("ape.utils.basemodel").ManagerAccessMixin
+
     convert = access.conversion_manager.convert
     return convert(value, int)
 

tests/functional/test_types.py

@@ -4,7 +4,7 @@
 from eth_utils import to_hex
 from ethpm_types.abi import EventABI
 from hexbytes import HexBytes
-from pydantic import BaseModel, Field
+from pydantic import BaseModel, Field, ValidationError
 
 from ape.types.address import AddressType
 from ape.types.basic import HexInt
@@ -144,6 +144,19 @@ class MyModel(BaseModel):
         assert act.ual == expected
         assert act.ual_optional is None
 
+    def test_none(self):
+        """
+        Was getting unhelpful conversion errors here. We should instead
+        let Pydantic fail as it normally does in this situation.
+        """
+
+        class MyModel(BaseModel):
+            an_int: HexInt
+
+        expected = ".*Input should be a valid integer.*"
+        with pytest.raises(ValidationError, match=expected):
+            _ = MyModel(an_int=None)
+
 
 class TestCurrencyValueComparable:
     def test_use_for_int_in_pydantic_model(self):