Use multicall for tests (#21)

* Try to improve test * Test indexers if defined * Clean initializer * Fix syntax * Improve test use multicall * Test CI * Test CI * Test CI * Test CI * Test CI * Test CI * no colors * no colors
helix-bridge · Sep 3, 2024 · ce73bd8 · ce73bd8
1 parent a98ed0b
commit ce73bd8
Show file tree

Hide file tree

Showing 23 changed files with 858 additions and 839 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,4 +24,30 @@ jobs:
         run: npm run build:ts
 
       - name: Check test:ts
-        run: npm run test:ts
+        run: npm run test:ts:ci 2> jest-test.local.log
+
+      - name: Prepare report
+        if: failure()
+        run: |
+          sed -i '1i\```' jest-test.local.log
+          sed -i '1i\## Jest Test Errored Report' jest-test.local.log
+          echo '```' >> jest-test.local.log
+          sed -ir "s/\x1B\[[0-9;]*[JKmsu]//g" jest-test.local.log
+          cat jest-test.local.log
+
+      - name: Find Comment
+        uses: peter-evans/find-comment@v3
+        if: failure()
+        id: fc
+        with:
+          issue-number: ${{ github.event.number }}
+          body-includes: 'Jest Test Errored Report'
+
+      - name: Comment configurate
+        uses: GrantBirki/comment@v2
+        if: failure()
+        with:
+          comment-id: ${{ steps.fc.outputs.comment-id }}
+          file: jest-test.local.log
+          edit-mode: replace
+
diff --git a/conf/mainnets/mantle.yml b/conf/mainnets/mantle.yml
@@ -61,11 +61,6 @@ couples:
     protocol: lnv3
     fee: '100000'
     messager: layerzero
-  - chain: scroll
-    symbol: USDT
-    protocol: lnv2-default
-    fee: '100000'
-    messager: layerzero
   - chain: bsc
     symbol: USDT
     protocol: lnv2-default

diff --git a/package.json b/package.json
@@ -5,7 +5,8 @@
   "scripts": {
     "codegen": "zx scripts/generate/index.mjs",
     "build:ts": "npm run codegen -- --language=ts --verbose && cd generated/typescript && npm i && npm run build",
-    "test:ts": "npm run build:ts && cd generated/typescript && npm run test"
+    "test:ts": "npm run build:ts && cd generated/typescript && npm run test",
+    "test:ts:ci": "npm run build:ts && cd generated/typescript && npm run test:ci"
   },
   "author": "",
   "license": "MIT",

diff --git a/template/ts/files/package.json b/template/ts/files/package.json
@@ -16,13 +16,15 @@
   "homepage": "https://github.com/helix-bridge/helixconf",
   "scripts": {
     "build": "rm -rf dist && tsc",
-    "test": "jest --verbose --coverage"
+    "test": "jest --verbose --coverage",
+    "test:ci": "jest --coverage --ci --no-colors"
   },
   "author": "HelixBridge",
   "license": "MIT",
   "devDependencies": {
     "@types/jest": "^29.5.12",
     "ethers": "^6.13.2",
+    "ethers-multicall-provider": "^6.4.1",
     "jest": "^29.7.0",
     "ts-jest": "^29.2.4",
     "ts-node": "^10.9.2",

diff --git a/template/ts/files/src/helixconf.ts b/template/ts/files/src/helixconf.ts
@@ -60,7 +60,8 @@ export interface HelixProtocol {
 export interface CoupleFilter {
   category?: string
   messager?: string
-  protocol?: string
+  relatedProtocol?: HelixProtocolName // lnv2 has different protocol names in both directions, and perhaps others as well
+  protocol?: HelixProtocolName
   chain?: string
   symbolFrom?: string
   symbolTo?: string
@@ -379,6 +380,25 @@ export class HelixChainConf {
         const eq = _equalsIgnoreCase(item.protocol.name, filter.protocol)
           || _equalsIgnoreCase(item.protocol.address, filter.protocol);
         if (!eq) return false;
+      } else {
+        if (filter.relatedProtocol) {
+          let expectProtocols: HelixProtocolName[] = [];
+          switch (filter.relatedProtocol) {
+            case 'lnv2-default':
+              expectProtocols = ['lnv2-opposite', 'lnv2-default']
+              break;
+            case 'lnv2-opposite':
+              expectProtocols = ['lnv2-opposite', 'lnv2-default']
+              break;
+          }
+          if (expectProtocols.length) {
+            const found = expectProtocols.find(
+              ep => _equalsIgnoreCase(item.protocol.name, ep)
+                || _equalsIgnoreCase(item.protocol.address, ep)
+            );
+            if (!found) return false;
+          }
+        }
       }
       if (filter.chain) {
         const eq = _equalsIgnoreCase(item.chain.id.toString(), filter.chain)