feat: modify getContractFundedVaults functions

DLC-link · Jun 19, 2024 · 9f35b9a · 9f35b9a
1 parent d95c8ec
commit 9f35b9a
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 10 deletions.
diff --git a/src/network-handlers/ethereum-handler.ts b/src/network-handlers/ethereum-handler.ts
@@ -133,19 +133,25 @@ export class EthereumHandler {
       let totalFetched = 0;
       const fundedVaults: RawVault[] = [];
 
-      while (true) {
+      let shouldContinue = true;
+      while (shouldContinue) {
         const fetchedVaults: RawVault[] =
           await this.ethereumContracts.dlcManagerContract.getAllDLCs(
             totalFetched,
             totalFetched + amount
           );
-        fundedVaults.push(...fetchedVaults.filter(vault => vault.status === VaultState.Funded));
+        const filteredVaults = fetchedVaults.filter(vault => vault.status === VaultState.Funded);
+        fundedVaults.push(...filteredVaults);
+
         totalFetched += amount;
-        if (fetchedVaults.length !== amount) break;
+        shouldContinue = fetchedVaults.length === amount;
       }
+
       return fundedVaults;
-    } catch (error: any) {
-      throw new EthereumError(`Could not fetch Funded Vaults: ${error}`);
+    } catch (error) {
+      throw new EthereumError(
+        `Could not fetch Funded Vaults: ${error instanceof Error ? error.message : error}`
+      );
     }
   }
 }
diff --git a/src/network-handlers/read-only-ethereum-handler.ts b/src/network-handlers/read-only-ethereum-handler.ts
@@ -81,19 +81,25 @@ export class ReadOnlyEthereumHandler {
       let totalFetched = 0;
       const fundedVaults: RawVault[] = [];
 
-      while (true) {
+      let shouldContinue = true;
+      while (shouldContinue) {
         const fetchedVaults: RawVault[] =
           await this.ethereumContracts.dlcManagerContract.getAllDLCs(
             totalFetched,
             totalFetched + amount
           );
-        fundedVaults.push(...fetchedVaults.filter(vault => vault.status === VaultState.Funded));
+        const filteredVaults = fetchedVaults.filter(vault => vault.status === VaultState.Funded);
+        fundedVaults.push(...filteredVaults);
+
         totalFetched += amount;
-        if (fetchedVaults.length !== amount) break;
+        shouldContinue = fetchedVaults.length === amount;
       }
+
       return fundedVaults;
-    } catch (error: any) {
-      throw new EthereumError(`Could not fetch Funded Vaults: ${error}`);
+    } catch (error) {
+      throw new EthereumError(
+        `Could not fetch Funded Vaults: ${error instanceof Error ? error.message : error}`
+      );
     }
   }
 }