Improve test setup for L2 / anvil (#253)

* set the experimental module always when running tests in cli. * change setupL2 to only need web3 as that is all it uses and we always have web3 where as sometimes we wee needing to create a kit just to pass it to this function move node experimental setup to the package so its always run and no weird esoteric knowldge is needed to run tests * kit not required --------- Co-authored-by: Leszek Stachowski <[email protected]>
celo-org · Jun 17, 2024 · 706e827 · 706e827
1 parent 6c2e47d
commit 706e827
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 10 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -236,10 +236,9 @@ jobs:
         uses: foundry-rs/foundry-toolchain@v1
         with:
           version: "nightly-f625d0fa7c51e65b4bf1e8f7931cd1c6e2e285e9"
-      # NODE_OPTIONS="--experimental-vm-modules" is needed because @viem/anvil uses dynamic imports
       - name: Run tests
         run: |
-          NODE_OPTIONS="--experimental-vm-modules" yarn workspace @celo/celocli test --coverage
+          yarn workspace @celo/celocli test --coverage
       - name: Verify that a new account can be created
         run: |
           yarn workspace @celo/celocli run celocli account:new

diff --git a/packages/cli/package.json b/packages/cli/package.json
@@ -29,7 +29,7 @@
     "lint": "yarn run --top-level eslint -c .eslintrc.js ",
     "prepublish": "",
     "prepack": "yarn run build && oclif manifest && oclif readme",
-    "test": "TZ=UTC yarn jest --runInBand --forceExit"
+    "test": "TZ=UTC NODE_OPTIONS=--experimental-vm-modules yarn jest --runInBand --forceExit"
   },
   "dependencies": {
     "@celo/abis": "11.0.0",

diff --git a/packages/cli/src/test-utils/chain-setup.test.ts b/packages/cli/src/test-utils/chain-setup.test.ts
@@ -1,17 +1,14 @@
 import { isCel2 } from '@celo/connect'
-import { newKitFromWeb3 } from '@celo/contractkit'
 import { testWithAnvil } from '@celo/dev-utils/lib/anvil-test'
 import Web3 from 'web3'
 import { setupL2 } from './chain-setup'
 
 testWithAnvil('chain setup', (web3: Web3) => {
   describe('setupL2()', () => {
     it('sets up L2 context', async () => {
-      const kit = newKitFromWeb3(web3)
-
       expect(await isCel2(web3)).toEqual(false)
 
-      await setupL2(kit)
+      await setupL2(web3)
 
       expect(await isCel2(web3)).toEqual(true)
     })

diff --git a/packages/cli/src/test-utils/chain-setup.ts b/packages/cli/src/test-utils/chain-setup.ts
@@ -141,8 +141,8 @@ export const topUpWithToken = async (
 }
 
 // TODO remove this once no longer needed
-export const setupL2 = async (kit: ContractKit) => {
+export const setupL2 = async (web3: Web3) => {
   // Temporarily deploying any bytecode, so it's just there,
   // isCel2 should hence return true as it just checks for bytecode existence
-  await setCode(kit.web3, PROXY_ADMIN_ADDRESS, proxyBytecode)
+  await setCode(web3, PROXY_ADMIN_ADDRESS, proxyBytecode)
 }
diff --git a/packages/sdk/contractkit/package.json b/packages/sdk/contractkit/package.json
@@ -20,7 +20,7 @@
     "clean": "yarn run --top-level tsc -b . --clean",
     "prepublishOnly": "yarn build",
     "docs": "yarn run --top-level typedoc",
-    "test": "yarn run --top-level jest --runInBand --forceExit",
+    "test": "NODE_OPTIONS=--experimental-vm-modules yarn run --top-level jest --runInBand --forceExit",
     "lint": "yarn run --top-level eslint -c .eslintrc.js "
   },
   "dependencies": {