From 7c0f5a356e8cae3c1e64e1c5d6e93e57a0fbee56 Mon Sep 17 00:00:00 2001
From: Fedor Indutny <79877362+indutny-signal@users.noreply.github.com>
Date: Tue, 2 Mar 2021 13:09:17 -0800
Subject: [PATCH] Add `curly: 'error'` to eslintrc and fix linting

---
 .eslintrc.js                                      |  1 +
 libtextsecure/test/_test.js                       |  3 ++-
 libtextsecure/test/fake_web_api.js                |  3 ++-
 .../test/in_memory_signal_protocol_store.js       | 15 ++++++++++-----
 test/metadata/SecretSessionCipher_test.js         |  9 ++++++---
 5 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/.eslintrc.js b/.eslintrc.js
index d2691c3fbe..e5bdae8c36 100644
--- a/.eslintrc.js
+++ b/.eslintrc.js
@@ -125,6 +125,7 @@ const rules = {
         '`with` is disallowed in strict mode because it makes code impossible to predict and optimize.',
     },
   ],
+  curly: 'error',
 };
 
 module.exports = {
diff --git a/libtextsecure/test/_test.js b/libtextsecure/test/_test.js
index b51fa47d9b..6d5a73d42f 100644
--- a/libtextsecure/test/_test.js
+++ b/libtextsecure/test/_test.js
@@ -54,8 +54,9 @@ window.assertEqualArrayBuffers = (ab1, ab2) => {
 window.hexToArrayBuffer = str => {
   const ret = new ArrayBuffer(str.length / 2);
   const array = new Uint8Array(ret);
-  for (let i = 0; i < str.length / 2; i += 1)
+  for (let i = 0; i < str.length / 2; i += 1) {
     array[i] = parseInt(str.substr(i * 2, 2), 16);
+  }
   return ret;
 };
 
diff --git a/libtextsecure/test/fake_web_api.js b/libtextsecure/test/fake_web_api.js
index 63214c4295..e906c3baa6 100644
--- a/libtextsecure/test/fake_web_api.js
+++ b/libtextsecure/test/fake_web_api.js
@@ -45,8 +45,9 @@ const fakeAPI = {
         msg.timestamp === undefined ||
         msg.relay !== undefined ||
         msg.destination !== undefined
-      )
+      ) {
         throw new Error('Invalid message');
+      }
 
       messagesSentMap[
         `${destination}.${messageArray[i].destinationDeviceId}`
diff --git a/libtextsecure/test/in_memory_signal_protocol_store.js b/libtextsecure/test/in_memory_signal_protocol_store.js
index 72f48e3deb..f2eb6427a4 100644
--- a/libtextsecure/test/in_memory_signal_protocol_store.js
+++ b/libtextsecure/test/in_memory_signal_protocol_store.js
@@ -25,21 +25,24 @@ SignalProtocolStore.prototype = {
       value === undefined ||
       key === null ||
       value === null
-    )
+    ) {
       throw new Error('Tried to store undefined/null');
+    }
     this.store[key] = value;
   },
   get(key, defaultValue) {
-    if (key === null || key === undefined)
+    if (key === null || key === undefined) {
       throw new Error('Tried to get value for undefined/null key');
+    }
     if (key in this.store) {
       return this.store[key];
     }
     return defaultValue;
   },
   remove(key) {
-    if (key === null || key === undefined)
+    if (key === null || key === undefined) {
       throw new Error('Tried to remove value for undefined/null key');
+    }
     delete this.store[key];
   },
 
@@ -57,15 +60,17 @@ SignalProtocolStore.prototype = {
     return Promise.resolve(identityKey === trusted);
   },
   loadIdentityKey(identifier) {
-    if (identifier === null || identifier === undefined)
+    if (identifier === null || identifier === undefined) {
       throw new Error('Tried to get identity key for undefined/null key');
+    }
     return new Promise(resolve => {
       resolve(this.get(`identityKey${identifier}`));
     });
   },
   saveIdentity(identifier, identityKey) {
-    if (identifier === null || identifier === undefined)
+    if (identifier === null || identifier === undefined) {
       throw new Error('Tried to put identity key for undefined/null key');
+    }
     return new Promise(resolve => {
       const existing = this.get(`identityKey${identifier}`);
       this.put(`identityKey${identifier}`, identityKey);
diff --git a/test/metadata/SecretSessionCipher_test.js b/test/metadata/SecretSessionCipher_test.js
index 03f868d0b7..58b62b8f2b 100644
--- a/test/metadata/SecretSessionCipher_test.js
+++ b/test/metadata/SecretSessionCipher_test.js
@@ -46,13 +46,15 @@ InMemorySignalProtocolStore.prototype = {
       value === undefined ||
       key === null ||
       value === null
-    )
+    ) {
       throw new Error('Tried to store undefined/null');
+    }
     this.store[key] = value;
   },
   get(key, defaultValue) {
-    if (key === null || key === undefined)
+    if (key === null || key === undefined) {
       throw new Error('Tried to get value for undefined/null key');
+    }
     if (key in this.store) {
       return this.store[key];
     }
@@ -60,8 +62,9 @@ InMemorySignalProtocolStore.prototype = {
     return defaultValue;
   },
   remove(key) {
-    if (key === null || key === undefined)
+    if (key === null || key === undefined) {
       throw new Error('Tried to remove value for undefined/null key');
+    }
     delete this.store[key];
   },