some fixes

tserg · Sep 23, 2023 · f478ce6 · f478ce6
1 parent 8b1cf4e
commit f478ce6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/tests/builtins/folding/test_abs.py b/tests/builtins/folding/test_abs.py
@@ -4,7 +4,7 @@
 
 from vyper import ast as vy_ast
 from vyper.builtins import functions as vy_fn
-from vyper.exceptions import OverflowException
+from vyper.exceptions import InvalidType, OverflowException
 
 
 @pytest.mark.fuzzing
@@ -35,7 +35,7 @@ def test_abs_upper_bound_folding(get_contract, a):
 def foo(a: int256) -> int256:
     return abs({a})
     """
-    with pytest.raises(OverflowException):
+    with pytest.raises(InvalidType):
         get_contract(source)
 
 

diff --git a/vyper/semantics/types/utils.py b/vyper/semantics/types/utils.py
@@ -103,7 +103,7 @@ def _failwith(type_name):
 
     if isinstance(node, vy_ast.Tuple):
         tuple_t = namespace["$TupleT"]
-        return tuple_t.from_annotation(node)
+        return tuple_t.from_annotation(node, namespace._constants)
 
     if isinstance(node, vy_ast.Subscript):
         # ex. HashMap, DynArray, Bytes, static arrays
@@ -127,7 +127,7 @@ def _failwith(type_name):
         # cases where the object in the namespace is an uninstantiated
         # type object, ex. Bytestring or DynArray (with no length provided).
         # call from_annotation to produce a better error message.
-        typ_.from_annotation(node)
+        typ_.from_annotation(node, namespace._constants)
 
     return typ_