test: fix test and adjust as well

ApeWorX · Feb 22, 2025 · d40eaeb · d40eaeb
1 parent 73f8260
commit d40eaeb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git 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
@@ -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 = {