Eslintify all of libtextsecure

libtextsecure/test/in_memory_signal_protocol_store.js

@@ -4,13 +4,13 @@ function SignalProtocolStore() {
 
 SignalProtocolStore.prototype = {
   Direction: { SENDING: 1, RECEIVING: 2 },
-  getIdentityKeyPair: function() {
+  getIdentityKeyPair() {
     return Promise.resolve(this.get('identityKey'));
   },
-  getLocalRegistrationId: function() {
+  getLocalRegistrationId() {
     return Promise.resolve(this.get('registrationId'));
   },
-  put: function(key, value) {
+  put(key, value) {
     if (
       key === undefined ||
       value === undefined ||
@@ -20,165 +20,130 @@ SignalProtocolStore.prototype = {
       throw new Error('Tried to store undefined/null');
     this.store[key] = value;
   },
-  get: function(key, defaultValue) {
+  get(key, defaultValue) {
     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];
-    } else {
-      return defaultValue;
     }
+    return defaultValue;
   },
-  remove: function(key) {
+  remove(key) {
     if (key === null || key === undefined)
       throw new Error('Tried to remove value for undefined/null key');
     delete this.store[key];
   },
 
-  isTrustedIdentity: function(identifier, identityKey) {
+  isTrustedIdentity(identifier, identityKey) {
     if (identifier === null || identifier === undefined) {
       throw new error('tried to check identity key for undefined/null key');
     }
     if (!(identityKey instanceof ArrayBuffer)) {
       throw new error('Expected identityKey to be an ArrayBuffer');
     }
-    var trusted = this.get('identityKey' + identifier);
+    const trusted = this.get(`identityKey${identifier}`);
     if (trusted === undefined) {
       return Promise.resolve(true);
     }
     return Promise.resolve(identityKey === trusted);
   },
-  loadIdentityKey: function(identifier) {
+  loadIdentityKey(identifier) {
     if (identifier === null || identifier === undefined)
       throw new Error('Tried to get identity key for undefined/null key');
-    return new Promise(
-      function(resolve) {
-        resolve(this.get('identityKey' + identifier));
-      }.bind(this)
-    );
+    return new Promise(resolve => {
+      resolve(this.get(`identityKey${identifier}`));
+    });
   },
-  saveIdentity: function(identifier, identityKey) {
+  saveIdentity(identifier, identityKey) {
     if (identifier === null || identifier === undefined)
       throw new Error('Tried to put identity key for undefined/null key');
-    return new Promise(
-      function(resolve) {
-        var existing = this.get('identityKey' + identifier);
-        this.put('identityKey' + identifier, identityKey);
-        if (existing && existing !== identityKey) {
-          resolve(true);
-        } else {
-          resolve(false);
-        }
-      }.bind(this)
-    );
+    return new Promise(resolve => {
+      const existing = this.get(`identityKey${identifier}`);
+      this.put(`identityKey${identifier}`, identityKey);
+      if (existing && existing !== identityKey) {
+        resolve(true);
+      } else {
+        resolve(false);
+      }
+    });
   },
 
   /* Returns a prekeypair object or undefined */
-  loadPreKey: function(keyId) {
-    return new Promise(
-      function(resolve) {
-        var res = this.get('25519KeypreKey' + keyId);
-        resolve(res);
-      }.bind(this)
-    );
+  loadPreKey(keyId) {
+    return new Promise(resolve => {
+      const res = this.get(`25519KeypreKey${keyId}`);
+      resolve(res);
+    });
   },
-  storePreKey: function(keyId, keyPair) {
-    return new Promise(
-      function(resolve) {
-        resolve(this.put('25519KeypreKey' + keyId, keyPair));
-      }.bind(this)
-    );
+  storePreKey(keyId, keyPair) {
+    return new Promise(resolve => {
+      resolve(this.put(`25519KeypreKey${keyId}`, keyPair));
+    });
   },
-  removePreKey: function(keyId) {
-    return new Promise(
-      function(resolve) {
-        resolve(this.remove('25519KeypreKey' + keyId));
-      }.bind(this)
-    );
+  removePreKey(keyId) {
+    return new Promise(resolve => {
+      resolve(this.remove(`25519KeypreKey${keyId}`));
+    });
   },
 
   /* Returns a signed keypair object or undefined */
-  loadSignedPreKey: function(keyId) {
-    return new Promise(
-      function(resolve) {
-        var res = this.get('25519KeysignedKey' + keyId);
-        resolve(res);
-      }.bind(this)
-    );
+  loadSignedPreKey(keyId) {
+    return new Promise(resolve => {
+      const res = this.get(`25519KeysignedKey${keyId}`);
+      resolve(res);
+    });
   },
-  loadSignedPreKeys: function() {
-    return new Promise(
-      function(resolve) {
-        var res = [];
-        for (var i in this.store) {
-          if (i.startsWith('25519KeysignedKey')) {
-            res.push(this.store[i]);
-          }
+  loadSignedPreKeys() {
+    return new Promise(resolve => {
+      const res = [];
+      for (const i in this.store) {
+        if (i.startsWith('25519KeysignedKey')) {
+          res.push(this.store[i]);
         }
-        resolve(res);
-      }.bind(this)
-    );
+      }
+      resolve(res);
+    });
   },
-  storeSignedPreKey: function(keyId, keyPair) {
-    return new Promise(
-      function(resolve) {
-        resolve(this.put('25519KeysignedKey' + keyId, keyPair));
-      }.bind(this)
-    );
+  storeSignedPreKey(keyId, keyPair) {
+    return new Promise(resolve => {
+      resolve(this.put(`25519KeysignedKey${keyId}`, keyPair));
+    });
   },
-  removeSignedPreKey: function(keyId) {
-    return new Promise(
-      function(resolve) {
-        resolve(this.remove('25519KeysignedKey' + keyId));
-      }.bind(this)
-    );
+  removeSignedPreKey(keyId) {
+    return new Promise(resolve => {
+      resolve(this.remove(`25519KeysignedKey${keyId}`));
+    });
   },
 
-  loadSession: function(identifier) {
-    return new Promise(
-      function(resolve) {
-        resolve(this.get('session' + identifier));
-      }.bind(this)
-    );
+  loadSession(identifier) {
+    return new Promise(resolve => {
+      resolve(this.get(`session${identifier}`));
+    });
   },
-  storeSession: function(identifier, record) {
-    return new Promise(
-      function(resolve) {
-        resolve(this.put('session' + identifier, record));
-      }.bind(this)
-    );
+  storeSession(identifier, record) {
+    return new Promise(resolve => {
+      resolve(this.put(`session${identifier}`, record));
+    });
   },
-  removeAllSessions: function(identifier) {
-    return new Promise(
-      function(resolve) {
-        for (key in this.store) {
-          if (
-            key.match(
-              RegExp('^session' + identifier.replace('+', '\\+') + '.+')
-            )
-          ) {
-            delete this.store[key];
-          }
+  removeAllSessions(identifier) {
+    return new Promise(resolve => {
+      for (key in this.store) {
+        if (key.match(RegExp(`^session${identifier.replace('+', '\\+')}.+`))) {
+          delete this.store[key];
         }
-        resolve();
-      }.bind(this)
-    );
+      }
+      resolve();
+    });
   },
-  getDeviceIds: function(identifier) {
-    return new Promise(
-      function(resolve) {
-        var deviceIds = [];
-        for (key in this.store) {
-          if (
-            key.match(
-              RegExp('^session' + identifier.replace('+', '\\+') + '.+')
-            )
-          ) {
-            deviceIds.push(parseInt(key.split('.')[1]));
-          }
+  getDeviceIds(identifier) {
+    return new Promise(resolve => {
+      const deviceIds = [];
+      for (key in this.store) {
+        if (key.match(RegExp(`^session${identifier.replace('+', '\\+')}.+`))) {
+          deviceIds.push(parseInt(key.split('.')[1]));
         }
-        resolve(deviceIds);
-      }.bind(this)
-    );
+      }
+      resolve(deviceIds);
+    });
   },
 };