Skip to content

Commit d610b71

Browse files
boblatboblat
authored
Merge pull request #37 from algorandfoundation/refactor/async
refactor: remove avm version check as algod latest image is now v4
2 parents 1dd7b2f + d69a6ce commit d610b71

18 files changed

+58
-70
lines changed

‎tests/arc4/address.spec.ts‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -14,31 +14,31 @@ const testData = [
1414
Bytes.fromHex(`${'00'.repeat(31)}ff`),
1515
]
1616

17-
describe('arc4.Address', async () => {
17+
describe('arc4.Address', () => {
1818
const ctx = new TestExecutionContext()
19-
afterEach(async () => {
19+
afterEach(() => {
2020
ctx.reset()
2121
})
2222

23-
test.each(testData)('create address from bytes', async (value) => {
23+
test.each(testData)('create address from bytes', (value) => {
2424
const sdkResult = getABIEncodedValue(asUint8Array(value), abiTypeString, {})
2525
const result = new Address(value)
2626
expect(result.bytes).toEqual(sdkResult)
2727
})
28-
test.each(testData)('create address from str', async (value) => {
28+
test.each(testData)('create address from str', (value) => {
2929
const stringValue = encodeAddress(asUint8Array(value))
3030
const sdkResult = getABIEncodedValue(stringValue, abiTypeString, {})
3131
const result = new Address(stringValue)
3232
expect(result.bytes).toEqual(sdkResult)
3333
})
34-
test.each(testData)('create address from Account', async (value) => {
34+
test.each(testData)('create address from Account', (value) => {
3535
const accountValue = Account(value)
3636
const sdkResult = getABIEncodedValue(asUint8Array(accountValue.bytes), abiTypeString, {})
3737
const result = new Address(accountValue)
3838
expect(result.bytes).toEqual(sdkResult)
3939
})
4040

41-
test.each(testData)('get item from address created from bytes', async (value) => {
41+
test.each(testData)('get item from address created from bytes', (value) => {
4242
const uint8ArrayValue = asUint8Array(value)
4343
const result = new Address(value)
4444
let i = 0
@@ -47,7 +47,7 @@ describe('arc4.Address', async () => {
4747
}
4848
expect(result.length).toEqual(uint8ArrayValue.length)
4949
})
50-
test.each(testData)('get item from address created from str', async (value) => {
50+
test.each(testData)('get item from address created from str', (value) => {
5151
const uint8ArrayValue = asUint8Array(value)
5252
const stringValue = encodeAddress(uint8ArrayValue)
5353
const result = new Address(stringValue)
@@ -57,7 +57,7 @@ describe('arc4.Address', async () => {
5757
}
5858
expect(result.length).toEqual(uint8ArrayValue.length)
5959
})
60-
test.each(testData)('get item from address created from Account', async (value) => {
60+
test.each(testData)('get item from address created from Account', (value) => {
6161
const uint8ArrayValue = asUint8Array(value)
6262
const accountValue = Account(value)
6363
const result = new Address(accountValue)
@@ -68,13 +68,13 @@ describe('arc4.Address', async () => {
6868
expect(result.length).toEqual(uint8ArrayValue.length)
6969
})
7070

71-
test.each(testData)('fromBytes method', async (value) => {
71+
test.each(testData)('fromBytes method', (value) => {
7272
const sdkResult = getABIEncodedValue(asUint8Array(value), abiTypeString, {})
7373
const result = interpretAsArc4<Address>(value)
7474
expect(result.bytes).toEqual(sdkResult)
7575
})
7676

77-
test.each(testData)('fromLog method', async (value) => {
77+
test.each(testData)('fromLog method', (value) => {
7878
const sdkResult = getABIEncodedValue(asUint8Array(value), abiTypeString, {})
7979
const paddedValue = Bytes([...asUint8Array(ABI_RETURN_VALUE_LOG_PREFIX), ...asUint8Array(value)])
8080
const result = interpretAsArc4<Address>(paddedValue, 'log')

‎tests/arc4/bool.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ describe('arc4.Bool', async () => {
1212
const appClient = await getAlgorandAppClient(appSpecJson as AppSpec)
1313
const ctx = new TestExecutionContext()
1414

15-
afterEach(async () => {
15+
afterEach(() => {
1616
ctx.reset()
1717
})
1818

‎tests/arc4/byte.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('arc4.Byte', async () => {
1414
const appClient = await getAlgorandAppClient(appSpecJson as AppSpec)
1515
const ctx = new TestExecutionContext()
1616

17-
afterEach(async () => {
17+
afterEach(() => {
1818
ctx.reset()
1919
})
2020

‎tests/arc4/dynamic-array.spec.ts‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -333,9 +333,9 @@ const structDynamicArray = {
333333
},
334334
}
335335

336-
describe('arc4.DynamicArray', async () => {
336+
describe('arc4.DynamicArray', () => {
337337
const ctx = new TestExecutionContext()
338-
afterEach(async () => {
338+
afterEach(() => {
339339
ctx.reset()
340340
})
341341

@@ -353,7 +353,7 @@ describe('arc4.DynamicArray', async () => {
353353
stringDynamicArrayOfArrayOfArray,
354354
tupleDynamicArray,
355355
structDynamicArray,
356-
])('should be able to get bytes representation', async (data) => {
356+
])('should be able to get bytes representation', (data) => {
357357
const sdkResult = getABIEncodedValue(data.nativeValues(), data.abiTypeString, {})
358358
const result = data.array().bytes
359359
expect(result).toEqual(sdkResult)
@@ -373,7 +373,7 @@ describe('arc4.DynamicArray', async () => {
373373
stringDynamicArrayOfArrayOfArray,
374374
tupleDynamicArray,
375375
structDynamicArray,
376-
])('copy dynamic array', async (data) => {
376+
])('copy dynamic array', (data) => {
377377
const sdkResult = getABIEncodedValue(data.nativeValues(), data.abiTypeString, {})
378378
const original = data.array()
379379
const copy = original.copy()
@@ -396,7 +396,7 @@ describe('arc4.DynamicArray', async () => {
396396
stringDynamicArrayOfArrayOfArray,
397397
tupleDynamicArray,
398398
structDynamicArray,
399-
])('get item from dynamic array', async (data) => {
399+
])('get item from dynamic array', (data) => {
400400
const dynamicArray = data.array()
401401
const nativeValues = data.nativeValues()
402402
for (let i = 0; i < dynamicArray.length; i++) {
@@ -419,7 +419,7 @@ describe('arc4.DynamicArray', async () => {
419419
stringDynamicArrayOfArrayOfArray,
420420
tupleDynamicArray,
421421
structDynamicArray,
422-
])('set item in dynamic array', async (data) => {
422+
])('set item in dynamic array', (data) => {
423423
const nativeValues = data.nativeValues()
424424
const nativeValuesCopy = [...nativeValues]
425425
const nativeTemp = nativeValuesCopy.at(-1)!
@@ -451,7 +451,7 @@ describe('arc4.DynamicArray', async () => {
451451
stringDynamicArrayOfArrayOfArray,
452452
tupleDynamicArray,
453453
structDynamicArray,
454-
])('create dynamic array from bytes', async (data) => {
454+
])('create dynamic array from bytes', (data) => {
455455
const sdkEncodedBytes = getABIEncodedValue(data.nativeValues(), data.abiTypeString, {})
456456
const result = data.create(Bytes(sdkEncodedBytes))
457457
const nativeValues = data.nativeValues()
@@ -474,7 +474,7 @@ describe('arc4.DynamicArray', async () => {
474474
stringDynamicArrayOfArrayOfArray,
475475
tupleDynamicArray,
476476
structDynamicArray,
477-
])('push item to dynamic array', async (data) => {
477+
])('push item to dynamic array', (data) => {
478478
const nativeValues = data.nativeValues()
479479
const nativeValuesCopy = [...nativeValues]
480480
nativeValuesCopy.push(nativeValues.at(-1)!)
@@ -503,7 +503,7 @@ describe('arc4.DynamicArray', async () => {
503503
stringDynamicArrayOfArrayOfArray,
504504
tupleDynamicArray,
505505
structDynamicArray,
506-
])('push item to empty dynamic array', async (data) => {
506+
])('push item to empty dynamic array', (data) => {
507507
const nativeValues = data.nativeValues()
508508
const sdkResult = getABIEncodedValue(nativeValues, data.abiTypeString, {})
509509

@@ -527,7 +527,7 @@ describe('arc4.DynamicArray', async () => {
527527
stringDynamicArrayOfArrayOfArray,
528528
tupleDynamicArray,
529529
structDynamicArray,
530-
])('push item to empty dynamic array created from bytes', async (data) => {
530+
])('push item to empty dynamic array created from bytes', (data) => {
531531
const nativeValues = data.nativeValues()
532532
const sdkResult = getABIEncodedValue(nativeValues, data.abiTypeString, {})
533533

@@ -551,7 +551,7 @@ describe('arc4.DynamicArray', async () => {
551551
stringDynamicArrayOfArrayOfArray,
552552
tupleDynamicArray,
553553
structDynamicArray,
554-
])('pop item from dynamic array', async (data) => {
554+
])('pop item from dynamic array', (data) => {
555555
const nativeValues = data.nativeValues()
556556
const nativeValuesCopy = [...nativeValues]
557557
const nativeValue1 = nativeValuesCopy.pop()
@@ -570,7 +570,7 @@ describe('arc4.DynamicArray', async () => {
570570
expect(result).toEqual(Bytes(sdkResult))
571571
})
572572

573-
it('set item in nested dynamic array', async () => {
573+
it('set item in nested dynamic array', () => {
574574
const data = stringDynamicArrayOfArrayOfArray
575575
const nativeValues = data.nativeValues()
576576
nativeValues[0][0][0] = 'new value'
@@ -583,7 +583,7 @@ describe('arc4.DynamicArray', async () => {
583583
expect(result).toEqual(Bytes(sdkResult))
584584
})
585585

586-
it('set item in nested dynamic array created from bytes', async () => {
586+
it('set item in nested dynamic array created from bytes', () => {
587587
const data = stringDynamicArrayOfArrayOfArray
588588
const nativeValues = data.nativeValues()
589589
nativeValues[0][0][0] = 'new value'

‎tests/arc4/emit.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ describe('arc4.emit', async () => {
4444
const appClient = await getAlgorandAppClient(appSpecJson as AppSpec)
4545
const ctx = new TestExecutionContext()
4646

47-
afterEach(async () => {
47+
afterEach(() => {
4848
ctx.reset()
4949
})
5050

‎tests/arc4/static-array.spec.ts‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -320,9 +320,9 @@ const structStaticArray = {
320320
},
321321
}
322322

323-
describe('arc4.StaticArray', async () => {
323+
describe('arc4.StaticArray', () => {
324324
const ctx = new TestExecutionContext()
325-
afterEach(async () => {
325+
afterEach(() => {
326326
ctx.reset()
327327
})
328328

@@ -340,7 +340,7 @@ describe('arc4.StaticArray', async () => {
340340
stringStaticArrayOfArrayOfArray,
341341
tupleStaticArray,
342342
structStaticArray,
343-
])('should be able to get bytes representation', async (data) => {
343+
])('should be able to get bytes representation', (data) => {
344344
const sdkResult = getABIEncodedValue(data.nativeValues(), data.abiTypeString, {})
345345
const result = data.array().bytes
346346
expect(result).toEqual(Bytes(sdkResult))
@@ -360,7 +360,7 @@ describe('arc4.StaticArray', async () => {
360360
stringStaticArrayOfArrayOfArray,
361361
tupleStaticArray,
362362
structStaticArray,
363-
])('copy static array', async (data) => {
363+
])('copy static array', (data) => {
364364
const sdkResult = getABIEncodedValue(data.nativeValues(), data.abiTypeString, {})
365365
const original = data.array()
366366
const copy = original.copy()
@@ -383,7 +383,7 @@ describe('arc4.StaticArray', async () => {
383383
stringStaticArrayOfArrayOfArray,
384384
tupleStaticArray,
385385
structStaticArray,
386-
])('get item from static array', async (data) => {
386+
])('get item from static array', (data) => {
387387
const staticArray = data.array()
388388
const nativeValues = data.nativeValues()
389389
for (let i = 0; i < staticArray.length; i++) {
@@ -406,7 +406,7 @@ describe('arc4.StaticArray', async () => {
406406
stringStaticArrayOfArrayOfArray,
407407
tupleStaticArray,
408408
structStaticArray,
409-
])('set item in static array', async (data) => {
409+
])('set item in static array', (data) => {
410410
const nativeValues = data.nativeValues()
411411
const nativeValuesCopy = [...nativeValues]
412412
const nativeTemp = nativeValuesCopy.at(-1)!
@@ -438,7 +438,7 @@ describe('arc4.StaticArray', async () => {
438438
stringStaticArrayOfArrayOfArray,
439439
tupleStaticArray,
440440
structStaticArray,
441-
])('create static array from bytes', async (data) => {
441+
])('create static array from bytes', (data) => {
442442
const sdkEncodedBytes = getABIEncodedValue(data.nativeValues(), data.abiTypeString, {})
443443
const result = data.create(Bytes(sdkEncodedBytes))
444444
const nativeValues = data.nativeValues()
@@ -461,7 +461,7 @@ describe('arc4.StaticArray', async () => {
461461
stringStaticArrayOfArrayOfArray,
462462
tupleStaticArray,
463463
structStaticArray,
464-
])('get item from static array created from bytes', async (data) => {
464+
])('get item from static array created from bytes', (data) => {
465465
const nativeValues = data.nativeValues()
466466
const sdkEncodedBytes = getABIEncodedValue(data.nativeValues(), data.abiTypeString, {})
467467
const staticArray = data.create(Bytes(sdkEncodedBytes))
@@ -485,7 +485,7 @@ describe('arc4.StaticArray', async () => {
485485
stringStaticArrayOfArrayOfArray,
486486
tupleStaticArray,
487487
structStaticArray,
488-
])('set item in static array created from bytes', async (data) => {
488+
])('set item in static array created from bytes', (data) => {
489489
const nativeValues = data.nativeValues()
490490
const nativeValuesCopy = [...nativeValues]
491491
const nativeTemp = nativeValuesCopy.at(-1)!
@@ -504,7 +504,7 @@ describe('arc4.StaticArray', async () => {
504504
expect(result).toEqual(Bytes(sdkResult))
505505
})
506506

507-
it('set item in nested static array', async () => {
507+
it('set item in nested static array', () => {
508508
const data = stringStaticArrayOfArrayOfArray
509509
const nativeValues = data.nativeValues()
510510
nativeValues[0][0][0] = 'new value'
@@ -517,7 +517,7 @@ describe('arc4.StaticArray', async () => {
517517
expect(result).toEqual(Bytes(sdkResult))
518518
})
519519

520-
it('set item in nested static array create from bytes', async () => {
520+
it('set item in nested static array create from bytes', () => {
521521
const data = stringStaticArrayOfArrayOfArray
522522
const nativeValues = data.nativeValues()
523523
nativeValues[0][0][0] = 'new value'

‎tests/arc4/str.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ describe('arc4.Str', async () => {
1313
const appClient = await getAlgorandAppClient(appSpecJson as AppSpec)
1414
const ctx = new TestExecutionContext()
1515

16-
afterEach(async () => {
16+
afterEach(() => {
1717
ctx.reset()
1818
})
1919

‎tests/arc4/tuple.spec.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -291,19 +291,19 @@ const testDataWithArray = [
291291
},
292292
]
293293

294-
describe('arc4.Tuple', async () => {
294+
describe('arc4.Tuple', () => {
295295
const ctx = new TestExecutionContext()
296-
afterEach(async () => {
296+
afterEach(() => {
297297
ctx.reset()
298298
})
299299

300-
test.each(testData)('should be able to get bytes representation', async (data) => {
300+
test.each(testData)('should be able to get bytes representation', (data) => {
301301
const sdkResult = getABIEncodedValue(data.nativeValues(), data.abiTypeString, {})
302302
const result = data.tuple().bytes
303303
expect(result).toEqual(Bytes(sdkResult))
304304
})
305305

306-
test.each(testData)('should be able to get native representation', async (data) => {
306+
test.each(testData)('should be able to get native representation', (data) => {
307307
const nativeValues = data.nativeValues()
308308
const result = data.tuple().native
309309
for (let i = 0; i < nativeValues.length; i++) {
@@ -312,7 +312,7 @@ describe('arc4.Tuple', async () => {
312312
expect(result.length).toEqual(nativeValues.length)
313313
})
314314

315-
test.each(testData)('create tuple from bytes', async (data) => {
315+
test.each(testData)('create tuple from bytes', (data) => {
316316
const nativeValues = data.nativeValues()
317317
const sdkEncodedBytes = getABIEncodedValue(nativeValues, data.abiTypeString, {})
318318

@@ -324,7 +324,7 @@ describe('arc4.Tuple', async () => {
324324
}
325325
})
326326

327-
test.each(testDataWithArray)('update array values in tuple', async (data) => {
327+
test.each(testDataWithArray)('update array values in tuple', (data) => {
328328
const sdkResult = getABIEncodedValue(data.updatedNativeValues(), data.abiTypeString, {})
329329
const tuple = data.tuple()
330330
data.update(tuple as DeliberateAny)

‎tests/arc4/ufixednxm.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('arc4.UFixedNxM', async () => {
1414
const appClient = await getAlgorandAppClient(appSpecJson as AppSpec)
1515
const ctx = new TestExecutionContext()
1616

17-
afterEach(async () => {
17+
afterEach(() => {
1818
ctx.reset()
1919
})
2020

‎tests/arc4/uintn.spec.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ describe('arc4.UintN', async () => {
1414
const appClient = await getAlgorandAppClient(appSpecJson as AppSpec)
1515
const ctx = new TestExecutionContext()
1616

17-
afterEach(async () => {
17+
afterEach(() => {
1818
ctx.reset()
1919
})
2020

0 commit comments

Comments
 (0)