feat: remove folding

tests/functional/builtins/codegen/test_keccak256.py

@@ -1,3 +1,6 @@
+from vyper.utils import hex_to_int
+
+
 def test_hash_code(get_contract_with_gas_estimation, keccak):
     hash_code = """
 @external
@@ -80,3 +83,31 @@ def try32(inp: bytes32) -> bool:
     assert c.tryy(b"\x35" * 33) is True
 
     print("Passed KECCAK256 hash test")
+
+
+def test_hash_constant_bytes32(get_contract_with_gas_estimation, keccak):
+    hex_val = "0x1234567890123456789012345678901234567890123456789012345678901234"
+    code = f"""
+FOO: constant(bytes32) = {hex_val}
+BAR: constant(bytes32) = keccak256(FOO)
+@external
+def foo() -> bytes32:
+    x: bytes32 = BAR
+    return x
+    """
+    c = get_contract_with_gas_estimation(code)
+    assert "0x" + c.foo().hex() == keccak(hex_to_int(hex_val).to_bytes(32, "big")).hex()
+
+
+def test_hash_constant_string(get_contract_with_gas_estimation, keccak):
+    str_val = "0x1234567890123456789012345678901234567890123456789012345678901234"
+    code = f"""
+FOO: constant(String[66]) = "{str_val}"
+BAR: constant(bytes32) = keccak256(FOO)
+@external
+def foo() -> bytes32:
+    x: bytes32 = BAR
+    return x
+    """
+    c = get_contract_with_gas_estimation(code)
+    assert "0x" + c.foo().hex() == keccak(str_val.encode()).hex()

tests/functional/builtins/codegen/test_sha256.py

@@ -2,6 +2,8 @@
 
 import pytest
 
+from vyper.utils import hex_to_int
+
 pytestmark = pytest.mark.usefixtures("memory_mocker")
 
 
@@ -77,3 +79,31 @@ def bar() -> bytes32:
     c.set(test_val, transact={})
     assert c.a() == test_val
     assert c.bar() == hashlib.sha256(test_val).digest()
+
+
+def test_sha256_constant_bytes32(get_contract_with_gas_estimation):
+    hex_val = "0x1234567890123456789012345678901234567890123456789012345678901234"
+    code = f"""
+FOO: constant(bytes32) = {hex_val}
+BAR: constant(bytes32) = sha256(FOO)
+@external
+def foo() -> bytes32:
+    x: bytes32 = BAR
+    return x
+    """
+    c = get_contract_with_gas_estimation(code)
+    assert c.foo() == hashlib.sha256(hex_to_int(hex_val).to_bytes(32, "big")).digest()
+
+
+def test_sha256_constant_string(get_contract_with_gas_estimation):
+    str_val = "0x1234567890123456789012345678901234567890123456789012345678901234"
+    code = f"""
+FOO: constant(String[66]) = "{str_val}"
+BAR: constant(bytes32) = sha256(FOO)
+@external
+def foo() -> bytes32:
+    x: bytes32 = BAR
+    return x
+    """
+    c = get_contract_with_gas_estimation(code)
+    assert c.foo() == hashlib.sha256(str_val.encode()).digest()

tests/functional/builtins/codegen/test_unary.py

@@ -69,16 +69,11 @@ def bar() -> decimal:
 
 def test_negation_int128(get_contract):
     code = """
-a: constant(int128) = -2**127
-
-@external
-def foo() -> int128:
-    return -2**127
+a: constant(int128) = min_value(int128)
 
 @external
 def bar() -> int128:
     return -(a+1)
     """
     c = get_contract(code)
-    assert c.foo() == -(2**127)
     assert c.bar() == 2**127 - 1

tests/functional/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
 
 
 @pytest.mark.fuzzing
@@ -21,7 +21,7 @@ def foo(a: int256) -> int256:
 
     vyper_ast = vy_ast.parse_to_ast(f"abs({a})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE["abs"].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE["abs"].fold(old_node)
 
     assert contract.foo(a) == new_node.value == abs(a)
 
@@ -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)
 
 
@@ -55,7 +55,7 @@ def test_abs_lower_bound_folded(get_contract, tx_failed):
     source = """
 @external
 def foo() -> int256:
