Skip to content

Commit 67ce56c

Browse files
authored
Merge pull request #47 from algorandfoundation/fix/docs-typos
fix: typo in docs and remove unnecessary calls to Uint64 function
2 parents d5cec1d + 90efc15 commit 67ce56c

File tree

19 files changed

+114
-96
lines changed

19 files changed

+114
-96
lines changed

docs/code/index/functions/addEqualityTesters.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
> **addEqualityTesters**(`params`): `void`
1010
11-
Defined in: [src/set-up.ts:141](https://github.com/algorandfoundation/algorand-typescript-testing/blob/main/src/set-up.ts#L141)
11+
Defined in: [src/set-up.ts:159](https://github.com/algorandfoundation/algorand-typescript-testing/blob/main/src/set-up.ts#L159)
1212

1313
Adds custom equality testers for Algorand types to vitest's expect function.
1414
This allows vitest to properly compare Algorand types such as uint64, biguint, and bytes

docs/testing-guide/avm-types.md

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ const asset = algots.Asset(1001)
7676
const randomAsset = ctx.any.asset({
7777
clawback: ctx.any.account(), // Optional: Clawback address
7878
creator: ctx.any.account(), // Optional: Creator account
79-
decimals: algots.Uint64(6), // Optional: Number of decimals
79+
decimals: 6, // Optional: Number of decimals
8080
defaultFrozen: false, // Optional: Default frozen state
8181
freeze: ctx.any.account(), // Optional: Freeze address
8282
manager: ctx.any.account(), // Optional: Manager address
8383
metadataHash: ctx.any.bytes(32), // Optional: Metadata hash
8484
name: algots.Bytes(ctx.any.string()), // Optional: Asset name
8585
reserve: ctx.any.account(), // Optional: Reserve address
86-
total: algots.Uint64(1000000), // Optional: Total supply
86+
total: 1000000, // Optional: Total supply
8787
unitName: algots.Bytes(ctx.any.string()), // Optional: Unit name
8888
url: algots.Bytes(ctx.any.string()), // Optional: Asset URL
8989
})
@@ -95,14 +95,14 @@ const asset = ctx.ledger.getAsset(randomAsset.id)
9595
ctx.ledger.patchAssetData(randomAsset, {
9696
clawback: ctx.any.account(), // Optional: New clawback address
9797
creator: ctx.any.account(), // Optional: Creator account
98-
decimals: algots.Uint64(6), // Optional: New number of decimals
98+
decimals: 6, // Optional: New number of decimals
9999
defaultFrozen: false, // Optional: Default frozen state
100100
freeze: ctx.any.account(), // Optional: New freeze address
101101
manager: ctx.any.account(), // Optional: New manager address
102102
metadataHash: ctx.any.bytes(32), // Optional: New metadata hash
103103
name: algots.Bytes(ctx.any.string()), // Optional: New asset name
104104
reserve: ctx.any.account(), // Optional: New reserve address
105-
total: algots.Uint64(1000000), // Optional: New total supply
105+
total: 1000000, // Optional: New total supply
106106
unitName: algots.Bytes(ctx.any.string()), // Optional: Unit name
107107
url: algots.Bytes(ctx.any.string()), // Optional: New asset URL
108108
})
@@ -171,11 +171,11 @@ const application = algots.Application()
171171
const randomApp = ctx.any.application({
172172
approvalProgram: algots.Bytes(''), // Optional: Specify a custom approval program
173173
clearStateProgram: algots.Bytes(''), // Optional: Specify a custom clear state program
174-
globalNumUint: algots.Uint64(1), // Optional: Number of global uint values
175-
globalNumBytes: algots.Uint64(1), // Optional: Number of global byte values
176-
localNumUint: algots.Uint64(1), // Optional: Number of local uint values
177-
localNumBytes: algots.Uint64(1), // Optional: Number of local byte values
178-
extraProgramPages: algots.Uint64(1), // Optional: Number of extra program pages
174+
globalNumUint: 1, // Optional: Number of global uint values
175+
globalNumBytes: 1, // Optional: Number of global byte values
176+
localNumUint: 1, // Optional: Number of local uint values
177+
localNumBytes: 1, // Optional: Number of local byte values
178+
extraProgramPages: 1, // Optional: Number of extra program pages
179179
creator: ctx.defaultSender, // Optional: Specify the creator account
180180
})
181181

@@ -187,11 +187,11 @@ ctx.ledger.patchApplicationData(randomApp, {
187187
application: {
188188
approvalProgram: algots.Bytes(''), // Optional: New approval program
189189
clearStateProgram: algots.Bytes(''), // Optional: New clear state program
190-
globalNumUint: algots.Uint64(1), // Optional: New number of global uint values
191-
globalNumBytes: algots.Uint64(1), // Optional: New number of global byte values
192-
localNumUint: algots.Uint64(1), // Optional: New number of local uint values
193-
localNumBytes: algots.Uint64(1), // Optional: New number of local byte values
194-
extraProgramPages: algots.Uint64(1), // Optional: New number of extra program pages
190+
globalNumUint: 1, // Optional: New number of global uint values
191+
globalNumBytes: 1, // Optional: New number of global byte values
192+
localNumUint: 1, // Optional: New number of local uint values
193+
localNumBytes: 1, // Optional: New number of local byte values
194+
extraProgramPages: 1, // Optional: New number of extra program pages
195195
creator: ctx.defaultSender, // Optional: New creator account
196196
},
197197
})

docs/testing-guide/contract-testing.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class SimpleVotingContract extends arc4.Contract {
3737

3838
@arc4.abimethod()
3939
vote(): uint64 {
40-
assert(this.voted(Txn.sender).value === Uint64(0), 'Account has already voted')
40+
assert(this.voted(Txn.sender).value === 0, 'Account has already voted')
4141
this.votes.value = this.votes.value + 1
4242
this.voted(Txn.sender).value = Uint64(1)
4343
return this.votes.value

docs/testing-guide/opcodes.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,8 @@ class MyContract extends arc4.Contract {
8989
// Create the context manager for snippets below
9090
const ctx = new TestExecutionContext()
9191
ctx.ledger.patchGlobalData({
92-
minTxnFee: Uint64(1000),
93-
minBalance: Uint64(100000),
92+
minTxnFee: 1000,
93+
minBalance: 100000,
9494
})
9595

9696
const contract = ctx.contract.create(MyContract)
@@ -140,7 +140,7 @@ class AssetContract extends arc4.Contract {
140140
const ctx = new TestExecutionContext()
141141

142142
const contract = ctx.contract.create(AssetContract)
143-
const asset = ctx.any.asset({ total: Uint64(1000000) })
143+
const asset = ctx.any.asset({ total: 1000000 })
144144
const account = ctx.any.account({ optedAssetBalances: new Map([[asset.id, Uint64(5000)]]) })
145145

146146
const result = contract.checkAssetHolding(account, asset)
@@ -215,7 +215,7 @@ class AccountParamsContract extends arc4.Contract {
215215
const ctx = new TestExecutionContext()
216216

217217
const contract = ctx.contract.create(AccountParamsContract)
218-
const account = ctx.any.account({ balance: Uint64(1000000) })
218+
const account = ctx.any.account({ balance: 1000000 })
219219

220220
const balance = contract.getAccountBalance(account)
221221
expect(balance).toEqual(Uint64(1000000))
@@ -264,7 +264,7 @@ class AssetParamsContract extends arc4.Contract {
264264
const ctx = new TestExecutionContext()
265265

266266
const contract = ctx.contract.create(AssetParamsContract)
267-
const asset = ctx.any.asset({ total: Uint64(1000000), decimals: Uint64(6) })
267+
const asset = ctx.any.asset({ total: 1000000, decimals: 6 })
268268
const total = contract.getAssetTotal(asset.id)
269269
expect(total).toEqual(1000000)
270270
```

docs/testing-guide/transactions.md

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,15 +19,15 @@ Refers to test implementation of transaction stubs available under `algots.gtxn.
1919
const payTxn = ctx.any.txn.payment({
2020
sender: ctx.any.account(), // Optional: Defaults to context's default sender if not provided
2121
receiver: ctx.any.account(), // Required
22-
amount: algots.Uint64(1000000), // Required
22+
amount: 1000000, // Required
2323
})
2424

2525
// Generate a random asset transfer transaction
2626
const assetTransferTxn = ctx.any.txn.assetTransfer({
2727
sender: ctx.any.account(), // Optional: Defaults to context's default sender if not provided
2828
assetReceiver: ctx.any.account(), // Required
29-
xferAsset: ctx.any.asset({ assetId: algots.Uint64(1) }), // Required
30-
assetAmount: algots.Uint64(1000), // Required
29+
xferAsset: ctx.any.asset({ assetId: 1 }), // Required
30+
assetAmount: 1000, // Required
3131
})
3232

3333
// Generate a random application call transaction
@@ -64,9 +64,9 @@ const keyRegTxn = ctx.any.txn.keyRegistration({
6464
sender: ctx.any.account(), // Optional: Defaults to context's default sender if not provided
6565
voteKey: algots.Bytes('vote_pk'), // Optional: Defaults to empty bytes if not provided
6666
selectionKey: algots.Bytes('selection_pk'), // Optional: Defaults to empty bytes if not provided
67-
voteFirst: algots.Uint64(1), // Optional: Defaults to 0 if not provided
68-
voteLast: algots.Uint64(1000), // Optional: Defaults to 0 if not provided
69-
voteKeyDilution: algots.Uint64(10000), // Optional: Defaults to 0 if not provided
67+
voteFirst: 1, // Optional: Defaults to 0 if not provided
68+
voteLast: 1000, // Optional: Defaults to 0 if not provided
69+
voteKeyDilution: 10000, // Optional: Defaults to 0 if not provided
7070
})
7171

7272
// Generate a random asset freeze transaction
@@ -133,7 +133,7 @@ class MyContract extends arc4.Contract {
133133
itxn
134134
.payment({
135135
receiver: Txn.sender,
136-
amount: Uint64(1),
136+
amount: 1,
137137
})
138138
.submit()
139139
}

examples/arc4-simple-voting/contract.algo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ export default class VotingContract extends arc4.Contract {
1212
}
1313
@arc4.abimethod()
1414
public vote(pay: gtxn.PaymentTxn): arc4.Bool {
15-
assert(op.Global.groupSize === Uint64(2), 'Expected 2 transactions')
16-
assert(pay.amount === Uint64(10_000), 'Incorrect payment amount')
15+
assert(op.Global.groupSize === 2, 'Expected 2 transactions')
16+
assert(pay.amount === 10_000, 'Incorrect payment amount')
1717
assert(pay.sender === Txn.sender, 'Payment sender must match transaction sender')
1818

1919
if (this.voted(Txn.sender).hasValue) {

examples/arc4-simple-voting/contract.spec.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ describe('Voting contract', () => {
1616
const voter = ctx.defaultSender
1717
const payment = ctx.any.txn.payment({
1818
sender: voter,
19-
amount: Uint64(10_000),
19+
amount: 10_000,
2020
})
2121

2222
const result = contract.vote(payment)

examples/marketplace/contract.spec.ts

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { arc4, Bytes, Uint64 } from '@algorandfoundation/algorand-typescript'
1+
import { arc4, Bytes } from '@algorandfoundation/algorand-typescript'
22
import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
33
import { interpretAsArc4 } from '@algorandfoundation/algorand-typescript/arc4'
44
import { afterEach } from 'node:test'
@@ -16,19 +16,19 @@ describe('DigitalMarketplace', () => {
1616

1717
test('first deposit', () => {
1818
const contract = ctx.contract.create(DigitalMarketplace)
19-
const testAsset = ctx.any.asset({ decimals: Uint64(TEST_DECIMALS) })
19+
const testAsset = ctx.any.asset({ decimals: TEST_DECIMALS })
2020
const testNonce = ctx.any.arc4.uintN64()
2121

2222
// Arrange
2323
const testApp = ctx.ledger.getApplicationForContract(contract)
2424

2525
// Act
2626
contract.firstDeposit(
27-
ctx.any.txn.payment({ receiver: testApp.address, amount: Uint64(50500) }),
27+
ctx.any.txn.payment({ receiver: testApp.address, amount: 50500 }),
2828
ctx.any.txn.assetTransfer({
2929
xferAsset: testAsset,
3030
assetReceiver: testApp.address,
31-
assetAmount: Uint64(10),
31+
assetAmount: 10,
3232
}),
3333
ctx.any.arc4.uintN64(),
3434
testNonce,
@@ -46,7 +46,7 @@ describe('DigitalMarketplace', () => {
4646

4747
test('deposit', () => {
4848
const contract = ctx.contract.create(DigitalMarketplace)
49-
const testAsset = ctx.any.asset({ decimals: Uint64(TEST_DECIMALS) })
49+
const testAsset = ctx.any.asset({ decimals: TEST_DECIMALS })
5050
const testNonce = ctx.any.arc4.uintN64()
5151

5252
// Arrange
@@ -72,7 +72,7 @@ describe('DigitalMarketplace', () => {
7272
ctx.any.txn.assetTransfer({
7373
xferAsset: testAsset,
7474
assetReceiver: testApp.address,
75-
assetAmount: Uint64(10),
75+
assetAmount: 10,
7676
}),
7777
testNonce,
7878
)
@@ -83,7 +83,7 @@ describe('DigitalMarketplace', () => {
8383

8484
test('setPrice', () => {
8585
const contract = ctx.contract.create(DigitalMarketplace)
86-
const testAsset = ctx.any.asset({ decimals: Uint64(TEST_DECIMALS) })
86+
const testAsset = ctx.any.asset({ decimals: TEST_DECIMALS })
8787
const testNonce = ctx.any.arc4.uintN64()
8888
// Arrange
8989
const testUnitaryPrice = ctx.any.arc4.uintN64()
@@ -113,7 +113,7 @@ describe('DigitalMarketplace', () => {
113113

114114
test('buy', () => {
115115
const contract = ctx.contract.create(DigitalMarketplace)
116-
const testAsset = ctx.any.asset({ decimals: Uint64(TEST_DECIMALS) })
116+
const testAsset = ctx.any.asset({ decimals: TEST_DECIMALS })
117117
const testNonce = ctx.any.arc4.uintN64()
118118
// Arrange
119119
const testOwner = new arc4.Address(ctx.defaultSender)
@@ -153,7 +153,7 @@ describe('DigitalMarketplace', () => {
153153

154154
test('withdraw', () => {
155155
const contract = ctx.contract.create(DigitalMarketplace)
156-
const testAsset = ctx.any.asset({ decimals: Uint64(TEST_DECIMALS) })
156+
const testAsset = ctx.any.asset({ decimals: TEST_DECIMALS })
157157
const testNonce = ctx.any.arc4.uintN64()
158158

159159
// Arrange
@@ -194,7 +194,7 @@ describe('DigitalMarketplace', () => {
194194

195195
test('bid', () => {
196196
const contract = ctx.contract.create(DigitalMarketplace)
197-
const testAsset = ctx.any.asset({ decimals: Uint64(TEST_DECIMALS) })
197+
const testAsset = ctx.any.asset({ decimals: TEST_DECIMALS })
198198
const testNonce = ctx.any.arc4.uintN64()
199199

200200
// Arrange
@@ -245,7 +245,7 @@ describe('DigitalMarketplace', () => {
245245

246246
test('acceptBid', () => {
247247
const contract = ctx.contract.create(DigitalMarketplace)
248-
const testAsset = ctx.any.asset({ decimals: Uint64(TEST_DECIMALS) })
248+
const testAsset = ctx.any.asset({ decimals: TEST_DECIMALS })
249249
const testNonce = ctx.any.arc4.uintN64()
250250
// Arrange
251251
const owner = ctx.defaultSender

examples/proof-of-attendance/contract.spec.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Account, Bytes, op, Uint64 } from '@algorandfoundation/algorand-typescript'
1+
import { Account, Bytes, op } from '@algorandfoundation/algorand-typescript'
22
import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
33
import { afterEach, describe, expect, it, test } from 'vitest'
44
import ProofOfAttendance from './contract.algo'
@@ -64,8 +64,8 @@ describe('ProofOfAttendance', () => {
6464
assetCloseTo: Account(ZERO_ADDRESS),
6565
rekeyTo: Account(ZERO_ADDRESS),
6666
xferAsset: dummyPoa,
67-
fee: Uint64(0),
68-
assetAmount: Uint64(0),
67+
fee: 0,
68+
assetAmount: 0,
6969
})
7070
ctx.ledger.setBox(contract, keyPrefix.concat(ctx.defaultSender.bytes), op.itob(dummyPoa.id))
7171

examples/scratch-storage/contract.algo.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ export class ScratchSlotsContract extends arc4.Contract {
77
public storeData(): boolean {
88
op.Scratch.store(1, Uint64(5))
99
op.Scratch.store(2, Bytes('Hello World'))
10-
assert(op.Scratch.loadUint64(1) === Uint64(5))
10+
assert(op.Scratch.loadUint64(1) === 5)
1111
assert(op.Scratch.loadBytes(2) === Bytes('Hello World'))
1212
return true
1313
}
@@ -16,7 +16,7 @@ export class ScratchSlotsContract extends arc4.Contract {
1616
@contract({ scratchSlots: [1, 2] })
1717
export class SimpleScratchSlotsContract extends BaseContract {
1818
approvalProgram(): uint64 {
19-
assert(op.Scratch.loadUint64(1) === Uint64(5))
19+
assert(op.Scratch.loadUint64(1) === 5)
2020
assert(op.Scratch.loadBytes(2) === Bytes('Hello World'))
2121
return Uint64(1)
2222
}

0 commit comments

Comments
 (0)