refactor: remove throwError util

MetaMask · Jan 29, 2024 · 9985f69 · 9985f69
1 parent 6aa6706
commit 9985f69
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 19 deletions.
diff --git a/packages/keyring-controller/jest.config.js b/packages/keyring-controller/jest.config.js
@@ -17,7 +17,7 @@ module.exports = merge(baseConfig, {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 95.17,
+      branches: 95.71,
       functions: 100,
       lines: 99.21,
       statements: 99.22,

diff --git a/packages/keyring-controller/src/KeyringController.ts b/packages/keyring-controller/src/KeyringController.ts
@@ -47,7 +47,6 @@ import Wallet, { thirdparty as importers } from 'ethereumjs-wallet';
 import type { Patch } from 'immer';
 
 import { KeyringControllerError } from './constants';
-import { throwError } from './utils';
 
 const name = 'KeyringController';
 
@@ -1277,9 +1276,11 @@ export class KeyringController extends BaseController<
       address,
     )) as EthKeyring<Json>;
 
-    return keyring.prepareUserOperation
-      ? await keyring.prepareUserOperation(address, transactions)
-      : throwError(KeyringControllerError.UnsupportedPrepareUserOperation);
+    if (!keyring.prepareUserOperation) {
+      throw new Error(KeyringControllerError.UnsupportedPrepareUserOperation);
+    }
+
+    return await keyring.prepareUserOperation(address, transactions);
   }
 
   /**
@@ -1299,9 +1300,11 @@ export class KeyringController extends BaseController<
       address,
     )) as EthKeyring<Json>;
 
-    return keyring.patchUserOperation
-      ? await keyring.patchUserOperation(address, userOp)
-      : throwError(KeyringControllerError.UnsupportedPatchUserOperation);
+    if (!keyring.patchUserOperation) {
+      throw new Error(KeyringControllerError.UnsupportedPatchUserOperation);
+    }
+
+    return await keyring.patchUserOperation(address, userOp);
   }
 
   /**
@@ -1320,9 +1323,11 @@ export class KeyringController extends BaseController<
       address,
     )) as EthKeyring<Json>;
 
-    return keyring.signUserOperation
-      ? await keyring.signUserOperation(address, userOp)
-      : throwError(KeyringControllerError.UnsupportedSignUserOperation);
+    if (!keyring.signUserOperation) {
+      throw new Error(KeyringControllerError.UnsupportedSignUserOperation);
+    }
+
+    return await keyring.signUserOperation(address, userOp);
   }
 
   /**

diff --git a/packages/keyring-controller/src/utils.ts b/packages/keyring-controller/src/utils.ts