snaps-controllers: @metamask/rpc-errors migration

MetaMask · Sep 7, 2023 · a6d09ec · a6d09ec
1 parent 0174aa4
commit a6d09ec
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 17 deletions.
diff --git a/packages/snaps-controllers/src/snaps/SnapController.test.ts b/packages/snaps-controllers/src/snaps/SnapController.test.ts
@@ -848,7 +848,7 @@ describe('SnapController', () => {
         id: expect.any(String),
         requestState: {
           loading: false,
-          error: ethErrors.provider.userRejectedRequest().message,
+          error: providerErrors.userRejectedRequest().message,
           type: SNAP_APPROVAL_INSTALL,
         },
       }),
@@ -1657,7 +1657,7 @@ describe('SnapController', () => {
           },
         }),
       ).rejects.toThrow(
-        ethErrors.rpc.invalidRequest({
+        rpcErrors.invalidRequest({
           message:
             'Invalid JSON-RPC request: At path: jsonrpc -- Expected the literal `"2.0"`, but received: "kaplar".',
         }),
@@ -2283,7 +2283,7 @@ describe('SnapController', () => {
           id: expect.any(String),
           requestState: {
             loading: false,
-            error: ethErrors.provider.userRejectedRequest().message,
+            error: providerErrors.userRejectedRequest().message,
             type: SNAP_APPROVAL_INSTALL,
           },
         }),
@@ -3445,7 +3445,7 @@ describe('SnapController', () => {
             detectSnapLocation(),
           ),
       ).rejects.toThrow(
-        ethErrors.rpc.invalidParams(
+        rpcErrors.invalidParams(
           `Snap "${MOCK_SNAP_ID}@${snap.version}" is already installed. Couldn't update to a version inside requested "*" range.`,
         ),
       );

diff --git a/packages/snaps-controllers/src/snaps/SnapController.ts b/packages/snaps-controllers/src/snaps/SnapController.ts
@@ -1660,7 +1660,7 @@ export class SnapController extends BaseController<
         const [error, version] = resolveVersionRange(rawVersion);
 
         if (error) {
-          throw ethErrors.rpc.invalidParams(
+          throw rpcErrors.invalidParams(
             `The "version" field must be a valid SemVer version range if specified. Received: "${rawVersion}".`,
           );
         }
@@ -1738,7 +1738,7 @@ export class SnapController extends BaseController<
       if (this.#featureFlags.dappsCanUpdateSnaps === true) {
         return await this.updateSnap(origin, snapId, location, versionRange);
       }
-      throw ethErrors.rpc.invalidParams(
+      throw rpcErrors.invalidParams(
         `Version mismatch with already installed snap. ${snapId}@${existingSnap.version} doesn't satisfy requested version ${versionRange}.`,
       );
     }
@@ -1888,7 +1888,7 @@ export class SnapController extends BaseController<
 
       const newVersion = newSnap.manifest.result.version;
       if (!gtVersion(newVersion, snap.version)) {
-        throw ethErrors.rpc.invalidParams(
+        throw rpcErrors.invalidParams(
           `Snap "${snapId}@${snap.version}" is already installed. Couldn't update to a version inside requested "${newVersionRange}" range.`,
         );
       }

diff --git a/packages/snaps-controllers/src/snaps/endowments/cronjob.ts b/packages/snaps-controllers/src/snaps/endowments/cronjob.ts
@@ -109,21 +109,21 @@ export function getCronjobCaveatJobs(
  */
 export function validateCronjobCaveat(caveat: Caveat<string, any>) {
   if (!hasProperty(caveat, 'value') || !isPlainObject(caveat.value)) {
-    throw ethErrors.rpc.invalidParams({
+    throw rpcErrors.invalidParams({
       message: 'Expected a plain object.',
     });
   }
 
   const { value } = caveat;
 
   if (!hasProperty(value, 'jobs') || !isPlainObject(value)) {
-    throw ethErrors.rpc.invalidParams({
+    throw rpcErrors.invalidParams({
       message: 'Expected a plain object.',
     });
   }
 
   if (!isCronjobSpecificationArray(value.jobs)) {
-    throw ethErrors.rpc.invalidParams({
+    throw rpcErrors.invalidParams({
       message: 'Expected a valid cronjob specification array.',
     });
   }

diff --git a/packages/snaps-controllers/src/snaps/endowments/rpc.ts b/packages/snaps-controllers/src/snaps/endowments/rpc.ts
@@ -52,7 +52,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
         caveats?.length !== 1 ||
         caveats[0].type !== SnapCaveatType.RpcOrigin
       ) {
-        throw ethErrors.rpc.invalidParams({
+        throw rpcErrors.invalidParams({
           message: `Expected a single "${SnapCaveatType.RpcOrigin}" caveat.`,
         });
       }
@@ -75,13 +75,13 @@ export const rpcEndowmentBuilder = Object.freeze({
  */
 function validateCaveatOrigins(caveat: Caveat<string, any>) {
   if (!hasProperty(caveat, 'value') || !isPlainObject(caveat.value)) {
-    throw ethErrors.rpc.invalidParams({
+    throw rpcErrors.invalidParams({
       message: 'Invalid JSON-RPC origins: Expected a plain object.',
     });
   }
 
   const { value } = caveat;
-  assertIsRpcOrigins(value, ethErrors.rpc.invalidParams);
+  assertIsRpcOrigins(value, rpcErrors.invalidParams);
 }
 
 /**

diff --git a/packages/snaps-controllers/src/snaps/endowments/transaction-insight.ts b/packages/snaps-controllers/src/snaps/endowments/transaction-insight.ts
@@ -48,7 +48,7 @@ const specificationBuilder: PermissionSpecificationBuilder<
         (caveats?.length === 1 &&
           caveats[0].type !== SnapCaveatType.TransactionOrigin)
       ) {
-        throw ethErrors.rpc.invalidParams({
+        throw rpcErrors.invalidParams({
           message: `Expected a single "${SnapCaveatType.TransactionOrigin}" caveat.`,
         });
       }
@@ -70,7 +70,7 @@ export const transactionInsightEndowmentBuilder = Object.freeze({
  */
 function validateCaveat(caveat: Caveat<string, any>): void {
   if (!hasProperty(caveat, 'value') || !isPlainObject(caveat)) {
-    throw ethErrors.rpc.invalidParams({
+    throw rpcErrors.invalidParams({
       message: 'Expected a plain object.',
     });
   }

diff --git a/packages/snaps-controllers/src/test-utils/controller.ts b/packages/snaps-controllers/src/test-utils/controller.ts
@@ -19,7 +19,7 @@ import {
   MOCK_SNAP_ID,
 } from '@metamask/snaps-utils/test-utils';
 import type { Json } from '@metamask/utils';
-import { rpcErrors } from '@metamask/rpc-errors';
+import { providerErrors } from '@metamask/rpc-errors';
 
 import type {
   CronjobControllerActions,
@@ -88,7 +88,7 @@ export class MockApprovalController {
   }) {
     if (this.#approval) {
       if (requestState.loading === false && !requestState.error) {
-        this.#approval.promise.reject(ethErrors.provider.userRejectedRequest());
+        this.#approval.promise.reject(providerErrors.userRejectedRequest());
       }
     }
   }