chore: converting some tests to v3

tests/base_d_asa/conftest.py

@@ -17,6 +17,7 @@
     AssignRoleArgs,
     BaseDAsaClient,
     BaseDAsaFactory,
+    CommonAppCallParams,
     OpenAccountArgs,
     PrimaryDistributionArgs,
     SetAssetSuspensionArgs,
@@ -198,7 +199,7 @@ def primary_dealer(
         account_to_fund=account.address,
         min_spending_balance=INITIAL_ALGO_FUNDS,
     )
-    state = base_d_asa_client_active.send.get_global_state()
+    state = base_d_asa_client_active.state.global_state
     role_config = utils.set_role_config(
         state.primary_distribution_opening_date, state.primary_distribution_closure_date
     )
@@ -256,11 +257,14 @@ def base_d_asa_client_primary(
 ) -> BaseDAsaClient:
     state = base_d_asa_client_active.state.global_state.get_all()
     base_d_asa_client_active.send.set_secondary_time_events(
-        SetSecondaryTimeEventsArgs(
-            secondary_market_time_events=[state.issuance_date, state.maturity_date]
+        args=SetSecondaryTimeEventsArgs(
+            secondary_market_time_events=[
+                state["issuance_date"],
+                state["maturity_date"],
+            ]
         )
     )
-    utils.time_warp(state.primary_distribution_opening_date)
+    utils.time_warp(state["primary_distribution_opening_date"])
     return base_d_asa_client_active
 
 
@@ -295,7 +299,7 @@ def base_d_asa_client_ongoing(
     base_d_asa_client_primary: BaseDAsaClient,
 ) -> BaseDAsaClient:
     state = base_d_asa_client_primary.state.global_state.get_all()
-    utils.time_warp(state.issuance_date)
+    utils.time_warp(state["issuance_date"])
     return base_d_asa_client_primary
 
 
@@ -305,5 +309,8 @@ def base_d_asa_client_suspended(
 ) -> BaseDAsaClient:
     base_d_asa_client_ongoing.send.set_asset_suspension(
         SetAssetSuspensionArgs(suspended=True),
+        params=CommonAppCallParams(
+            sender=authority.address,
+        ),
     )
     return base_d_asa_client_ongoing

tests/base_d_asa/test_asset_config.py

@@ -29,54 +29,54 @@ def test_pass_asset_config(
     expected_time_events = base_d_asa_client_empty.send.get_time_events().abi_return
 
     # Asset Configuration
-    assert state.denomination_asset_id() == currency.id
-    assert state.settlement_asset_id() == state.denomination_asset_id()
-    assert state.unit_value() == base_d_asa_cfg.minimum_denomination
-    assert state.day_count_convention() == base_d_asa_cfg.day_count_convention
+    assert state.denomination_asset_id == currency.id
+    assert state.settlement_asset_id == state.denomination_asset_id
+    assert state.unit_value == base_d_asa_cfg.minimum_denomination
+    assert state.day_count_convention == base_d_asa_cfg.day_count_convention
 
     # Principal and Supply
     assert (
-        state.total_units()
+        state.total_units
         == base_d_asa_cfg.principal // base_d_asa_cfg.minimum_denomination
     )
-    assert not state.circulating_units()
-    assert not state.principal_discount()
+    assert not state.circulating_units
+    assert not state.principal_discount
 
     # Interest Rate
-    assert state.interest_rate() == base_d_asa_cfg.interest_rate
+    assert state.interest_rate == base_d_asa_cfg.interest_rate
 
     # Coupons
     assert expected_coupon_rates == base_d_asa_cfg.coupon_rates
-    assert state.total_coupons() == base_d_asa_cfg.total_coupons
+    assert state.total_coupons == base_d_asa_cfg.total_coupons
 
     # Time Schedule
     assert expected_time_events == base_d_asa_cfg.time_events
     assert (
-        state.primary_distribution_opening_date()
+        state.primary_distribution_opening_date
         == base_d_asa_cfg.time_events[sc_cfg.PRIMARY_DISTRIBUTION_OPENING_DATE_IDX]
         # == time_schedule_limits.primary_distribution_opening_date
     )
     assert (
-        state.primary_distribution_closure_date()
+        state.primary_distribution_closure_date
         == base_d_asa_cfg.time_events[sc_cfg.PRIMARY_DISTRIBUTION_CLOSURE_DATE_IDX]
         # == time_schedule_limits.primary_distribution_closure_date
     )
     assert (
-        state.issuance_date()
+        state.issuance_date
         == base_d_asa_cfg.time_events[sc_cfg.ISSUANCE_DATE_IDX]
         # == time_schedule_limits.issuance_date
     )
-    assert not state.secondary_market_opening_date()
-    assert not state.secondary_market_closure_date()
+    assert not state.secondary_market_opening_date
+    assert not state.secondary_market_closure_date
     assert (
-        state.maturity_date()
+        state.maturity_date
         == base_d_asa_cfg.time_events[sc_cfg.MATURITY_DATE_IDX]
         # == time_schedule_limits.maturity_date
     )
 
     # Status
-    assert state.status() == sc_cfg.STATUS_ACTIVE
-    assert not state.suspended()
+    assert state.status == sc_cfg.STATUS_ACTIVE
+    assert not state.suspended
 
 
 def test_fail_unauthorized(

tests/base_d_asa/test_asset_create.py

@@ -29,16 +29,16 @@ def test_pass_asset_create(
     state = base_d_asa_client.state.global_state
 
     # Roles
-    assert encode_address(state.arranger()) == arranger.address
+    assert encode_address(state.arranger) == arranger.address
 
     # Asset Configuration
-    assert not state.denomination_asset_id()
-    assert not state.settlement_asset_id()
-    assert not state.unit_value()
-    assert not state.day_count_convention()
+    assert not state.denomination_asset_id
+    assert not state.settlement_asset_id
+    assert not state.unit_value
+    assert not state.day_count_convention
 
     # Metadata
-    assert state.metadata() == TupleType(
+    assert state.metadata == TupleType(
         [
             UintType(8),  # Contract Type
             UintType(8),  # Calendar
@@ -63,24 +63,24 @@ def test_pass_asset_create(
     )
 
     # Principal and Supply
-    assert not state.total_units()
-    assert not state.circulating_units()
-    assert not state.principal_discount()
+    assert not state.total_units
+    assert not state.circulating_units
+    assert not state.principal_discount
 
     # Coupons
-    assert not state.total_coupons()
+    assert not state.total_coupons
 
     # Time Schedule
-    assert not state.primary_distribution_opening_date()
-    assert not state.primary_distribution_closure_date()
-    assert not state.issuance_date()
-    assert not state.secondary_market_opening_date()
-    assert not state.secondary_market_closure_date()
-    assert not state.maturity_date()
+    assert not state.primary_distribution_opening_date
+    assert not state.primary_distribution_closure_date
+    assert not state.issuance_date
+    assert not state.secondary_market_opening_date
+    assert not state.secondary_market_closure_date
+    assert not state.maturity_date
 
     # Status
-    assert state.status() == sc_cfg.STATUS_EMPTY
-    assert not state.suspended()
+    assert state.status == sc_cfg.STATUS_EMPTY
+    assert not state.suspended
 
 
 def test_fail_invalid_state_schema() -> None:

tests/base_d_asa/test_asset_update.py

@@ -5,6 +5,7 @@
 from smart_contracts import errors as err
 from smart_contracts.artifacts.base_d_asa.base_d_asa_client import (
     AssetMetadata,
+    AssetUpdateArgs,
     BaseDAsaClient,
     CommonAppCallParams,
 )
@@ -25,7 +26,9 @@ def test_pass_update(
         prospectus_hash=bytes(32),
         prospectus_url="Updated Prospectus",
     )
-    base_d_asa_client_active.send.asset_update(metadata=updated_metadata)
+    base_d_asa_client_active.send.update.asset_update(
+        args=AssetUpdateArgs(metadata=updated_metadata)
+    )
     metadata = base_d_asa_client_active.send.get_asset_metadata().abi_return
     assert metadata.prospectus_url == updated_metadata.prospectus_url
 
@@ -36,9 +39,8 @@ def test_fail_unauthorized(
     base_d_asa_client_active: BaseDAsaClient,
 ) -> None:
     with pytest.raises(LogicError, match=err.UNAUTHORIZED):
-        base_d_asa_client_active.send.asset_update(
-            metadata=asset_metadata,
-            transaction_parameters=CommonAppCallParams(
-                sender=oscar.address, signer=oscar.signer
-            ),
+        base_d_asa_client_active.send.update.asset_update(
+            args=AssetUpdateArgs(metadata=asset_metadata),
+            params=CommonAppCallParams(sender=oscar.address, signer=oscar.signer),
+            compilation_params={},
         )

tests/base_d_asa/test_get_time_events.py

@@ -1,25 +1,14 @@
-from algokit_utils import OnCompleteCallParameters
-
-from smart_contracts import constants as sc_cst
 from smart_contracts.artifacts.base_d_asa.base_d_asa_client import BaseDAsaClient
 from tests.utils import DAsaConfig
 
 
 def test_pass_get_time_events(
     base_d_asa_cfg: DAsaConfig, base_d_asa_client_active: BaseDAsaClient
 ) -> None:
-    time_events = base_d_asa_client_active.get_time_events(
-        transaction_parameters=OnCompleteCallParameters(
-            boxes=[(base_d_asa_client_active.app_id, sc_cst.BOX_ID_TIME_EVENTS)]
-        )
-    ).return_value
+    time_events = base_d_asa_client_active.send.get_time_events().abi_return
     assert time_events == base_d_asa_cfg.time_events
 
 
 def test_pass_not_configured(base_d_asa_client_empty: BaseDAsaClient) -> None:
-    time_events = base_d_asa_client_empty.get_time_events(
-        transaction_parameters=OnCompleteCallParameters(
-            boxes=[(base_d_asa_client_empty.app_id, sc_cst.BOX_ID_TIME_EVENTS)]
-        )
-    ).return_value
+    time_events = base_d_asa_client_empty.send.get_time_events().abi_return
     assert not time_events

tests/base_d_asa/test_open_account.py

@@ -2,14 +2,19 @@
 
 import pytest
 from algokit_utils import (
+    AlgoAmount,
     AlgorandClient,
     LogicError,
-    OnCompleteCallParameters,
     SigningAccount,
 )
 
 from smart_contracts import errors as err
-from smart_contracts.artifacts.base_d_asa.base_d_asa_client import BaseDAsaClient
+from smart_contracts.artifacts.base_d_asa.base_d_asa_client import (
+    BaseDAsaClient,
+    CommonAppCallParams,
+    GetAccountInfoArgs,
+    OpenAccountArgs,
+)
 from tests.utils import DAsaAccount, DAsaAccountManager
 
 ACCOUNT_TEST_UNITS: Final[int] = 7
@@ -23,32 +28,26 @@ def test_pass_open_account(
     holding = algorand.account.random()
     payment = algorand.account.random()
 
-    base_d_asa_client_empty.open_account(
-        holding_address=holding.address,
-        payment_address=payment.address,
-        transaction_parameters=OnCompleteCallParameters(
+    base_d_asa_client_empty.send.open_account(
+        args=OpenAccountArgs(
+            holding_address=holding.address,
+            payment_address=payment.address,
+        ),
+        params=CommonAppCallParams(
+            sender=account_manager.address,
             signer=account_manager.signer,
-            boxes=[
-                (base_d_asa_client_empty.app_id, account_manager.box_id),
-                (
-                    base_d_asa_client_empty.app_id,
-                    DAsaAccount.box_id_from_address(holding.address),
-                ),
-            ],
+            static_fee=AlgoAmount.from_algo(1),
         ),
     )
 
-    d_asa_account_info = base_d_asa_client_empty.get_account_info(
-        holding_address=holding.address,
-        transaction_parameters=OnCompleteCallParameters(
-            boxes=[
-                (
-                    base_d_asa_client_empty.app_id,
-                    DAsaAccount.box_id_from_address(holding.address),
-                )
-            ]
+    d_asa_account_info = base_d_asa_client_empty.send.get_account_info(
+        args=GetAccountInfoArgs(
+            holding_address=holding.address,
         ),
-    ).return_value
+        params=CommonAppCallParams(
+            signer=account_manager.signer,
+        ),
+    ).abi_return
 
     assert d_asa_account_info.payment_address == payment.address
     assert d_asa_account_info.units == 0
@@ -66,21 +65,10 @@ def test_fail_unauthorized_caller(
     payment = algorand.account.random()
 
     with pytest.raises(LogicError, match=err.UNAUTHORIZED):
-        base_d_asa_client_empty.open_account(
-            holding_address=holding.address,
-            payment_address=payment.address,
-            transaction_parameters=OnCompleteCallParameters(
-                signer=oscar.signer,
-                boxes=[
-                    (
-                        base_d_asa_client_empty.app_id,
-                        DAsaAccountManager.box_id_from_address(oscar.address),
-                    ),
-                    (
-                        base_d_asa_client_empty.app_id,
-                        DAsaAccount.box_id_from_address(holding.address),
-                    ),
-                ],
+        base_d_asa_client_empty.send.open_account(
+            args=(holding.address, payment.address),
+            params=CommonAppCallParams(
+                sender=oscar.address,
             ),
         )
 
@@ -102,18 +90,10 @@ def test_fail_suspended(
     payment = algorand.account.random()
 
     with pytest.raises(LogicError, match=err.SUSPENDED):
-        base_d_asa_client_suspended.open_account(
-            holding_address=holding.address,
-            payment_address=payment.address,
-            transaction_parameters=OnCompleteCallParameters(
-                signer=account_manager.signer,
-                boxes=[
-                    (base_d_asa_client_suspended.app_id, account_manager.box_id),
-                    (
-                        base_d_asa_client_suspended.app_id,
-                        DAsaAccount.box_id_from_address(holding.address),
-                    ),
-                ],
+        base_d_asa_client_suspended.send.open_account(
+            args=(holding.address, payment.address),
+            params=CommonAppCallParams(
+                sender=account_manager.address,
             ),
         )
 
@@ -124,14 +104,9 @@ def test_fail_invalid_holding_address(
     account_a: DAsaAccount,
 ) -> None:
     with pytest.raises(LogicError, match=err.INVALID_HOLDING_ADDRESS):
-        base_d_asa_client_empty.open_account(
-            holding_address=account_a.holding_address,
-            payment_address=account_a.payment_address,
-            transaction_parameters=OnCompleteCallParameters(
-                signer=account_manager.signer,
-                boxes=[
-                    (base_d_asa_client_empty.app_id, account_manager.box_id),
-                    (base_d_asa_client_empty.app_id, account_a.box_id),
-                ],
+        base_d_asa_client_empty.send.open_account(
+            args=(account_a.holding_address, account_a.payment_address),
+            params=CommonAppCallParams(
+                sender=account_manager.address,
             ),
         )