From f4db3d8f45a3356b319b873dcbe92b88aef51308 Mon Sep 17 00:00:00 2001
From: Alf Eaton <alf.eaton@overleaf.com>
Date: Tue, 25 May 2021 14:32:03 +0100
Subject: [PATCH] Manual tidying

---
 services/document-updater/expire_docops.js    | 29 +++++--------------
 .../coffee/test_blpop_failover.js             | 16 ++--------
 .../coffee/test_pubsub_failover.js            | 13 +--------
 3 files changed, 11 insertions(+), 47 deletions(-)

diff --git a/services/document-updater/expire_docops.js b/services/document-updater/expire_docops.js
index ffafbe7255..3eba0d547c 100644
--- a/services/document-updater/expire_docops.js
+++ b/services/document-updater/expire_docops.js
@@ -1,16 +1,3 @@
-/* eslint-disable
-    handle-callback-err,
-    no-unused-vars,
-*/
-// TODO: This file was created by bulk-decaffeinate.
-// Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
 const Settings = require('settings-sharelatex')
 const rclient = require('@overleaf/redis-wrapper').createClient(
   Settings.redis.documentupdater
@@ -23,17 +10,17 @@ const getKeysFromNode = function (node, pattern, callback) {
   let cursor = 0 // redis iterator
   const keySet = {} // use hash to avoid duplicate results
   // scan over all keys looking for pattern
-  var doIteration = (cb) =>
-    node.scan(cursor, 'MATCH', pattern, 'COUNT', 1000, function (error, reply) {
-      if (error != null) {
+  const doIteration = () =>
+    node.scan(cursor, 'MATCH', pattern, 'COUNT', 1000, function(error, reply) {
+      if (error) {
         return callback(error)
       }
-      ;[cursor, keys] = Array.from(reply)
+      ;[cursor, keys] = reply
       console.log('SCAN', keys.length)
-      for (const key of Array.from(keys)) {
+      for (const key of keys) {
         keySet[key] = true
       }
-      if (cursor === '0') {
+      if (cursor==='0') {
         // note redis returns string result not numeric
         return callback(null, Object.keys(keySet))
       } else {
@@ -52,8 +39,8 @@ const getKeys = function (pattern, callback) {
   return async.concatSeries(nodes, doKeyLookupForNode, callback)
 }
 
-const TTL = 60 * 60 // 1 hour
 const expireDocOps = (callback) =>
+  // eslint-disable-next-line handle-callback-err
   getKeys(keys.docOps({ doc_id: '*' }), (error, keys) =>
     async.mapSeries(
       keys,
@@ -69,7 +56,7 @@ setTimeout(
   () =>
     //  Give redis a chance to connect
     expireDocOps(function (error) {
-      if (error != null) {
+      if (error) {
         throw error
       }
       return process.exit()
diff --git a/services/document-updater/test/cluster_failover/coffee/test_blpop_failover.js b/services/document-updater/test/cluster_failover/coffee/test_blpop_failover.js
index 3d7cae99da..6d4b3ee55d 100644
--- a/services/document-updater/test/cluster_failover/coffee/test_blpop_failover.js
+++ b/services/document-updater/test/cluster_failover/coffee/test_blpop_failover.js
@@ -1,15 +1,3 @@
-/* eslint-disable
-    no-unused-vars,
-*/
-// TODO: This file was created by bulk-decaffeinate.
-// Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS101: Remove unnecessary use of Array.from
- * DS102: Remove unnecessary code created because of implicit returns
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
 let listenInBackground, sendPings
 const redis = require('@overleaf/redis-wrapper')
 const rclient1 = redis.createClient({
@@ -52,7 +40,7 @@ const listenForPing = (cb) =>
     if (error != null) {
       return cb(error)
     }
-    let [key, value] = Array.from(result)
+    let [, value] = Array.from(result)
     value = parseInt(value, 10)
     if (value % 10 === 0) {
       console.log('.')
@@ -70,7 +58,7 @@ const PING_DELAY = 100
 ;(sendPings = () => sendPing(() => setTimeout(sendPings, PING_DELAY)))()
 
 ;(listenInBackground = () =>
-  listenForPing((error, value) => {
+  listenForPing((error) => {
     if (error) {
       console.error('[RECEIVING ERROR]', error.message)
     }
diff --git a/services/document-updater/test/cluster_failover/coffee/test_pubsub_failover.js b/services/document-updater/test/cluster_failover/coffee/test_pubsub_failover.js
index 627fb82a0d..3da52be287 100644
--- a/services/document-updater/test/cluster_failover/coffee/test_pubsub_failover.js
+++ b/services/document-updater/test/cluster_failover/coffee/test_pubsub_failover.js
@@ -1,14 +1,3 @@
-/* eslint-disable
-    no-return-assign,
-*/
-// TODO: This file was created by bulk-decaffeinate.
-// Fix any style issues and re-enable lint.
-/*
- * decaffeinate suggestions:
- * DS102: Remove unnecessary code created because of implicit returns
- * DS207: Consider shorter variations of null checks
- * Full docs: https://github.com/decaffeinate/decaffeinate/blob/master/docs/suggestions.md
- */
 let sendPings
 const redis = require('@overleaf/redis-wrapper')
 const rclient1 = redis.createClient({
@@ -35,7 +24,7 @@ const sendPing = function (cb) {
     cb = function () {}
   }
   return rclient1.publish('test-pubsub', counter, (error) => {
-    if (error != null) {
+    if (error) {
       console.error('[SENDING ERROR]', error.message)
     }
     if (error == null) {