From 7b1b9c48ef27ff67d90154e43fad95f019d0ab62 Mon Sep 17 00:00:00 2001
From: Karolis Mazukna <k@karolis.dev>
Date: Mon, 24 Oct 2022 12:51:57 +0300
Subject: [PATCH 1/2] chore: upgrade ioredis to v5

---
 package.json       |  3 +--
 src/index.ts       | 11 ++---------
 src/multi.test.ts  |  2 +-
 src/single.test.ts |  2 +-
 4 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/package.json b/package.json
index 606d177..0f3da18 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,6 @@
     ]
   },
   "devDependencies": {
-    "@types/ioredis": "^4.28.8",
     "@types/node": "^17.0.21",
     "@typescript-eslint/eslint-plugin": "^5.13.0",
     "@typescript-eslint/parser": "^5.13.0",
@@ -53,7 +52,7 @@
     "eslint": "^8.10.0",
     "eslint-config-prettier": "^8.5.0",
     "eslint-plugin-prettier": "^4.0.0",
-    "ioredis": "^4.28.5",
+    "ioredis": "^5.2.3",
     "nodemon": "^2.0.15",
     "prettier": "^2.5.1",
     "typescript": "~4.6.2"
diff --git a/src/index.ts b/src/index.ts
index 850400e..d342967 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -552,11 +552,7 @@ export default class Redlock extends EventEmitter {
       let result: number;
       try {
         // Attempt to evaluate the script by its hash.
-        const shaResult = (await client.evalsha(script.hash, keys.length, [
-          ...keys,
-          ...args,
-        ])) as unknown;
-
+        const shaResult = await client.evalsha(script.hash, keys.length, ...keys, ...args);
         if (typeof shaResult !== "number") {
           throw new Error(
             `Unexpected result of type ${typeof shaResult} returned from redis.`
@@ -573,10 +569,7 @@ export default class Redlock extends EventEmitter {
         ) {
           throw error;
         }
-        const rawResult = (await client.eval(script.value, keys.length, [
-          ...keys,
-          ...args,
-        ])) as unknown;
+        const rawResult = await client.eval(script.value, keys.length, ...keys, ...args);
 
         if (typeof rawResult !== "number") {
           throw new Error(
diff --git a/src/multi.test.ts b/src/multi.test.ts
index 5049b3e..f423f20 100644
--- a/src/multi.test.ts
+++ b/src/multi.test.ts
@@ -34,7 +34,7 @@ ${(await Promise.all(error.attempts))
 async function waitForCluster(redis: Cluster): Promise<void> {
   async function checkIsReady(): Promise<boolean> {
     return (
-      ((await redis.cluster("info")) as string).match(
+      ((await redis.cluster("INFO")) as string).match(
         /^cluster_state:(.+)$/m
       )?.[1] === "ok"
     );
diff --git a/src/single.test.ts b/src/single.test.ts
index 6a5990d..623e505 100644
--- a/src/single.test.ts
+++ b/src/single.test.ts
@@ -34,7 +34,7 @@ ${(await Promise.all(error.attempts))
 async function waitForCluster(redis: Cluster): Promise<void> {
   async function checkIsReady(): Promise<boolean> {
     return (
-      ((await redis.cluster("info")) as string).match(
+      ((await redis.cluster("INFO")) as string).match(
         /^cluster_state:(.+)$/m
       )?.[1] === "ok"
     );

From 65abbc05dab16dee06b474ddb2163dac8e876782 Mon Sep 17 00:00:00 2001
From: Karolis Mazukna <k@karolis.dev>
Date: Mon, 30 Jan 2023 10:58:57 +0200
Subject: [PATCH 2/2] chore: fix prettier

---
 src/index.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/index.ts b/src/index.ts
index d342967..7a9285c 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -552,7 +552,12 @@ export default class Redlock extends EventEmitter {
       let result: number;
       try {
         // Attempt to evaluate the script by its hash.
-        const shaResult = await client.evalsha(script.hash, keys.length, ...keys, ...args);
+        const shaResult = await client.evalsha(
+          script.hash,
+          keys.length,
+          ...keys,
+          ...args
+        );
         if (typeof shaResult !== "number") {
           throw new Error(
             `Unexpected result of type ${typeof shaResult} returned from redis.`
@@ -569,7 +574,12 @@ export default class Redlock extends EventEmitter {
         ) {
           throw error;
         }
-        const rawResult = await client.eval(script.value, keys.length, ...keys, ...args);
+        const rawResult = await client.eval(
+          script.value,
+          keys.length,
+          ...keys,
+          ...args
+        );
 
         if (typeof rawResult !== "number") {
           throw new Error(