feat: replaced regular mergeAndSort by lodash

Signed-off-by: Logan Nguyen <[email protected]>
hashgraph · Jan 7, 2025 · 595037f · 595037f
1 parent bf7bb63
commit 595037f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 121 deletions.
diff --git a/tools/erc-repository-indexer/erc-contract-indexer/src/services/registryGenerator.ts b/tools/erc-repository-indexer/erc-contract-indexer/src/services/registryGenerator.ts
@@ -23,6 +23,7 @@ import path from 'path';
 import constants from '../utils/constants';
 import { ERCOutputInterface } from '../schemas/ERCRegistrySchemas';
 import { Helper } from '../utils/helper';
+import _ from 'lodash';
 
 export class RegistryGenerator {
   /**
@@ -135,16 +136,14 @@ export class RegistryGenerator {
       existingContracts[existingContracts.length - 1].contractId <
       newContracts[0].contractId
     ) {
-      // Create a Map to deduplicate contracts by contractId
-      const contractMap = new Map(
-        [...existingContracts, ...newContracts].map((contract) => [
-          contract.contractId,
-          contract,
-        ])
-      );
-      uniqueContracts = Array.from(contractMap.values());
+      uniqueContracts = _.chain([...existingContracts, ...newContracts]) // merge contracts
+        .uniqBy('contractId') // Remove duplicates based on contractId
+        .value(); // Extract the final array
     } else {
-      uniqueContracts = Helper.mergeAndSort(existingContracts, newContracts);
+      uniqueContracts = _.chain([...existingContracts, ...newContracts]) // merge contracts
+        .uniqBy('contractId') // Remove duplicates based on contractId
+        .sortBy((contract) => Number(contract.contractId.split('.')[2])) // Sort by the numeric value of contractId
+        .value(); // Extract the final array
     }
 
     await this.writeContentsToFile(filePath, uniqueContracts);

diff --git a/tools/erc-repository-indexer/erc-contract-indexer/src/utils/helper.ts b/tools/erc-repository-indexer/erc-contract-indexer/src/utils/helper.ts
@@ -20,7 +20,6 @@
 
 import axios, { AxiosInstance } from 'axios';
 import constants from './constants';
-import { ERCOutputInterface } from '../schemas/ERCRegistrySchemas';
 import path from 'path';
 
 export class Helper {
@@ -104,54 +103,4 @@ export class Helper {
       }),
     };
   }
-
-  /**
-   * Merges two sorted arrays of contract objects and returns a single sorted array without duplicates.
-   * This function assumes both input arrays are sorted by `contractId` in ascending order.
-   *
-   * @param {ERCOutputInterface[]} existingContracts - The first array of contract objects, already sorted by `contractId`.
-   * @param {ERCOutputInterface[]} newContracts - The second array of contract objects, already sorted by `contractId`.
-   * @returns {ERCOutputInterface[]} A merged and sorted array of contract objects, with duplicate `contractId` entries removed.
-   */
-  static mergeAndSort(
-    existingContracts: ERCOutputInterface[],
-    newContracts: ERCOutputInterface[]
-  ): ERCOutputInterface[] {
-    let i = 0;
-    let j = 0;
-    const mergedContracts: ERCOutputInterface[] = [];
-
-    // Merge two sorted arrays
-    while (i < existingContracts.length && j < newContracts.length) {
-      const existing = existingContracts[i];
-      const incoming = newContracts[j];
-
-      const existingContractIdComparedValue = Number(
-        existing.contractId.split('.')[2]
-      );
-      const incomingContractIdComparedValue = Number(
-        incoming.contractId.split('.')[2]
-      );
-
-      if (existingContractIdComparedValue < incomingContractIdComparedValue) {
-        mergedContracts.push(existing);
-        i++;
-      } else if (
-        existingContractIdComparedValue > incomingContractIdComparedValue
-      ) {
-        mergedContracts.push(incoming);
-        j++;
-      } else {
-        // remove duplicated objects
-        mergedContracts.push(existing);
-        i++;
-        j++;
-      }
-    }
-
-    // Add any remaining elements from each array
-    return mergedContracts
-      .concat(existingContracts.slice(i))
-      .concat(newContracts.slice(j));
-  }
 }
diff --git a/tools/erc-repository-indexer/erc-contract-indexer/tests/unit/utils/helper.spec.ts b/tools/erc-repository-indexer/erc-contract-indexer/tests/unit/utils/helper.spec.ts
@@ -46,66 +46,5 @@ describe('Helper', () => {
       const nextLink = Helper.buildUrl(mockNext, mockScanningLimit);
       expect(nextLink).toEqual(expectedNextLink);
     });
-
-    describe('mergeAndSort', () => {
-      const existingContracts = [
-        {
-          contractId: '0.0.14902',
-          address: '0x0000...',
-          name: '',
-          symbol: '',
-          totalSupply: 0,
-          decimals: 0,
-        },
-        {
-          contractId: '0.0.15701',
-          address: '0x0000...',
-          name: 'CUSD',
-          symbol: 'CUSD',
-          totalSupply: 0,
-          decimals: 18,
-        },
-      ];
-
-      const newContracts = [
-        {
-          contractId: '0.0.14903',
-          address: '0x0000...',
-          name: 'CUSD',
-          symbol: 'CUSD',
-          totalSupply: 0,
-          decimals: 18,
-        },
-        {
-          contractId: '0.0.15701',
-          address: '0x0000...',
-          name: 'CUSD',
-          symbol: 'CUSD',
-          totalSupply: 0,
-          decimals: 18,
-        },
-        {
-          contractId: '0.0.15707',
-          address: '0x0000...',
-          name: 'CUSD',
-          symbol: 'CUSD',
-          totalSupply: 0,
-          decimals: 18,
-        },
-      ];
-
-      it('merges, sorts, and removes duplicate objects from the two contract arrays', () => {
-        const result = Helper.mergeAndSort(existingContracts, newContracts);
-
-        const expectedResult = [
-          existingContracts[0], // '0.0.14902'
-          newContracts[0], // '0.0.14903'
-          existingContracts[1], // '0.0.15701' (duplicate removed)
-          newContracts[2], // '0.0.15707'
-        ];
-
-        expect(result).toEqual(expectedResult);
-      });
-    });
   });
 });