fix: when generating app/asset id's skip any that might already be reserved

Author: daniel-makerx

src/algopy_testing/_context_helpers/ledger_context.py

@@ -27,8 +27,20 @@ def __init__(self) -> None:
         self.blocks: dict[int, dict[str, int]] = {}
         self.global_fields: GlobalFields = get_default_global_fields()
 
-        self.asset_id = iter(range(1001, 2**64))
-        self.app_id = iter(range(1001, 2**64))
+        self._asset_id = iter(range(1001, 2**64))
+        self._app_id = iter(range(1001, 2**64))
+
+    def get_next_asset_id(self) -> int:
+        while True:
+            asset_id = next(self._asset_id)
+            if asset_id not in self.asset_data:
+                return asset_id
+
+    def get_next_app_id(self) -> int:
+        while True:
+            app_id = next(self._app_id)
+            if app_id not in self.app_data:
+                return app_id
 
     def get_account(self, address: str) -> algopy.Account:
         """Get an account by address.

src/algopy_testing/_value_generators/avm.py

@@ -118,7 +118,7 @@ def asset(
             raise ValueError("Asset with such ID already exists in testing context!")
 
         # TODO: 1.0 ensure passed fields are valid names and types
-        new_asset = algopy.Asset(asset_id or next(lazy_context.ledger.asset_id))
+        new_asset = algopy.Asset(asset_id or lazy_context.ledger.get_next_asset_id())
         default_asset_fields = {
             "total": lazy_context.any.uint64(),
             "decimals": lazy_context.any.uint64(1, 6),
@@ -162,7 +162,7 @@ def application(  # type: ignore[misc]
         """
         import algopy_testing
 
-        new_app_id = id if id is not None else next(lazy_context.ledger.app_id)
+        new_app_id = id if id is not None else lazy_context.ledger.get_next_app_id()
 
         if new_app_id in lazy_context.ledger.app_data:
             raise ValueError(

tests/test_context.py

@@ -118,8 +118,8 @@ def test_context_reset() -> None:
         with pytest.raises(ValueError, match="No group transactions found"):
             assert context.txn.last_group
         assert len(context.txn._groups) == 0
-        assert next(context.ledger.asset_id) == 1001
-        assert next(context.ledger.app_id) == 1001
+        assert context.ledger.get_next_asset_id() == 1001
+        assert context.ledger.get_next_app_id() == 1001
 
 
 def test_algopy_testing_context() -> None: