Move duplicate and sort checking to validate-deployment-config.ts

api3dao · Sep 24, 2024 · 250f3f0 · 250f3f0
1 parent 862eb7c
commit 250f3f0
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 60 deletions.
diff --git a/.github/workflows/validate-verify.yml b/.github/workflows/validate-verify.yml
@@ -32,9 +32,6 @@ jobs:
       - name: Validate deployment config
         run: pnpm validate-deployment-config
 
-      - name: Validate chain support
-        run: pnpm validate-chain-support
-
       - name: Validate deployments
         run: pnpm validate-deployments
         if: always()

diff --git a/package.json b/package.json
@@ -41,7 +41,6 @@
     "test:coverage": "hardhat coverage",
     "test:extended": "EXTENDED_TEST=TRUE hardhat test --parallel",
     "test:gas": "REPORT_GAS=TRUE hardhat test",
-    "validate-chain-support": "ts-node scripts/validate-chain-support.ts",
     "validate-deployment-config": "hardhat run scripts/validate-deployment-config.ts",
     "validate-deployments": "hardhat run scripts/validate-deployments.ts",
     "verify-deployments": "hardhat run scripts/verify-deployments.ts",

diff --git a/scripts/validate-chain-support.ts b/scripts/validate-chain-support.ts
diff --git a/scripts/validate-deployment-config.ts b/scripts/validate-deployment-config.ts
@@ -10,18 +10,28 @@ import managerMultisigAddresses from '../data/manager-multisig.json';
 
 function main() {
   const chainAliases = new Set(CHAINS.map((chain) => chain.alias));
-  [
-    Object.keys(managerMultisigAddresses),
+  const records: Record<string, string[]> = {
+    managerMultisigAddresses: Object.keys(managerMultisigAddresses),
     chainsSupportedByDapis,
     chainsSupportedByMarket,
     chainsSupportedByOevAuctions,
-  ].map((supportedChainAliases) => {
-    supportedChainAliases.map((supportedChainAlias) => {
+  };
+
+  Object.entries(records).forEach(([fieldName, supportedChainAliases]) => {
+    supportedChainAliases.forEach((supportedChainAlias) => {
       if (!chainAliases.has(supportedChainAlias)) {
-        throw new Error(`Supported chain with alias ${supportedChainAlias} does not exist`);
+        throw new Error(`Supported chain in ${fieldName} with alias ${supportedChainAlias} does not exist`);
       }
     });
+    if (new Set(supportedChainAliases).size !== supportedChainAliases.length) {
+      throw new Error(`Duplicates found in ${fieldName}`);
+    }
+    const sortedSupportedChainAliases = [...supportedChainAliases].sort();
+    if (JSON.stringify(supportedChainAliases) !== JSON.stringify(sortedSupportedChainAliases)) {
+      throw new Error(`${fieldName} is not sorted`);
+    }
   });
+
   Object.entries(managerMultisigAddresses).map(([alias, address]) => {
     if (!ethers.isAddress(address)) {
       throw new Error(`Manager multisig address of ${alias}, ${address as string}, is not valid`);