-    return abs(-2**255)
+    return abs(min_value(int256))
     """
-    with pytest.raises(OverflowException):
+    with pytest.raises(InvalidType):
         get_contract(source)

tests/functional/builtins/folding/test_addmod_mulmod.py

@@ -24,6 +24,6 @@ def foo(a: uint256, b: uint256, c: uint256) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"{fn_name}({a}, {b}, {c})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE[fn_name].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE[fn_name].fold(old_node)
 
     assert contract.foo(a, b, c) == new_node.value

tests/functional/builtins/folding/test_bitwise.py

@@ -28,7 +28,7 @@ def foo(a: uint256, b: uint256) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"{a} {op} {b}")
     old_node = vyper_ast.body[0].value
-    new_node = old_node.evaluate()
+    new_node = old_node.fold()
 
     assert contract.foo(a, b) == new_node.value
 
@@ -49,7 +49,7 @@ def foo(a: uint256, b: uint256) -> uint256:
     old_node = vyper_ast.body[0].value
 
     try:
-        new_node = old_node.evaluate()
+        new_node = old_node.fold()
         # force bounds check, no-op because validate_numeric_bounds
         # already does this, but leave in for hygiene (in case
         # more types are added).
@@ -79,7 +79,7 @@ def foo(a: int256, b: uint256) -> int256:
     old_node = vyper_ast.body[0].value
 
     try:
-        new_node = old_node.evaluate()
+        new_node = old_node.fold()
         validate_expected_type(new_node, INT256_T)  # force bounds check
     # compile time behavior does not match runtime behavior.
     # compile-time will throw on OOB, runtime will wrap.
@@ -104,6 +104,6 @@ def foo(a: uint256) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"~{value}")
     old_node = vyper_ast.body[0].value
-    new_node = old_node.evaluate()
+    new_node = old_node.fold()
 
     assert contract.foo(value) == new_node.value

tests/functional/builtins/folding/test_epsilon.py

@@ -15,6 +15,6 @@ def foo() -> {typ_name}:
 
     vyper_ast = vy_ast.parse_to_ast(f"epsilon({typ_name})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE["epsilon"].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE["epsilon"].fold(old_node)
 
     assert contract.foo() == new_node.value

tests/functional/builtins/folding/test_floor_ceil.py

@@ -30,6 +30,6 @@ def foo(a: decimal) -> int256:
 
     vyper_ast = vy_ast.parse_to_ast(f"{fn_name}({value})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE[fn_name].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE[fn_name].fold(old_node)
 
     assert contract.foo(value) == new_node.value

tests/functional/builtins/folding/test_fold_as_wei_value.py

@@ -32,7 +32,7 @@ def foo(a: decimal) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"as_wei_value({value:.10f}, '{denom}')")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.AsWeiValue().evaluate(old_node)
+    new_node = vy_fn.AsWeiValue().fold(old_node)
 
     assert contract.foo(value) == new_node.value
 
@@ -51,6 +51,6 @@ def foo(a: uint256) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"as_wei_value({value}, '{denom}')")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.AsWeiValue().evaluate(old_node)
+    new_node = vy_fn.AsWeiValue().fold(old_node)
 
     assert contract.foo(value) == new_node.value

tests/functional/builtins/folding/test_keccak_sha.py

@@ -22,7 +22,7 @@ def foo(a: String[100]) -> bytes32:
 
     vyper_ast = vy_ast.parse_to_ast(f"{fn_name}('''{value}''')")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE[fn_name].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE[fn_name].fold(old_node)
 
     assert f"0x{contract.foo(value).hex()}" == new_node.value
 
@@ -41,7 +41,7 @@ def foo(a: Bytes[100]) -> bytes32:
 
     vyper_ast = vy_ast.parse_to_ast(f"{fn_name}({value})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE[fn_name].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE[fn_name].fold(old_node)
 
     assert f"0x{contract.foo(value).hex()}" == new_node.value
 
@@ -62,6 +62,6 @@ def foo(a: Bytes[100]) -> bytes32:
 
     vyper_ast = vy_ast.parse_to_ast(f"{fn_name}({value})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE[fn_name].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE[fn_name].fold(old_node)
 
     assert f"0x{contract.foo(value).hex()}" == new_node.value

tests/functional/builtins/folding/test_len.py

@@ -17,7 +17,7 @@ def foo(a: String[1024]) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"len('{value}')")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.Len().evaluate(old_node)
+    new_node = vy_fn.Len().fold(old_node)
 
     assert contract.foo(value) == new_node.value
 
@@ -35,7 +35,7 @@ def foo(a: Bytes[1024]) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"len(b'{value}')")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.Len().evaluate(old_node)
+    new_node = vy_fn.Len().fold(old_node)
 
     assert contract.foo(value.encode()) == new_node.value
 
@@ -53,6 +53,6 @@ def foo(a: Bytes[1024]) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"len({value})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.Len().evaluate(old_node)
+    new_node = vy_fn.Len().fold(old_node)
 
     assert contract.foo(value) == new_node.value

tests/functional/builtins/folding/test_min_max.py

@@ -31,7 +31,7 @@ def foo(a: decimal, b: decimal) -> decimal:
 
     vyper_ast = vy_ast.parse_to_ast(f"{fn_name}({left}, {right})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE[fn_name].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE[fn_name].fold(old_node)
 
     assert contract.foo(left, right) == new_node.value
 
@@ -50,7 +50,7 @@ def foo(a: int128, b: int128) -> int128:
 
     vyper_ast = vy_ast.parse_to_ast(f"{fn_name}({left}, {right})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE[fn_name].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE[fn_name].fold(old_node)
 
     assert contract.foo(left, right) == new_node.value
 
@@ -69,6 +69,6 @@ def foo(a: uint256, b: uint256) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"{fn_name}({left}, {right})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.DISPATCH_TABLE[fn_name].evaluate(old_node)
+    new_node = vy_fn.DISPATCH_TABLE[fn_name].fold(old_node)
 
     assert contract.foo(left, right) == new_node.value

tests/functional/builtins/folding/test_powmod.py

@@ -21,6 +21,6 @@ def foo(a: uint256, b: uint256) -> uint256:
 
     vyper_ast = vy_ast.parse_to_ast(f"pow_mod256({a}, {b})")
     old_node = vyper_ast.body[0].value
-    new_node = vy_fn.PowMod256().evaluate(old_node)
+    new_node = vy_fn.PowMod256().fold(old_node)
 
     assert contract.foo(a, b) == new_node.value

tests/functional/codegen/calling_convention/test_default_parameters.py

@@ -305,6 +305,48 @@ def foo(a: address = empty(address)):
 def foo(a: int112 = min_value(int112)):
     self.A = a
     """,
