chore(multi-srp): review changes

MetaMask · Feb 17, 2025 · 66c3f05 · 66c3f05
1 parent f823f91
commit 66c3f05
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/packages/keyring-controller/src/KeyringController.test.ts b/packages/keyring-controller/src/KeyringController.test.ts
@@ -2699,7 +2699,7 @@ describe('KeyringController', () => {
 
         const keyringId = controller.state.keyringsMetadata[1].id;
         await expect(controller.verifySeedPhrase(keyringId)).rejects.toThrow(
-          'KeyringController - The keyring does not support the method verifySeedPhrase.',
+          KeyringControllerError.UnsupportedVerifySeedPhrase,
         );
       });
     });
@@ -4060,7 +4060,6 @@ describe('KeyringController', () => {
             await controller.persistAllKeyrings();
           }
         });
-        // TODO: Either fix this lint violation or explain why it's necessary to ignore.
 
         messenger.subscribe('KeyringController:stateChange', listener);
 

diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts
@@ -1516,10 +1516,7 @@ export class KeyringController extends BaseController<
           )) as SelectedKeyring;
         }
       } else if ('id' in selector) {
-        const index = this.state.keyringsMetadata.findIndex(
-          (metadata) => metadata.id === selector.id,
-        );
-        keyring = this.#keyrings[index] as SelectedKeyring;
+        keyring = this.#getKeyringById(selector.id) as SelectedKeyring;
       }
 
       if (!keyring) {
@@ -1853,6 +1850,19 @@ export class KeyringController extends BaseController<
     );
   }
 
+  /**
+   * Get the keyring by id.
+   *
+   * @param keyringId - The id of the keyring.
+   * @returns The keyring.
+   */
+  #getKeyringById(keyringId: string): EthKeyring<Json> | undefined {
+    const index = this.state.keyringsMetadata.findIndex(
+      (metadata) => metadata.id === keyringId,
+    );
+    return this.#keyrings[index];
+  }
+
   /**
    * Get the keyring by id or return the first keyring if the id is not found.
    *
@@ -1864,10 +1874,7 @@ export class KeyringController extends BaseController<
       return this.#keyrings[0] as EthKeyring<Json>;
     }
 
-    const index = this.state.keyringsMetadata.findIndex(
-      (metadata) => metadata.id === keyringId,
-    );
-    return this.#keyrings[index];
+    return this.#getKeyringById(keyringId);
   }
 
   /**