modify tests

tests/functional/codegen/calling_convention/test_external_contract_calls.py

@@ -900,25 +900,29 @@ def set_lucky(arg1: address, arg2: int128):
     print("Successfully executed an external contract call state change")
 
 
-def test_constant_external_contract_call_cannot_change_state():
-    c = """
+@pytest.mark.parametrize("state_modifying_decorator", ("payable", "nonpayable"))
+@pytest.mark.parametrize("non_modifying_decorator", ("pure", "view"))
+def test_constant_external_contract_call_cannot_change_state(
+    state_modifying_decorator, non_modifying_decorator
+):
+    c = f"""
 interface Foo:
-    def set_lucky(_lucky: int128) -> int128: nonpayable
+    def set_lucky(_lucky: int128) -> int128: {state_modifying_decorator}
 
 @external
-@view
+@{non_modifying_decorator}
 def set_lucky_stmt(arg1: address, arg2: int128):
     extcall Foo(arg1).set_lucky(arg2)
     """
 
     with pytest.raises(StateAccessViolation):
         compile_code(c)
 
-    c2 = """
+    c2 = f"""
 interface Foo:
-    def set_lucky(_lucky: int128) -> int128: nonpayable
+    def set_lucky(_lucky: int128) -> int128: {state_modifying_decorator}
 @external
-@view
+@{non_modifying_decorator}
 def set_lucky_expr(arg1: address, arg2: int128) -> int128:
     return extcall Foo(arg1).set_lucky(arg2)
     """

tests/functional/codegen/features/decorators/test_pure.py

@@ -1,3 +1,6 @@
+import pytest
+
+from vyper import compile_code
 from vyper.exceptions import FunctionDeclarationException, StateAccessViolation
 
 
@@ -131,33 +134,13 @@ def foo() -> uint256:
     )
 
 
-def test_invalid_builtin(get_contract, assert_compile_failed):
-    assert_compile_failed(
-        lambda: get_contract(
-            """
+def test_invalid_builtin(get_contract):
+    code = """
 @external
 @pure
 def foo(x: uint256)-> bytes32:
     return blockhash(x)
     """
-        ),
-        StateAccessViolation,
-    )
-
-
-def test_invalid_interface(get_contract, assert_compile_failed):
-    assert_compile_failed(
-        lambda: get_contract(
-            """
-interface Foo:
-    def foo() -> uint256: payable
 
-
-@external
-@pure
-def bar(a: address) -> uint256:
-    return extcall Foo(a).foo()
-    """
-        ),
-        StateAccessViolation,
-    )
+    with pytest.raises(StateAccessViolation):
+        compile_code(code)