Small code cleanups

SGrondin · Aug 20, 2018 · 967ce90 · 967ce90
1 parent e7d9fe4
commit 967ce90
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 15 deletions.
diff --git a/bottleneck.js b/bottleneck.js
@@ -1315,7 +1315,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 // Generated by CoffeeScript 2.2.4
 (function () {
-  var BottleneckError, IORedisConnection, RedisConnection, RedisDatastore, Scripts, parser;
+  var BottleneckError, IORedisConnection, RedisConnection, RedisDatastore, parser;
 
   parser = require("./parser");
 
@@ -1325,8 +1325,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
   IORedisConnection = require("./IORedisConnection");
 
-  Scripts = require("./Scripts");
-
   RedisDatastore = class RedisDatastore {
     constructor(instance, initSettings, options) {
       this.instance = instance;
@@ -1368,11 +1366,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     }
 
     runScript(name, args) {
-      var keys;
       if (!this.isReady) {
         return this.Promise.reject(new BottleneckError("This limiter is not done connecting to Redis yet. Wait for the '.ready()' promise to resolve before submitting requests."));
       } else {
-        keys = Scripts.keys(name, this.originalId);
         return new this.Promise((resolve, reject) => {
           var arr;
           this.instance.Events.trigger("debug", [`Calling Redis script: ${name}.lua`, args]);
@@ -1557,7 +1553,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
   module.exports = RedisDatastore;
 }).call(undefined);
-},{"./BottleneckError":2,"./IORedisConnection":6,"./RedisConnection":8,"./Scripts":10,"./parser":15}],10:[function(require,module,exports){
+},{"./BottleneckError":2,"./IORedisConnection":6,"./RedisConnection":8,"./parser":15}],10:[function(require,module,exports){
 "use strict";
 
 // Generated by CoffeeScript 2.2.4

diff --git a/bottleneck.min.js b/bottleneck.min.js
diff --git a/lib/RedisDatastore.js b/lib/RedisDatastore.js
@@ -6,7 +6,7 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
 // Generated by CoffeeScript 2.2.4
 (function () {
-  var BottleneckError, IORedisConnection, RedisConnection, RedisDatastore, Scripts, parser;
+  var BottleneckError, IORedisConnection, RedisConnection, RedisDatastore, parser;
 
   parser = require("./parser");
 
@@ -16,8 +16,6 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
 
   IORedisConnection = require("./IORedisConnection");
 
-  Scripts = require("./Scripts");
-
   RedisDatastore = class RedisDatastore {
     constructor(instance, initSettings, options) {
       this.instance = instance;
@@ -59,11 +57,9 @@ function _asyncToGenerator(fn) { return function () { var gen = fn.apply(this, a
     }
 
     runScript(name, args) {
-      var keys;
       if (!this.isReady) {
         return this.Promise.reject(new BottleneckError("This limiter is not done connecting to Redis yet. Wait for the '.ready()' promise to resolve before submitting requests."));
       } else {
-        keys = Scripts.keys(name, this.originalId);
         return new this.Promise((resolve, reject) => {
           var arr;
           this.instance.Events.trigger("debug", [`Calling Redis script: ${name}.lua`, args]);

diff --git a/src/RedisDatastore.coffee b/src/RedisDatastore.coffee
@@ -2,7 +2,6 @@ parser = require "./parser"
 BottleneckError = require "./BottleneckError"
 RedisConnection = require "./RedisConnection"
 IORedisConnection = require "./IORedisConnection"
-Scripts = require "./Scripts"
 
 class RedisDatastore
   constructor: (@instance, @initSettings, options) ->
@@ -33,7 +32,6 @@ class RedisDatastore
   runScript: (name, args) ->
     if !@isReady then @Promise.reject new BottleneckError "This limiter is not done connecting to Redis yet. Wait for the '.ready()' promise to resolve before submitting requests."
     else
-      keys = Scripts.keys name, @originalId
       new @Promise (resolve, reject) =>
         @instance.Events.trigger "debug", ["Calling Redis script: #{name}.lua", args]
         arr = @connection.scriptArgs name, @originalId, args, (err, replies) ->

diff --git a/test/ioredis.js b/test/ioredis.js
@@ -10,7 +10,7 @@ if (process.env.DATASTORE === 'ioredis') {
       c.limiter.disconnect(false)
     })
 
-    it('Should connect in Redis Cluter mode', function () {
+    it('Should connect in Redis Cluster mode', function () {
       c = makeTest({
         maxConcurrent: 2,
         clientOptions: {},