refactor: remove try-ception

Author: mikesposito

packages/keyring-controller/jest.config.js

@@ -19,8 +19,8 @@ module.exports = merge(baseConfig, {
     global: {
       branches: 93.71,
       functions: 100,
-      lines: 98.95,
-      statements: 98.95,
+      lines: 98.8,
+      statements: 98.8,
     },
   },
 

packages/keyring-controller/src/KeyringController.ts

@@ -2408,13 +2408,18 @@ export class KeyringController extends BaseController<
    * Retrieves all the accounts from keyrings instances
    * that are currently in memory.
    *
+   * @param additionalKeyrings - Additional keyrings to include in the search.
    * @returns A promise resolving to an array of accounts.
    */
-  async #getAccountsFromKeyrings(): Promise<string[]> {
+  async #getAccountsFromKeyrings(
+    additionalKeyrings: EthKeyring[] = [],
+  ): Promise<string[]> {
     const keyrings = this.#keyrings;
 
     const keyringArrays = await Promise.all(
-      keyrings.map(async (keyring) => keyring.getAccounts()),
+      [...keyrings, ...additionalKeyrings].map(async (keyring) =>
+        keyring.getAccounts(),
+      ),
     );
     const addresses = keyringArrays.reduce((res, arr) => {
       return res.concat(arr);
@@ -2559,6 +2564,7 @@ export class KeyringController extends BaseController<
     try {
       const { type, data } = serialized;
       const keyring = await this.#createKeyring(type, data);
+      await this.#assertNoDuplicateAccounts([keyring]);
       // If metadata is missing, assume the data is from an installation before
       // we had keyring metadata.
       if (this.#keyringsMetadata.length <= this.#keyrings.length) {
@@ -2568,14 +2574,6 @@ export class KeyringController extends BaseController<
       // The keyring is added to the keyrings array only if it's successfully restored
       // and the metadata is successfully added to the controller
       this.#keyrings.push(keyring);
-      try {
-        await this.#assertNoDuplicateAccounts();
-      } catch (error) {
-        // If the keyring includes duplicated accounts, we need to remove it
-        // from the keyrings array
-        this.#keyrings.pop();
-        throw error;
-      }
       return keyring;
     } catch (error) {
       console.error(error);
@@ -2635,10 +2633,13 @@ export class KeyringController extends BaseController<
   /**
    * Assert that there are no duplicate accounts in the keyrings.
    *
+   * @param additionalKeyrings - Additional keyrings to include in the check.
    * @throws If there are duplicate accounts.
    */
-  async #assertNoDuplicateAccounts(): Promise<void> {
-    const accounts = await this.#getAccountsFromKeyrings();
+  async #assertNoDuplicateAccounts(
+    additionalKeyrings: EthKeyring[] = [],
+  ): Promise<void> {
+    const accounts = await this.#getAccountsFromKeyrings(additionalKeyrings);
 
     if (new Set(accounts).size !== accounts.length) {
       throw new Error(KeyringControllerError.DuplicatedAccount);