+    """
+struct X:
+    x: int128
+    y: address
+BAR: constant(X) = X({x: 1, y: 0x0000000000000000000000000000000000012345})
+@external
+def out_literals(a: int128 = BAR.x + 1) -> X:
+    return BAR
+    """,
+    """
+struct X:
+    x: int128
+    y: address
+struct Y:
+    x: X
+    y: uint256
+BAR: constant(X) = X({x: 1, y: 0x0000000000000000000000000000000000012345})
+FOO: constant(Y) = Y({x: BAR, y: 256})
+@external
+def out_literals(a: int128 = FOO.x.x + 1) -> Y:
+    return FOO
+    """,
+    """
+struct Bar:
+    a: bool
+
+BAR: constant(Bar) = Bar({a: True})
+
+@external
+def foo(x: bool = True and not BAR.a):
+    pass
+    """,
+    """
+struct Bar:
+    a: uint256
+
+BAR: constant(Bar) = Bar({ a: 123 })
+
+@external
+def foo(x: bool = BAR.a + 1 > 456):
+    pass
+    """,
 ]
 
 

tests/functional/codegen/calling_convention/test_external_contract_calls.py

@@ -388,7 +388,7 @@ def test_int128_too_long(get_contract, tx_failed):
     contract_1 = """
 @external
 def foo() -> int256:
-    return (2**255)-1
+    return max_value(int256)
     """
 
     c = get_contract(contract_1)

tests/functional/codegen/features/iteration/test_for_in_list.py

@@ -776,7 +776,7 @@ def test_for() -> int128:
         a = i
     return a
     """,
-        TypeMismatch,
+        InvalidType,
     ),
     (
         """

tests/functional/codegen/test_interfaces.py

@@ -435,7 +435,7 @@ def ok() -> {typ}:
 
 @external
 def should_fail() -> int256:
-    return -2**255 # OOB for all int/uint types with less than 256 bits
+    return min_value(int256)
     """
 
     code = f"""

tests/functional/codegen/types/numbers/test_constants.py

@@ -4,7 +4,7 @@
 import pytest
 
 from vyper.compiler import compile_code
-from vyper.exceptions import InvalidType
+from vyper.exceptions import TypeMismatch
 from vyper.utils import MemoryPositions
 
 
@@ -158,7 +158,7 @@ def test_custom_constants_fail(get_contract, assert_compile_failed, storage_type
 def foo() -> {return_type}:
     return MY_CONSTANT
     """
-    assert_compile_failed(lambda: get_contract(code), InvalidType)
+    assert_compile_failed(lambda: get_contract(code), TypeMismatch)
 
 
 def test_constant_address(get_contract):