Fix lint

Author: darkwing

index.js

@@ -617,10 +617,10 @@ class KeyringController extends EventEmitter {
     if (encryptedVault.includes(VAULT_SEPARATOR)) {
       const { salt, vault: vaultOnly } = this.parseVault(encryptedVault);
 
-      if (password !== undefined) {
-        this.encryptionKey = await this._generateEncryptionKey(password, salt);
-      } else {
+      if (encryptionKey) {
         this.encryptionKey = encryptionKey;
+      } else {
+        this.encryptionKey = await this._generateEncryptionKey(password, salt);
       }
 
       return await this.encryptor.decrypt(this.encryptionKey, vaultOnly);

package.json

@@ -36,8 +36,8 @@
     "browser-passworder": "^2.0.3",
     "eth-sig-util": "^3.0.1",
     "eth-simple-keyring": "^4.2.0",
-    "obs-store": "^4.0.3",
-    "ethereum-cryptography":  "^1.1.2"
+    "ethereum-cryptography": "^1.1.2",
+    "obs-store": "^4.0.3"
   },
   "devDependencies": {
     "@lavamoat/allow-scripts": "^1.0.6",

test/index.js

@@ -112,7 +112,7 @@ describe('KeyringController', function () {
       await keyringController.createNewVaultAndKeychain(PASSWORD);
       const { vault } = keyringController.store.getState();
       // eslint-disable-next-line jest/no-restricted-matchers
-      expect(vault).toBeTruthy();
+      expect(Boolean(vault)).toBe(true);
     });
 
     it('should encrypt keyrings with the correct password each time they are persisted', async function () {
@@ -486,6 +486,7 @@ describe('KeyringController', function () {
       // Attempt to verify the password
       await expect(
         keyringController.verifyPassword(PASSWORD),
+        // eslint-disable-next-line jest/no-restricted-matchers
       ).resolves.toBeTruthy();
     });
 
@@ -496,6 +497,7 @@ describe('KeyringController', function () {
       // Attempt to unlock the keychaing via old password
       await expect(
         keyringController.submitPassword(PASSWORD),
+        // eslint-disable-next-line jest/no-restricted-matchers
       ).resolves.toBeTruthy();
 
       // Ensure the new vault value has separator and salt