refactor: remove FunctionSignature

tests/base_conftest.py

@@ -1,3 +1,5 @@
+import json
+
 import pytest
 import web3.exceptions
 from eth_tester import EthereumTester, PyEVMBackend
@@ -120,6 +122,7 @@ def _get_contract(w3, source_code, no_optimize, *args, **kwargs):
         show_gas_estimates=True,  # Enable gas estimates for testing
     )
     parse_vyper_source(source_code)  # Test grammar.
+    json.dumps(out["metadata"])  # test metadata is json serializable
     abi = out["abi"]
     bytecode = out["bytecode"]
     value = kwargs.pop("value_in_eth", 0) * 10**18  # Handle deploying with an eth value.

tests/parser/syntax/test_public.py

@@ -23,6 +23,27 @@ def __init__():
 def foo() -> int128:
     return self.x / self.y / self.z
     """,
+    # expansion of public user-defined struct
+    """
+struct Foo:
+    a: uint256
+
+x: public(HashMap[uint256, Foo])
+    """,
+    # expansion of public user-defined enum
+    """
+enum Foo:
+    BAR
+
+x: public(HashMap[uint256, Foo])
+    """,
+    # expansion of public user-defined interface
+    """
+interface Foo:
+    def bar(): nonpayable
+
+x: public(HashMap[uint256, Foo])
+    """,
 ]
 
 

tests/parser/test_call_graph_stability.py

@@ -65,4 +65,4 @@ def foo():
                 r = d.args[0].args[0].value
                 if isinstance(r, str) and r.startswith("internal"):
                     ir_funcs.append(r)
-        assert ir_funcs == [f.internal_function_label for f in sigs.values()]
+        assert ir_funcs == [f._ir_info.internal_function_label for f in sigs.values()]

tests/parser/types/numbers/test_sqrt.py

@@ -143,8 +143,8 @@ def test_sqrt_bounds(sqrt_contract, value):
         min_value=Decimal(0), max_value=Decimal(SizeLimits.MAX_INT128), places=DECIMAL_PLACES
     )
 )
-@hypothesis.example(Decimal(SizeLimits.MAX_INT128))
-@hypothesis.example(Decimal(0))
+@hypothesis.example(value=Decimal(SizeLimits.MAX_INT128))
+@hypothesis.example(value=Decimal(0))
 @hypothesis.settings(deadline=1000)
 def test_sqrt_valid_range(sqrt_contract, value):
     vyper_sqrt = sqrt_contract.test(value)
@@ -159,8 +159,8 @@ def test_sqrt_valid_range(sqrt_contract, value):
     )
 )
 @hypothesis.settings(deadline=400)
-@hypothesis.example(Decimal(SizeLimits.MIN_INT128))
-@hypothesis.example(Decimal("-1E10"))
+@hypothesis.example(value=Decimal(SizeLimits.MIN_INT128))
+@hypothesis.example(value=Decimal("-1E10"))
 def test_sqrt_invalid_range(sqrt_contract, value):
     with pytest.raises(TransactionFailed):
         sqrt_contract.test(value)

vyper/ast/expansion.py

@@ -2,6 +2,7 @@
 
 from vyper import ast as vy_ast
 from vyper.exceptions import CompilerPanic
+from vyper.semantics.types.function import ContractFunctionT
 
 
 def expand_annotated_ast(vyper_module: vy_ast.Module) -> None:
@@ -85,6 +86,10 @@ def generate_public_variable_getters(vyper_module: vy_ast.Module) -> None:
             decorator_list=[vy_ast.Name(id="external"), vy_ast.Name(id="view")],
             returns=return_node,
         )
+
+        with vyper_module.namespace():
+            func_type = ContractFunctionT.from_FunctionDef(expanded)
+
         expanded._metadata["type"] = func_type
         return_node.set_parent(expanded)
         vyper_module.add_to_body(expanded)

vyper/ast/nodes.py

@@ -1,4 +1,5 @@
 import ast as python_ast
+import contextlib
 import copy
 import decimal
 import operator
@@ -664,6 +665,19 @@ def remove_from_body(self, node: VyperNode) -> None:
         self.body.remove(node)
         self._children.remove(node)
 
+    @contextlib.contextmanager
+    def namespace(self):
+        from vyper.semantics.namespace import get_namespace, override_global_namespace
+
+        # kludge implementation for backwards compatibility.
+        # TODO: replace with type_from_ast
+        try:
+            ns = self._metadata["namespace"]
+        except AttributeError:
+            ns = get_namespace()
+        with override_global_namespace(ns):
+            yield
+
 
 class FunctionDef(TopLevel):
     __slots__ = ("args", "returns", "decorator_list", "pos")

vyper/ast/nodes.pyi

@@ -61,6 +61,7 @@ class Module(TopLevel):
     def replace_in_tree(self, old_node: VyperNode, new_node: VyperNode) -> None: ...
     def add_to_body(self, node: VyperNode) -> None: ...
     def remove_from_body(self, node: VyperNode) -> None: ...
+    def namespace(self) -> Any: ...  # context manager
 
 class FunctionDef(TopLevel):
     args: arguments = ...

vyper/builtins/_convert.py

@@ -453,13 +453,13 @@ def to_enum(expr, arg, out_typ):
 
 
 def convert(expr, context):
-    if len(expr.args) != 2:
-        raise StructureException("The convert function expects two parameters.", expr)
+    assert len(expr.args) == 2, "bad typecheck: convert"
 
     arg_ast = expr.args[0]
     arg = Expr(arg_ast, context).ir_node
     original_arg = arg
-    out_typ = context.parse_type(expr.args[1])
+
+    out_typ = expr.args[1]._metadata["type"].typedef
 
     if arg.typ._is_prim_word:
         arg = unwrap_location(arg)

vyper/builtins/_utils.py

@@ -23,7 +23,7 @@ def generate_inline_function(code, variables, variables_2, memory_allocator):
         # `ContractFunctionT` type to rely on the annotation visitors in semantics
         # module.
         ast_code.body[0]._metadata["type"] = ContractFunctionT(
-            "sqrt_builtin", {}, 0, 0, None, FunctionVisibility.INTERNAL, StateMutability.NONPAYABLE
+            "sqrt_builtin", [], [], None, FunctionVisibility.INTERNAL, StateMutability.NONPAYABLE
         )
         # The FunctionNodeVisitor's constructor performs semantic checks
         # annotate the AST as side effects.