diff --git a/tests/base_conftest.py b/tests/base_conftest.py index ddce51171a..f613ad0f47 100644 --- a/tests/base_conftest.py +++ b/tests/base_conftest.py @@ -146,7 +146,7 @@ def _deploy_blueprint_for(w3, source_code, optimize, initcode_prefix=b"", **kwar settings.optimize = optimize out = compiler.compile_code( source_code, - ["abi", "bytecode"], + output_formats=["abi", "bytecode", "metadata", "userdoc", "devdoc"], settings=settings, show_gas_estimates=True, # Enable gas estimates for testing ) diff --git a/tests/parser/features/test_init.py b/tests/parser/features/test_init.py index 83bcbc95ea..29a466e869 100644 --- a/tests/parser/features/test_init.py +++ b/tests/parser/features/test_init.py @@ -15,7 +15,7 @@ def __init__(a: uint256): assert c.val() == 123 # Make sure the init code does not access calldata - assembly = vyper.compile_code(code, ["asm"])["asm"].split(" ") + assembly = vyper.compile_code(code, output_formats=["asm"])["asm"].split(" ") ir_return_idx_start = assembly.index("{") ir_return_idx_end = assembly.index("}") diff --git a/tests/parser/functions/test_bitwise.py b/tests/parser/functions/test_bitwise.py index 3ba74034ac..1d62a5be79 100644 --- a/tests/parser/functions/test_bitwise.py +++ b/tests/parser/functions/test_bitwise.py @@ -32,7 +32,7 @@ def _shr(x: uint256, y: uint256) -> uint256: def test_bitwise_opcodes(): - opcodes = compile_code(code, ["opcodes"])["opcodes"] + opcodes = compile_code(code, output_formats=["opcodes"])["opcodes"] assert "SHL" in opcodes assert "SHR" in opcodes diff --git a/tests/parser/functions/test_raw_call.py b/tests/parser/functions/test_raw_call.py index 81efe64a18..5bb23447e4 100644 --- a/tests/parser/functions/test_raw_call.py +++ b/tests/parser/functions/test_raw_call.py @@ -274,8 +274,8 @@ def test_raw_call(_target: address): def test_raw_call(_target: address): raw_call(_target, method_id("foo()"), max_outsize=0) """ - output1 = compile_code(code1, ["bytecode", "bytecode_runtime"]) - output2 = compile_code(code2, ["bytecode", "bytecode_runtime"]) + output1 = compile_code(code1, output_formats=["bytecode", "bytecode_runtime"]) + output2 = compile_code(code2, output_formats=["bytecode", "bytecode_runtime"]) assert output1 == output2 @@ -296,8 +296,8 @@ def test_raw_call(_target: address) -> bool: a: bool = raw_call(_target, method_id("foo()"), max_outsize=0, revert_on_failure=False) return a """ - output1 = compile_code(code1, ["bytecode", "bytecode_runtime"]) - output2 = compile_code(code2, ["bytecode", "bytecode_runtime"]) + output1 = compile_code(code1, output_formats=["bytecode", "bytecode_runtime"]) + output2 = compile_code(code2, output_formats=["bytecode", "bytecode_runtime"]) assert output1 == output2 diff --git a/tests/parser/functions/test_return_struct.py b/tests/parser/functions/test_return_struct.py index 425caedb75..cdd8342d8a 100644 --- a/tests/parser/functions/test_return_struct.py +++ b/tests/parser/functions/test_return_struct.py @@ -17,7 +17,7 @@ def test() -> Voter: return a """ - out = compile_code(code, ["abi"]) + out = compile_code(code, output_formats=["abi"]) abi = out["abi"][0] assert abi["name"] == "test" @@ -38,7 +38,7 @@ def test() -> Voter: return a """ - out = compile_code(code, ["abi"]) + out = compile_code(code, output_formats=["abi"]) abi = out["abi"][0] assert abi["name"] == "test" diff --git a/tests/parser/syntax/test_codehash.py b/tests/parser/syntax/test_codehash.py index 5074d14636..c2d9a2e274 100644 --- a/tests/parser/syntax/test_codehash.py +++ b/tests/parser/syntax/test_codehash.py @@ -33,7 +33,7 @@ def foo4() -> bytes32: return self.a.codehash """ settings = Settings(evm_version=evm_version, optimize=optimize) - compiled = compile_code(code, ["bytecode_runtime"], settings=settings) + compiled = compile_code(code, output_formats=["bytecode_runtime"], settings=settings) bytecode = bytes.fromhex(compiled["bytecode_runtime"][2:]) hash_ = keccak256(bytecode) diff --git a/tests/parser/syntax/test_self_balance.py b/tests/parser/syntax/test_self_balance.py index 63db58e347..d22d8a2750 100644 --- a/tests/parser/syntax/test_self_balance.py +++ b/tests/parser/syntax/test_self_balance.py @@ -20,7 +20,7 @@ def __default__(): pass """ settings = Settings(evm_version=evm_version) - opcodes = compiler.compile_code(code, ["opcodes"], settings=settings)["opcodes"] + opcodes = compiler.compile_code(code, output_formats=["opcodes"], settings=settings)["opcodes"] if EVM_VERSIONS[evm_version] >= EVM_VERSIONS["istanbul"]: assert "SELFBALANCE" in opcodes else: