From d40eaebb3239af472bbfaf20feeba26bea6324df Mon Sep 17 00:00:00 2001 From: antazoey Date: Sat, 22 Feb 2025 13:45:36 -0700 Subject: [PATCH] test: fix test and adjust as well --- tests/functional/test_contract.py | 15 ++++++++------- tests/functional/test_contracts_cache.py | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/tests/functional/test_contract.py b/tests/functional/test_contract.py index aab93b4bb6..4723d07a9d 100644 --- a/tests/functional/test_contract.py +++ b/tests/functional/test_contract.py @@ -85,12 +85,13 @@ def test_Contract_at_unknown_address(networks_connected_to_tester, address): def test_Contract_specify_contract_type( - solidity_contract_instance, vyper_contract_type, owner, networks_connected_to_tester + vyper_contract_instance, solidity_contract_type, owner, networks_connected_to_tester ): - # Vyper contract type is very close to solidity's. + # Solidity's contract type is very close to Vyper's. # This test purposely uses the other just to show we are able to specify it externally. - contract = Contract(solidity_contract_instance.address, contract_type=vyper_contract_type) - assert contract.address == solidity_contract_instance.address - assert contract.contract_type == vyper_contract_type - assert contract.setNumber(2, sender=owner) - assert contract.myNumber() == 2 + contract = Contract(vyper_contract_instance.address, contract_type=solidity_contract_type) + assert contract.address == vyper_contract_instance.address + + abis = [abi.name for abi in contract.contract_type.abi if hasattr(abi, "name")] + assert "setNumber" in abis # Shared ABI. + assert "ACustomError" in abis # SolidityContract-defined ABI. diff --git a/tests/functional/test_contracts_cache.py b/tests/functional/test_contracts_cache.py index cd47a73538..6b81dca32b 100644 --- a/tests/functional/test_contracts_cache.py +++ b/tests/functional/test_contracts_cache.py @@ -167,7 +167,7 @@ def test_cache_deployment_live_network( vyper_contract_container, ): # Arrange - Ensure the contract is not cached anywhere - address = vyper_contract_instance.address + address = vyper_contract_instance.addresstest_Contract_specify_contract_type contract_name = vyper_contract_instance.contract_type.name contract_types = chain.contracts.contract_types.memory chain.contracts.contract_types.memory = {