refactor: simplify serialize()

Author: mikesposito

packages/keyring-eth-qr/jest.config.js

@@ -15,15 +15,15 @@ module.exports = merge(baseConfig, {
   displayName,
 
   // An array of regexp pattern strings used to skip coverage collection
-  coveragePathIgnorePatterns: ['./src/tests'],
+  coveragePathIgnorePatterns: [],
 
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 91.8,
+      branches: 91.66,
       functions: 100,
-      lines: 95.04,
-      statements: 95.14,
+      lines: 94.97,
+      statements: 95.07,
     },
   },
 });

packages/keyring-eth-qr/src/qr-keyring.ts

@@ -131,33 +131,10 @@ export class QrKeyring implements Keyring {
       return getDefaultSerializedQrKeyringState();
     }
 
-    const accounts = this.#accounts.slice();
-
-    if (deviceDetails.keyringMode === DeviceMode.HD) {
-      // These properties are only relevant for HD Keys
-      return {
-        initialized: true,
-        name: deviceDetails.name,
-        keyringMode: DeviceMode.HD,
-        keyringAccount: deviceDetails.keyringAccount,
-        xfp: deviceDetails.xfp,
-        xpub: deviceDetails.xpub,
-        hdPath: deviceDetails.hdPath,
-        childrenPath: deviceDetails.childrenPath,
-        accounts,
-        indexes: deviceDetails.indexes,
-      };
-    }
-    // These properties are only relevant for Account Keys
     return {
+      ...deviceDetails,
       initialized: true,
-      name: deviceDetails.name,
-      keyringMode: DeviceMode.ACCOUNT,
-      keyringAccount: deviceDetails.keyringAccount,
-      xfp: deviceDetails.xfp,
-      paths: deviceDetails.paths,
-      accounts,
-      indexes: deviceDetails.indexes,
+      accounts: this.#accounts.slice(),
     };
   }
 
@@ -219,7 +196,7 @@ export class QrKeyring implements Keyring {
    * @returns The accounts in the QrKeyring
    */
   async getAccounts(): Promise<Hex[]> {
-    return Array.from(this.#accounts.values());
+    return this.#accounts.slice();
   }
 
   /**