rerereview

Author: davidmurdoch

app/lib.js

@@ -4,6 +4,9 @@ const passworder = require('@metamask/browser-passworder')
 function dedupe (arr) {
   const result = []
   arr?.forEach(x => {
+    if (x == null) {
+      return
+    }
     if (!result.find(y => Object.keys(x).length === Object.keys(y).length && Object.entries(x).every(([k,ex]) => y[k] === ex ))) {
       result.push(x)
     }
@@ -149,9 +152,7 @@ function extractVaultFromFile (data) {
       try {
         const vaultString = JSON.parse(`"${match[1]}"`)
         const json = JSON.parse(vaultString)
-        if (json !== null) {
-          vaults.push(json)
-        }
+        vaults.push(json)
       } catch (err) {
         // Not valid JSON: continue
       }

app/lib.test.js

@@ -62,13 +62,13 @@ const VAULTS = [
     variant: 'vault with no key metadata',
     vaultData: '{"data":"s6TpYjlUNsn7ifhEFTkuDGBUM1GyOlPrim7JSjtfIxgTt8/6MiXgiR/CtFfR4dWW2xhq85/NGIBYEeWrZThGdKGarBzeIqBfLFhw9n509jprzJ0zc2Rf+9HVFGLw+xxC4xPxgCS0IIWeAJQ+XtGcHmn0UZXriXm8Ja4kdlow6SWinB7sr/WM3R0+frYs4WgllkwggDf2/Tv6VHygvLnhtzp6hIJFyTjh+l/KnyJTyZW1TkZhDaNDzX3SCOHT","iv":"FbeHDAW5afeWNORfNJBR0Q==","salt":"TxZ+WbCW6891C9LK/hbMAoUsSEW1E8pyGLVBU6x5KR8="}',
     mnemonic: 'spread raise short crane omit tent fringe mandate neglect detail suspect cradle',
-    passphrase: 'correct horse battery staple', 
+    passphrase: 'correct horse battery staple',
   },
   {
     variant: 'vault with key metadata and 600_000 iterations',
     vaultData: '{"data":"WHaP1FrrtV4zUonudIppDifsLHF39g6oPkVksAIdWAHBRzax1uy1asfAJprR7u72t4/HuYz5yPIFQrnNnv+hwQu9GRuty88VKMnvMy+sq8MNtoXI+C54bZpWa8r4iUQfa0Mj/cfJbpFpzOdF1ZYXahTfTcU5WsrHwvJew842CiJR4B2jmCHHXfm/DxLK3WazsVQwXJGx/U71UelGoOOrT8NI28EKrAwgPn+7Xmv0j92gmhau30N7Bo2fr6Zv","iv":"LfD8/tY1EjXzxuemSmDVdA==","keyMetadata":{"algorithm":"PBKDF2","params":{"iterations":600000}},"salt":"nk4xdpmMR+1s5BYe4Vnk++XAQwrISI2bCtbMg7V1wUA="}',
     mnemonic: 'spread raise short crane omit tent fringe mandate neglect detail suspect cradle',
-    passphrase: 'correct horse battery staple', 
+    passphrase: 'correct horse battery staple',
   },
 ]
 
@@ -93,7 +93,7 @@ describe('decryptVault', () => {
   VAULTS.forEach((vault) => {
     it(`decrypts ${vault.variant}`, async () => {
       const decrypted = await decryptVault(
-        vault.passphrase, 
+        vault.passphrase,
         JSON.parse(vault.vaultData)
       );
 

bundle.js

@@ -15,6 +15,9 @@ var passworder = require('@metamask/browser-passworder');
 function dedupe(arr) {
   var result = [];
   arr === null || arr === void 0 ? void 0 : arr.forEach(function (x) {
+    if (x == null) {
+      return;
+    }
     if (!result.find(function (y) {
       return Object.keys(x).length === Object.keys(y).length && Object.entries(x).every(function (_ref) {
         var _ref2 = _slicedToArray(_ref, 2),
@@ -169,9 +172,7 @@ function extractVaultFromFile(data) {
       try {
         var vaultString = JSON.parse("\"".concat(match[1], "\""));
         var json = JSON.parse(vaultString);
-        if (json !== null) {
-          _vaults.push(json);
-        }
+        _vaults.push(json);
       } catch (err) {
         // Not valid JSON: continue
       }

jest.config.js

@@ -43,8 +43,8 @@ module.exports = {
     global: {
       branches: 95.45,
       functions: 100,
-      lines: 100,
-      statements: 100,
+      lines: 98.75,
+      statements: 98.8,
     },
   },