chore: fix merge mistakes

auth0 · May 20, 2024 · fc4c603 · fc4c603
1 parent 140d1b7
commit fc4c603
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 22 deletions.
diff --git a/lib/db.js b/lib/db.js
@@ -293,7 +293,7 @@ class LimitDBRedis extends EventEmitter {
       erlParams = utils.getERLParams(params.elevated_limits);
       const valError = validateERLParams(erlParams);
       if (valError) {
-        return callback(valError)
+        return callback(valError);
       }
     }
 

diff --git a/lib/utils.js b/lib/utils.js
@@ -175,18 +175,6 @@ function resolveElevatedParams(erlParams, bucketKeyConfig) {
   };
 }
 
-class LimitdRedisConfigurationError extends Error {
-  constructor(msg, extra) {
-    super();
-    this.name = this.constructor.name;
-    this.message = msg;
-    Error.captureStackTrace(this, this.constructor);
-    if (extra) {
-      this.extra = extra;
-    }
-  }
-}
-
 module.exports = {
   buildBuckets,
   buildBucket,

diff --git a/test/db.tests.js b/test/db.tests.js
@@ -1338,14 +1338,11 @@ describe('LimitDBRedis', () => {
             elevated_limits: {
               size: 5,
               per_minute: 1,
-              elevated_limits: {
-                size: 5,
-                per_minute: 1,
-                interval: 10,
-              }
-            });
-            await takeElevatedPromise(erlParams)
-            await takeElevatedPromise(erlParams) // erl activated
+              interval: 10,
+            }
+          });
+          await takeElevatedPromise(erlParams);
+          await takeElevatedPromise(erlParams); // erl activated
         });
 
         describe('when the limit is exceeded for a bucket without erl configuration', async () => {

diff --git a/test/utils.tests.js b/test/utils.tests.js
@@ -19,7 +19,6 @@ describe('utils', () => {
         }
       };
       const response = normalizeType(bucket);
-      // eslint-disable-next-line no-unused-vars
       const { elevated_limits, ...rest } = response;
       expect(rest).excluding(['drip_interval', 'overrides', 'overridesMatch', 'overridesCache']).to.deep.equal({
         size: 100,