refactor: create new scope in beforeAll | beforeEach as part of creating TestFixture

to be consistent with puya-ts and to reduce boilerplate code

Author: boblat

tests/arc4/bool.algo.spec.ts

@@ -1,22 +1,18 @@
 import { Bytes } from '@algorandfoundation/algorand-typescript'
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
 import { Bool, convertBytes } from '@algorandfoundation/algorand-typescript/arc4'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { ABI_RETURN_VALUE_LOG_PREFIX } from '../../src/constants'
 import { asUint8Array } from '../../src/util'
 import { getAvmResult } from '../avm-invoker'
 import { createArc4TestFixture } from '../test-fixture'
 
 describe('arc4.Bool', async () => {
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
     Arc4PrimitiveOpsContract: { deployParams: { createParams: { extraProgramPages: undefined } } },
   })
   const ctx = new TestExecutionContext()
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
-
   afterEach(() => {
     ctx.reset()
   })

tests/arc4/byte.algo.spec.ts

@@ -3,23 +3,20 @@ import { Bytes } from '@algorandfoundation/algorand-typescript'
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
 import { Byte, convertBytes } from '@algorandfoundation/algorand-typescript/arc4'
 import { encodingUtil } from '@algorandfoundation/puya-ts'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { ABI_RETURN_VALUE_LOG_PREFIX, MAX_UINT64 } from '../../src/constants'
 import { asBigUintCls, asUint8Array } from '../../src/util'
 import { getAvmResult } from '../avm-invoker'
 import { createArc4TestFixture } from '../test-fixture'
 
 const invalidBytesLengthError = 'byte string must be 1 byte long'
 describe('arc4.Byte', async () => {
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
     Arc4PrimitiveOpsContract: { deployParams: { createParams: { extraProgramPages: undefined } } },
   })
 
   const ctx = new TestExecutionContext()
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
   afterEach(() => {
     ctx.reset()
   })

tests/arc4/circular-reference.algo.spec.ts

@@ -1,6 +1,6 @@
 import { algo } from '@algorandfoundation/algokit-utils'
 import { methodSelector } from '@algorandfoundation/algorand-typescript/arc4'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { ApplicationSpy } from '../../src/application-spy'
 import { TestExecutionContext } from '../../src/test-execution-context'
 import { ContractTwo } from '../artifacts/circurlar-reference/circular-reference-2.algo'
