🚧 Loose ends in tests (#320)

LayerZero-Labs · Jan 31, 2024 · 3b9fd07 · 3b9fd07
1 parent a3a797a
commit 3b9fd07
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 33 deletions.
diff --git a/.github/workflows/reusable-test.yaml b/.github/workflows/reusable-test.yaml
@@ -96,6 +96,9 @@ jobs:
 
       - name: Test
         run: pnpm test:user
+        env:
+          LAYERZERO_EXAMPLES_REPOSITORY_URL: https://github.com/${{ github.repository }}.git
+          LAYERZERO_EXAMPLES_REPOSITORY_REF: ${{ github.ref_name }}
 
       # We'll collect the docker compose logs from all containers on failure
       - name: Collect docker logs on failure

diff --git a/docker-compose.registry.yaml b/docker-compose.registry.yaml
@@ -84,17 +84,17 @@ services:
     # If these are not provided, for example if running on a local machine,
     # we'll default them to our repository and and empty ref
     environment:
-      - LAYERZERO_EXAMPLES_REPOSITORY_URL=https://github.com/${GITHUB_REPOSITORY:-LayerZero-Labs/devtools}.git
-      - LAYERZERO_EXAMPLES_REPOSITORY_REF=${GITHUB_REF_NAME}
+      - LAYERZERO_EXAMPLES_REPOSITORY_URL=${LAYERZERO_EXAMPLES_REPOSITORY_URL}
+      - LAYERZERO_EXAMPLES_REPOSITORY_REF=${LAYERZERO_EXAMPLES_REPOSITORY_REF}
     working_dir: /app
     command:
       - /bin/bash
       - -c
       - |
         pnpm config set registry http://npm-registry:4873/
 
-        echo "create-lz-oapp:repository   $LAYERZERO_EXAMPLES_REPOSITORY_URL"
-        echo "create-lz-oapp:ref          $LAYERZERO_EXAMPLES_REPOSITORY_REF"
+        echo "create-lz-oapp:repository   ${LAYERZERO_EXAMPLES_REPOSITORY_URL}"
+        echo "create-lz-oapp:ref          ${LAYERZERO_EXAMPLES_REPOSITORY_REF}"
 
         /app/tests-user/lib/bats-core/bin/bats --verbose-run --recursive ./tests-user/tests
     volumes:

diff --git a/packages/protocol-devtools-evm/test/uln302/sdk.test.ts b/packages/protocol-devtools-evm/test/uln302/sdk.test.ts
@@ -67,15 +67,14 @@ describe('uln302/sdk', () => {
                     const ulnConfigEncodedUnsorted = ulnSdk.encodeUlnConfig(ulnConfigUnsorted)
                     const ulnConfigEncodedSorted = ulnSdk.encodeUlnConfig(ulnConfigSorted)
                     expect(ulnConfigEncodedSorted).toBe(ulnConfigEncodedUnsorted)
-                })
+                }),
+                { numRuns: 20 }
             )
         })
     })
 
     describe('setDefaultUlnConfig', () => {
         it('should sort requiredDVNs and optionalDVNs', async () => {
-            const encodeFunctionData = jest.spyOn(contract.interface, 'encodeFunctionData')
-
             await fc.assert(
                 fc.asyncProperty(endpointArbitrary, dvnsArbitrary, async (eid, dvns) => {
                     const sortedDvns = [...dvns].sort((a, b) => a.localeCompare(b))
@@ -98,22 +97,25 @@ describe('uln302/sdk', () => {
                     expect(transactionUnsorted).toEqual(transactionsSorted)
 
                     // And let's check that the encoding call is correct and the DVNs are sorted
-                    expect(encodeFunctionData).toHaveBeenLastCalledWith('setDefaultUlnConfigs', [
-                        [
-                            {
-                                eid,
-                                config: {
-                                    confirmations: BigInt(100),
-                                    optionalDVNThreshold: 0,
-                                    optionalDVNs: sortedDvns.map(addChecksum),
-                                    requiredDVNs: sortedDvns.map(addChecksum),
-                                    requiredDVNCount: sortedDvns.length,
-                                    optionalDVNCount: sortedDvns.length,
+                    expect(transactionsSorted.data).toBe(
+                        contract.interface.encodeFunctionData('setDefaultUlnConfigs', [
+                            [
+                                {
+                                    eid,
+                                    config: {
+                                        confirmations: BigInt(100),
+                                        optionalDVNThreshold: 0,
+                                        optionalDVNs: sortedDvns.map(addChecksum),
+                                        requiredDVNs: sortedDvns.map(addChecksum),
+                                        requiredDVNCount: sortedDvns.length,
+                                        optionalDVNCount: sortedDvns.length,
+                                    },
                                 },
-                            },
-                        ],
-                    ])
-                })
+                            ],
+                        ])
+                    )
+                }),
+                { numRuns: 20 }
             )
         })
     })
@@ -150,7 +152,8 @@ describe('uln302/sdk', () => {
 
                         await expect(ulnSdk.hasAppUlnConfig(eid, oapp, ulnConfig)).resolves.toBeTruthy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -172,7 +175,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeTruthy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -194,7 +198,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeTruthy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -216,7 +221,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeTruthy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -240,7 +246,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeFalsy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -264,7 +271,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeFalsy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -286,7 +294,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeFalsy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -308,7 +317,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeFalsy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
     })
@@ -341,7 +351,8 @@ describe('uln302/sdk', () => {
 
                         await expect(ulnSdk.hasAppExecutorConfig(eid, oapp, executorConfig)).resolves.toBeTruthy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -362,7 +373,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeTruthy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
 
@@ -384,7 +396,8 @@ describe('uln302/sdk', () => {
                             })
                         ).resolves.toBeTruthy()
                     }
-                )
+                ),
+                { numRuns: 20 }
             )
         })
     })