fix: Flaky tests (safe-global#831)

lance-web3 · May 29, 2024 · cac2a2f · cac2a2f
1 parent 0b9724f
commit cac2a2f
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 5 deletions.
diff --git a/packages/api-kit/tests/e2e/addSafeOperation.test.ts b/packages/api-kit/tests/e2e/addSafeOperation.test.ts
@@ -181,13 +181,13 @@ describe('addSafeOperation', () => {
     const safeOperationsBefore = await safeApiKit.getSafeOperationsByAddress({
       safeAddress: SAFE_ADDRESS
     })
-    const initialNumSafeOperations = safeOperationsBefore.results.length
+    const initialNumSafeOperations = safeOperationsBefore.count
 
     await chai.expect(safeApiKit.addSafeOperation(addSafeOperationProps)).to.be.fulfilled
 
     const safeOperationsAfter = await safeApiKit.getSafeOperationsByAddress({
       safeAddress: SAFE_ADDRESS
     })
-    chai.expect(safeOperationsAfter.results.length).to.equal(initialNumSafeOperations + 1)
+    chai.expect(safeOperationsAfter.count).to.equal(initialNumSafeOperations + 1)
   })
 })
diff --git a/packages/relay-kit/jest.config.js b/packages/relay-kit/jest.config.js
@@ -8,7 +8,7 @@ const config = {
     '^@safe-global/protocol-kit/(.*)$': '<rootDir>/../protocol-kit/src/$1',
     '^@safe-global/relay-kit/(.*)$': '<rootDir>/src/$1'
   },
-  testTimeout: 10000
+  testTimeout: 15000
 }
 
 module.exports = config
diff --git a/packages/relay-kit/src/packs/safe-4337/Safe4337Pack.test.ts b/packages/relay-kit/src/packs/safe-4337/Safe4337Pack.test.ts
@@ -68,6 +68,7 @@ describe('Safe4337Pack', () => {
       network
     })?.networkAddresses[network] as string
   })
+
   afterEach(() => {
     jest.clearAllMocks()
   })
@@ -186,7 +187,7 @@ describe('Safe4337Pack', () => {
 
       const safe4337Pack = await createSafe4337Pack({
         options: {
-          owners: [fixtures.OWNER_1],
+          owners: [fixtures.OWNER_1, fixtures.OWNER_2],
           threshold: 1
         }
       })
@@ -201,7 +202,7 @@ describe('Safe4337Pack', () => {
             saltNonce: undefined
           },
           safeAccountConfig: {
-            owners: [fixtures.OWNER_1],
+            owners: [fixtures.OWNER_1, fixtures.OWNER_2],
             threshold: 1,
             to: addModulesLibAddress,
             data: constants.INTERFACES.encodeFunctionData('enableModules', [

diff --git a/packages/relay-kit/src/packs/safe-4337/testing-utils/fixtures.ts b/packages/relay-kit/src/packs/safe-4337/testing-utils/fixtures.ts
@@ -1,4 +1,5 @@
 export const OWNER_1 = '0xFfAC5578BE8AC1B2B9D13b34cAf4A074B96B8A1b'
+export const OWNER_2 = '0x3059EfD1BCe33be41eeEfd5fb6D520d7fEd54E43'
 export const PREDICTED_SAFE_ADDRESS = '0x65e0d294F2d17CB9fB0f65111E9Ac8a00C4049dA'
 export const SAFE_ADDRESS_v1_4_1 = '0x717f4BB83D8DF2e5a3Cc603Ee27263ac9EFB6c12'
 export const SAFE_ADDRESS_v1_3_0 = '0x8C35a08Af278518B59D04ddDe3F1b370aD766D22'

diff --git a/packages/relay-kit/src/packs/safe-4337/testing-utils/helpers.ts b/packages/relay-kit/src/packs/safe-4337/testing-utils/helpers.ts
@@ -10,9 +10,17 @@ export const generateTransferCallData = (to: string, value: bigint) => {
   return iface.encodeFunctionData('transfer', [to, value])
 }
 
+const safe4337PackCache = new Map()
+
 export const createSafe4337Pack = async (
   initOptions: Partial<Safe4337InitOptions>
 ): Promise<Safe4337Pack> => {
+  const key = JSON.stringify(initOptions)
+
+  if (safe4337PackCache.has(key)) {
+    return safe4337PackCache.get(key)
+  }
+
   const safe4337Pack = await Safe4337Pack.init({
     provider: fixtures.RPC_URL,
     signer: process.env.PRIVATE_KEY,
@@ -24,5 +32,7 @@ export const createSafe4337Pack = async (
     bundlerUrl: fixtures.BUNDLER_URL
   })
 
+  safe4337PackCache.set(key, safe4337Pack)
+
   return safe4337Pack
 }