@@ -9,15 +9,11 @@ import { createArc4TestFixture } from '../test-fixture'
 
 describe('circular reference', () => {
   const ctx = new TestExecutionContext()
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/circurlar-reference', {
+  const test = createArc4TestFixture('tests/artifacts/circurlar-reference', {
     ContractOne: { funding: algo(1) },
     ContractTwo: { funding: algo(1) },
   })
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
-
   afterEach(() => {
     ctx.reset()
   })

tests/arc4/emit.algo.spec.ts

@@ -1,7 +1,7 @@
 import type { biguint, bytes, uint64 } from '@algorandfoundation/algorand-typescript'
 import { arc4, BigUint, Bytes, emit, Uint64 } from '@algorandfoundation/algorand-typescript'
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { MAX_UINT512, MAX_UINT64 } from '../../src/constants'
 import { getAvmResultLog } from '../avm-invoker'
 
@@ -41,15 +41,11 @@ class SwappedArc4 extends arc4.Struct<{
 }> {}
 
 describe('arc4.emit', async () => {
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
     Arc4PrimitiveOpsContract: { deployParams: { createParams: { extraProgramPages: undefined } } },
   })
   const ctx = new TestExecutionContext()
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
-
   afterEach(() => {
     ctx.reset()
   })

tests/arc4/method-selector.algo.spec.ts

@@ -4,7 +4,7 @@ import { arc4, Bytes, Global, Uint64 } from '@algorandfoundation/algorand-typesc
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
 import { DynamicArray, methodSelector } from '@algorandfoundation/algorand-typescript/arc4'
 import { encodingUtil } from '@algorandfoundation/puya-ts'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { toBytes } from '../../src/impl/encoded-types/encoded-types'
 import { encodeAddress } from '../../src/impl/reference'
 import { AnotherStruct, MyStruct, SignaturesContract } from '../artifacts/arc4-abi-method/contract.algo'
@@ -15,17 +15,13 @@ const _FUNDED_ACCOUNT_SPENDING = Uint64(1234)
 
 describe('methodSelector', async () => {
   const ctx = new TestExecutionContext()
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/arc4-abi-method/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/arc4-abi-method/contract.algo.ts', {
     SignaturesContract: {
       deployParams: { createParams: { extraProgramPages: undefined, method: 'create' } },
       funding: new AlgoAmount({ microAlgos: Global.minBalance + _FUNDED_ACCOUNT_SPENDING }),
     },
   })
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
-
   afterEach(() => {
     ctx.reset()
   })

tests/arc4/resource-encoding.algo.spec.ts

@@ -1,20 +1,16 @@
 import { algo } from '@algorandfoundation/algokit-utils'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { TestExecutionContext } from '../../src/test-execution-context'
 import { createArc4TestFixture } from '../test-fixture'
 
 describe('resource encoding', () => {
   const ctx = new TestExecutionContext()
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/resource-encoding/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/resource-encoding/contract.algo.ts', {
     ByIndex: {},
     ByValue: {},
     C2C: { funding: algo(1) },
   })
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
-
   afterEach(() => {
     ctx.reset()
   })

tests/arc4/str.algo.spec.ts

@@ -2,21 +2,18 @@ import { Bytes } from '@algorandfoundation/algorand-typescript'
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
 import { convertBytes, Str } from '@algorandfoundation/algorand-typescript/arc4'
 import { encodingUtil } from '@algorandfoundation/puya-ts'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { ABI_RETURN_VALUE_LOG_PREFIX, MAX_LOG_SIZE } from '../../src/constants'
 import { asUint8Array } from '../../src/util'
 import { getAvmResult } from '../avm-invoker'
 import { createArc4TestFixture } from '../test-fixture'
 
 describe('arc4.Str', async () => {
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
     Arc4PrimitiveOpsContract: { deployParams: { createParams: { extraProgramPages: undefined } } },
   })
   const ctx = new TestExecutionContext()
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
   afterEach(() => {
     ctx.reset()
   })

tests/arc4/ufixednxm.algo.spec.ts

@@ -3,22 +3,19 @@ import { Bytes } from '@algorandfoundation/algorand-typescript'
 import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
 import { convertBytes, UFixed } from '@algorandfoundation/algorand-typescript/arc4'
 import { encodingUtil } from '@algorandfoundation/puya-ts'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { ABI_RETURN_VALUE_LOG_PREFIX } from '../../src/constants'
 import { asBigUint, asUint8Array } from '../../src/util'
 import { getAvmResult } from '../avm-invoker'
 import { createArc4TestFixture } from '../test-fixture'
 
 const invalidBytesLengthError = (length: number) => `byte string must correspond to a ufixed${length}`
 describe('arc4.UFixed', async () => {
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
     Arc4PrimitiveOpsContract: { deployParams: { createParams: { extraProgramPages: undefined } } },
   })
   const ctx = new TestExecutionContext()
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
   afterEach(() => {
     ctx.reset()
   })

tests/arc4/uintn.algo.spec.ts

@@ -4,22 +4,19 @@ import { TestExecutionContext } from '@algorandfoundation/algorand-typescript-te
 import type { BitSize } from '@algorandfoundation/algorand-typescript/arc4'
 import { convertBytes, Uint, Uint16, Uint256, Uint32, Uint8 } from '@algorandfoundation/algorand-typescript/arc4'
 import { encodingUtil } from '@algorandfoundation/puya-ts'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { ABI_RETURN_VALUE_LOG_PREFIX, MAX_UINT512, MAX_UINT64 } from '../../src/constants'
 import { asBigUintCls, asUint8Array } from '../../src/util'
 import { getAvmResult } from '../avm-invoker'
 import { createArc4TestFixture } from '../test-fixture'
 
 const invalidBytesLengthError = (length: number) => `byte string must correspond to a uint${length}`
 describe('arc4.Uint', async () => {
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/arc4-primitive-ops/contract.algo.ts', {
     Arc4PrimitiveOpsContract: { deployParams: { createParams: { extraProgramPages: undefined } } },
   })
   const ctx = new TestExecutionContext()
 
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
   afterEach(() => {
     ctx.reset()
   })

tests/avm12.algo.spec.ts

@@ -1,18 +1,16 @@
 import { algos } from '@algorandfoundation/algokit-utils'
 import { ApplicationSpy, TestExecutionContext } from '@algorandfoundation/algorand-typescript-testing'
-import { afterEach, beforeAll, describe, expect } from 'vitest'
+import { afterEach, describe, expect } from 'vitest'
 import { Avm12Contract, ContractV0, ContractV1 } from './artifacts/avm12/contract.algo'
 import { createArc4TestFixture } from './test-fixture'
 
 describe('avm12', () => {
-  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/avm12/contract.algo.ts', {
+  const test = createArc4TestFixture('tests/artifacts/avm12/contract.algo.ts', {
     Avm12Contract: { funding: algos(1) },
   })
 
   const ctx = new TestExecutionContext()
-  beforeAll(async () => {
-    await localnetFixture.newScope()
-  })
+
   afterEach(() => {
     ctx.reset()
   })