fix: Test clean up.

Signed-off-by: Eric Badiere <[email protected]>
hashgraph · Nov 13, 2024 · 240a06c · 240a06c
1 parent 734ad20
commit 240a06c
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 23 deletions.
diff --git a/packages/relay/src/lib/services/hbarLimitService/index.ts b/packages/relay/src/lib/services/hbarLimitService/index.ts
@@ -38,7 +38,7 @@ export class HbarLimitService implements IHbarLimitService {
   };
 
   /**
-   * Disables the rate limiter.
+   * Flag to turn off the HBarRateLimitService.
    * @private
    */
   private readonly disableRateLimiter: boolean = false;
@@ -160,6 +160,12 @@ export class HbarLimitService implements IHbarLimitService {
     return !this.disableRateLimiter;
   }
 
+  public static getInstance(): HbarLimitService {
+    // if (!MyClass._instance) {
+    //   MyClass._instance = new MyClass();
+    // }
+    return this;
+  }
   /**
    * Resets the {@link HbarSpendingPlan#amountSpent} field for all existing plans.
    * @param {RequestDetails} requestDetails - The request details used for logging and tracking.

diff --git a/packages/server/tests/acceptance/hbarLimiter.spec.ts b/packages/server/tests/acceptance/hbarLimiter.spec.ts
@@ -898,24 +898,6 @@ describe('@hbarlimiter HBAR Limiter Acceptance Tests', function () {
             'HBAR_RATE_LIMIT_TINYBAR',
           )}`,
         );
-
-        const initialAccount: AliasAccount = global.accounts[0];
-
-        const neededAccounts: number = 1;
-        accounts.push(
-          ...(await Utils.createMultipleAliasAccounts(
-            mirrorNode,
-            initialAccount,
-            neededAccounts,
-            initialBalance,
-            requestDetails,
-          )),
-        );
-        global.accounts.push(...accounts);
-        const basicPlans = await hbarSpendingPlanRepository.findAllActiveBySubscriptionTier(
-          [SubscriptionTier.BASIC],
-          requestDetails,
-        );
       });
 
       it('should eventually exhaust the hbar limit for a BASIC user after multiple deployments of large contracts, and not throw an error', async function () {
@@ -926,14 +908,14 @@ describe('@hbarlimiter HBAR Limiter Acceptance Tests', function () {
         let hbarSpendingPlan: IDetailedHbarSpendingPlan | null = null;
 
         for (deploymentCounts = 0; deploymentCounts < 3; deploymentCounts++) {
-          const tx = await deployContract(largeContractJson, accounts[0].wallet);
+          const tx = await deployContract(largeContractJson, global.accounts[0].wallet);
           await tx.waitForDeployment();
 
           expectedTxCost ||= await getExpectedCostOfLastLargeTx(largeContractJson.bytecode);
 
           if (!hbarSpendingPlan) {
             const ethSpendingPlan = await ethAddressSpendingPlanRepository.findByAddress(
-              accounts[0].wallet.address,
+              global.accounts[0].wallet.address,
               requestDetails,
             );
             hbarSpendingPlan = await hbarSpendingPlanRepository.findByIdWithDetails(
@@ -946,7 +928,7 @@ describe('@hbarlimiter HBAR Limiter Acceptance Tests', function () {
         }
         if (!hbarSpendingPlan) {
           const ethSpendingPlan = await ethAddressSpendingPlanRepository.findByAddress(
-            accounts[0].wallet.address,
+            global.accounts[0].wallet.address,
             requestDetails,
           );
           hbarSpendingPlan = await hbarSpendingPlanRepository.findByIdWithDetails(
@@ -964,7 +946,7 @@ describe('@hbarlimiter HBAR Limiter Acceptance Tests', function () {
 
         // Confirm that deployments continued even after the limit was exhausted
         expect(deploymentCounts).to.be.gte(1);
-        await expect(deployContract(largeContractJson, accounts[0].wallet)).to.be.fulfilled;
+        await expect(deployContract(largeContractJson, global.accounts[0].wallet)).to.be.fulfilled;
       });
     });
   }