Skip to content

Commit

Permalink
use zero address from transaction package
Browse files Browse the repository at this point in the history
  • Loading branch information
barnjamin committed Apr 21, 2022
1 parent bce9326 commit be28ad9
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 14 deletions.
2 changes: 1 addition & 1 deletion algosdk/future/transaction.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
from nacl.signing import SigningKey, VerifyKey
from nacl.exceptions import BadSignatureError

ZERO_ADDRESS = "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY5HFKQ"
ZERO_ADDRESS = encoding.encode_address(bytes(32))


class SuggestedParams:
Expand Down
29 changes: 16 additions & 13 deletions algosdk/testing/dryrun.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
)


ZERO_ADDRESS = encode_address(bytes(32))
PRINTABLE = frozenset(string.printable)


Expand All @@ -33,7 +32,7 @@ class LSig:
class App:
"""Application program parameters"""

creator: str = ZERO_ADDRESS
creator: str = transaction.ZERO_ADDRESS
round: int = None
app_idx: int = 0
on_complete: int = 0
Expand All @@ -54,7 +53,7 @@ def assertPass(
prog_drr_txns,
lsig=None,
app=None,
sender=ZERO_ADDRESS,
sender=transaction.ZERO_ADDRESS,
txn_index=None,
msg=None,
):
Expand Down Expand Up @@ -90,7 +89,7 @@ def assertReject(
prog_drr_txns,
lsig=None,
app=None,
sender=ZERO_ADDRESS,
sender=transaction.ZERO_ADDRESS,
txn_index=None,
msg=None,
):
Expand Down Expand Up @@ -127,7 +126,7 @@ def assertStatus(
status,
lsig=None,
app=None,
sender=ZERO_ADDRESS,
sender=transaction.ZERO_ADDRESS,
txn_index=None,
msg=None,
):
Expand Down Expand Up @@ -194,7 +193,7 @@ def assertNoError(
prog_drr_txns,
lsig=None,
app=None,
sender=ZERO_ADDRESS,
sender=transaction.ZERO_ADDRESS,
txn_index=None,
msg=None,
):
Expand Down Expand Up @@ -225,7 +224,7 @@ def assertError(
pattern=None,
lsig=None,
app=None,
sender=ZERO_ADDRESS,
sender=transaction.ZERO_ADDRESS,
txn_index=None,
msg=None,
):
Expand Down Expand Up @@ -258,7 +257,7 @@ def assertGlobalStateContains(
prog_drr_txns,
delta_value,
app=None,
sender=ZERO_ADDRESS,
sender=transaction.ZERO_ADDRESS,
txn_index=None,
msg=None,
):
Expand Down Expand Up @@ -326,7 +325,7 @@ def assertLocalStateContains(
addr,
delta_value,
app=None,
sender=ZERO_ADDRESS,
sender=transaction.ZERO_ADDRESS,
txn_index=None,
msg=None,
):
Expand Down Expand Up @@ -398,7 +397,7 @@ def assertLocalStateContains(
self._fail(msg)

def dryrun_request(
self, program, lsig=None, app=None, sender=ZERO_ADDRESS
self, program, lsig=None, app=None, sender=transaction.ZERO_ADDRESS
):
"""
Helper function for creation DryrunRequest and making the REST request
Expand Down Expand Up @@ -463,7 +462,7 @@ def dryrun_request_from_txn(self, txns, app):
@staticmethod
def default_address():
"""Helper function returning default zero addr"""
return ZERO_ADDRESS
return transaction.ZERO_ADDRESS

def _dryrun_request(self, prog_drr_txns, lsig, app, sender):
"""
Expand All @@ -478,7 +477,11 @@ def _dryrun_request(self, prog_drr_txns, lsig, app, sender):
return drr

def _checked_request(
self, prog_drr_txns, lsig=None, app=None, sender=ZERO_ADDRESS
self,
prog_drr_txns,
lsig=None,
app=None,
sender=transaction.ZERO_ADDRESS,
):
"""
Helper function to make a dryrun request and perform basic validation
Expand All @@ -504,7 +507,7 @@ class Helper:

@classmethod
def build_dryrun_request(
cls, program, lsig=None, app=None, sender=ZERO_ADDRESS
cls, program, lsig=None, app=None, sender=transaction.ZERO_ADDRESS
):
"""
Helper function for creation DryrunRequest object from a program.
Expand Down

0 comments on commit be28ad9

Please sign in to comment.