add tests for circular reference

Author: boblat

src/subcontexts/contract-context.ts

@@ -14,8 +14,9 @@ import { BytesMap } from '../collections/custom-key-map'
 import { checkRoutingConditions } from '../context-helpers/context-util'
 import { lazyContext } from '../context-helpers/internal-context'
 import { CodeError } from '../errors'
-import { BaseContract, ContractOptionsSymbol } from '../impl/base-contract'
-import { Contract } from '../impl/contract'
+import type { BaseContract } from '../impl/base-contract'
+import { ContractOptionsSymbol } from '../impl/base-contract'
+import type { Contract } from '../impl/contract'
 import { getArc4Encoded, Uint, type TypeInfo } from '../impl/encoded-types'
 import { Bytes } from '../impl/primitives'
 import { AccountCls, ApplicationCls, AssetCls } from '../impl/reference'
@@ -222,18 +223,8 @@ export class ContractContext {
     if (result !== undefined && result !== null) {
       return result
     }
-    // TODO: uncomment the following line once version puya-ts 1.0.0 is released and delete the rest of the function
-    // throw new internal.errors.CodeError('Cannot create a contract for class as it does not extend Contract or BaseContract')
 
-    const proto = Object.getPrototypeOf(type)
-    if (proto === BaseContract) {
-      return false
-    } else if (proto === Contract) {
-      return true
-    } else if (proto === Object || proto === null) {
-      throw new CodeError('Cannot create a contract for class as it does not extend Contract or BaseContract')
-    }
-    return this.isArc4(proto)
+    throw new CodeError('Cannot create a contract for class as it does not extend Contract or BaseContract')
   }
 
   /**

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

@@ -0,0 +1,68 @@
+import { algo } from '@algorandfoundation/algokit-utils'
+import { methodSelector } from '@algorandfoundation/algorand-typescript/arc4'
+import { afterEach, beforeAll, 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'
+import { ContractOne } from '../artifacts/circurlar-reference/circular-reference.algo'
+import { createArc4TestFixture } from '../test-fixture'
+
+describe('circular reference', () => {
+  const ctx = new TestExecutionContext()
+  const [test, localnetFixture] = createArc4TestFixture('tests/artifacts/circurlar-reference', {
+    ContractOne: { funding: algo(1) },
+    ContractTwo: { funding: algo(1) },
+  })
+
+  beforeAll(async () => {
+    await localnetFixture.newScope()
+  })
+
+  afterEach(() => {
+    ctx.reset()
+  })
+
+  test('test call contract one', async ({ appClientContractOne, appClientContractTwo }) => {
+    const result = await appClientContractOne.send.call({
+      method: 'test',
+      args: [appClientContractTwo.appId],
+      extraFee: algo(1),
+    })
+    expect(result.return).toEqual(appClientContractTwo.appId)
+
+    const contractOne = ctx.contract.create(ContractOne)
+    const contractTwo = ctx.contract.create(ContractTwo)
+    const contractTwoApp = ctx.ledger.getApplicationForContract(contractTwo)
+
+    const spy = new ApplicationSpy()
+    spy.onAbiCall(methodSelector(ContractTwo.prototype.receiver), (itxnContext) => {
+      itxnContext.setReturnValue(contractTwoApp.id)
+    })
+    ctx.addApplicationSpy(spy)
+
+    const output = contractOne.test(contractTwoApp)
+    expect(output).toEqual(contractTwoApp.id)
+  })
+
+  test('test call contract two', async ({ appClientContractOne, appClientContractTwo }) => {
+    const result = await appClientContractTwo.send.call({
+      method: 'test',
+      args: [appClientContractOne.appId],
+      extraFee: algo(1),
+    })
+    expect(result.return).toEqual(appClientContractOne.appId)
+
+    const contractOne = ctx.contract.create(ContractOne)
+    const contractTwo = ctx.contract.create(ContractTwo)
+    const contractOneApp = ctx.ledger.getApplicationForContract(contractOne)
+
+    const spy = new ApplicationSpy()
+    spy.onAbiCall(methodSelector(ContractOne.prototype.receiver), (itxnContext) => {
+      itxnContext.setReturnValue(contractOneApp.id)
+    })
+    ctx.addApplicationSpy(spy)
+
+    const output = contractTwo.test(contractOneApp)
+    expect(output).toEqual(contractOneApp.id)
+  })
+})

tests/artifacts/circurlar-reference/circular-reference-2.algo.ts

@@ -0,0 +1,16 @@
+import type { Application } from '@algorandfoundation/algorand-typescript'
+import { Contract, log } from '@algorandfoundation/algorand-typescript'
+import { abiCall } from '@algorandfoundation/algorand-typescript/arc4'
+import type { ContractOne } from './circular-reference.algo'
+
+export class ContractTwo extends Contract {
+  test(appId: Application) {
+    const result = abiCall<typeof ContractOne.prototype.receiver>({ appId, args: [appId] })
+    return result.returnValue
+  }
+
+  receiver(appId: Application) {
+    log(appId.id)
+    return appId.id
+  }
+}

tests/artifacts/circurlar-reference/circular-reference.algo.ts

@@ -0,0 +1,16 @@
+import type { Application } from '@algorandfoundation/algorand-typescript'
+import { Contract, log } from '@algorandfoundation/algorand-typescript'
+import { abiCall } from '@algorandfoundation/algorand-typescript/arc4'
+import type { ContractTwo } from './circular-reference-2.algo'
+
+export class ContractOne extends Contract {
+  test(appId: Application) {
+    const result = abiCall<typeof ContractTwo.prototype.receiver>({ appId, args: [appId] })
+    return result.returnValue
+  }
+
+  receiver(appId: Application) {
+    log(appId.id)
+    return appId.id
+  }
+}