Skip to content

Commit

Permalink
chore: merge conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
aorumbayev committed Aug 21, 2024
1 parent 2abc378 commit 21f43ca
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 2 additions & 0 deletions src/algopy_testing/_context_helpers/ledger_context.py
Original file line number Diff line number Diff line change
Expand Up @@ -138,7 +138,9 @@ def update_asset(self, asset_id: int, **asset_fields: typing.Unpack[AssetFields]
raise ValueError("Asset not found in testing context!")
self.asset_data[asset_id].update(asset_fields)

def get_app(
self, app_id: algopy.Contract | algopy.Application | algopy.UInt64 | int
) -> algopy.Application:
"""Get an application by ID, contract or app reference.
Args:
Expand Down
9 changes: 6 additions & 3 deletions src/algopy_testing/_value_generators/avm.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,12 @@

import algopy_testing
from algopy_testing._context_helpers import lazy_context
from algopy_testing.constants import ALWAYS_APPROVE_TEAL_PROGRAM, MAX_BYTES_SIZE, MAX_UINT64
from algopy_testing.constants import (
ALWAYS_APPROVE_TEAL_PROGRAM,
MAX_BYTES_SIZE,
MAX_UINT64,
MAX_UINT512,
)
from algopy_testing.models.account import AccountFields
from algopy_testing.models.application import ApplicationContextData, ApplicationFields
from algopy_testing.models.asset import AssetFields
Expand Down Expand Up @@ -44,9 +49,7 @@ def biguint(self, min_value: int = 0) -> algopy.BigUInt:
"""Generate a random BigUInt value within a specified range.
:param min_value: Minimum value. Defaults to 0.
:type min_value: int
:returns: The randomly generated BigUInt value.
:rtype: algopy.BigUInt
:raises ValueError: If `min_value` is negative.
"""
if min_value < 0:
Expand Down

0 comments on commit 21f43ca

Please sign in to comment.