Skip to content

Commit 9bcd596

Browse files
committed
Merge branch 'abi-router' into disallow-reference-return
2 parents 92a6b49 + a22df12 commit 9bcd596

File tree

2 files changed

+23
-3
lines changed

2 files changed

+23
-3
lines changed

pyteal/ast/router.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -98,9 +98,9 @@ def __condition_under_config(cc: CallConfig) -> Expr | int:
9898
case CallConfig.NEVER:
9999
return 0
100100
case CallConfig.CALL:
101-
return Txn.application_id() == Int(0)
102-
case CallConfig.CREATE:
103101
return Txn.application_id() != Int(0)
102+
case CallConfig.CREATE:
103+
return Txn.application_id() == Int(0)
104104
case CallConfig.ALL:
105105
return 1
106106
case _:

pyteal/compiler/compiler_test.py

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2312,7 +2312,7 @@ def all_laid_to_args(
23122312
==
23132313
txn ApplicationID
23142314
intc_0 // 0
2315-
==
2315+
!=
23162316
&&
23172317
bnz main_l9
23182318
err
@@ -2400,7 +2400,11 @@ def all_laid_to_args(
24002400
==
24012401
txn ApplicationID
24022402
intc_0 // 0
2403+
<<<<<<< HEAD
24032404
==
2405+
=======
2406+
!=
2407+
>>>>>>> aa69b0f598dc24bba267bbaf498d5480bb1a835c
24042408
&&
24052409
bnz main_l12
24062410
err
@@ -2428,7 +2432,11 @@ def all_laid_to_args(
24282432
==
24292433
txn ApplicationID
24302434
intc_0 // 0
2435+
<<<<<<< HEAD
24312436
==
2437+
=======
2438+
!=
2439+
>>>>>>> aa69b0f598dc24bba267bbaf498d5480bb1a835c
24322440
&&
24332441
bnz main_l15
24342442
err
@@ -2456,7 +2464,11 @@ def all_laid_to_args(
24562464
==
24572465
txn ApplicationID
24582466
intc_0 // 0
2467+
<<<<<<< HEAD
24592468
==
2469+
=======
2470+
!=
2471+
>>>>>>> aa69b0f598dc24bba267bbaf498d5480bb1a835c
24602472
&&
24612473
bnz main_l18
24622474
err
@@ -2484,7 +2496,11 @@ def all_laid_to_args(
24842496
==
24852497
txn ApplicationID
24862498
intc_0 // 0
2499+
<<<<<<< HEAD
24872500
==
2501+
=======
2502+
!=
2503+
>>>>>>> aa69b0f598dc24bba267bbaf498d5480bb1a835c
24882504
&&
24892505
bnz main_l21
24902506
err
@@ -2512,7 +2528,11 @@ def all_laid_to_args(
25122528
==
25132529
txn ApplicationID
25142530
intc_0 // 0
2531+
<<<<<<< HEAD
25152532
==
2533+
=======
2534+
!=
2535+
>>>>>>> aa69b0f598dc24bba267bbaf498d5480bb1a835c
25162536
&&
25172537
bnz main_l24
25182538
err

0 commit comments

Comments
 (0)