Fix typing issues

MetaMask · Nov 9, 2022 · a173d93 · a173d93
1 parent cda334c
commit a173d93
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 18 deletions.
diff --git a/packages/rpc-methods/jest.config.js b/packages/rpc-methods/jest.config.js
@@ -7,8 +7,8 @@ module.exports = deepmerge(baseConfig, {
     global: {
       branches: 85.82,
       functions: 80,
-      lines: 60.29,
-      statements: 60.29,
+      lines: 60.24,
+      statements: 60.24,
     },
   },
   testTimeout: 2500,

diff --git a/packages/rpc-methods/src/permitted/requestSnaps.test.ts b/packages/rpc-methods/src/permitted/requestSnaps.test.ts
@@ -2,8 +2,17 @@ import {
   MOCK_SNAP_ID,
   getTruncatedSnap,
 } from '@metamask/snap-utils/test-utils';
-import { getSnapPermissionName } from '@metamask/snap-utils';
+import {
+  JsonRpcRequest,
+  JsonRpcSuccess,
+  PendingJsonRpcResponse,
+} from '@metamask/types';
+import {
+  getSnapPermissionName,
+  InstallSnapsResult,
+} from '@metamask/snap-utils';
 import { JsonRpcEngine } from 'json-rpc-engine';
+import { RequestedPermissions } from '@metamask/controllers';
 import { requestSnapsHandler } from './requestSnaps';
 
 describe('requestSnapsHandler', () => {
@@ -49,17 +58,23 @@ describe('implementation', () => {
 
     const engine = new JsonRpcEngine();
     engine.push((req, res, next, end) =>
-      implementation(req as any, res as any, next, end, hooks),
+      implementation(
+        req as JsonRpcRequest<RequestedPermissions>,
+        res as PendingJsonRpcResponse<InstallSnapsResult>,
+        next,
+        end,
+        hooks,
+      ),
     );
 
-    const response: any = await engine.handle({
+    const response = (await engine.handle({
       jsonrpc: '2.0',
       id: 1,
       method: 'wallet_installSnaps',
       params: {
         [MOCK_SNAP_ID]: {},
       },
-    });
+    })) as JsonRpcSuccess<InstallSnapsResult>;
 
     expect(hooks.requestPermissions).toHaveBeenCalledWith({
       [getSnapPermissionName(MOCK_SNAP_ID)]: {},
@@ -95,17 +110,23 @@ describe('implementation', () => {
 
     const engine = new JsonRpcEngine();
     engine.push((req, res, next, end) =>
-      implementation(req as any, res as any, next, end, hooks),
+      implementation(
+        req as JsonRpcRequest<RequestedPermissions>,
+        res as PendingJsonRpcResponse<InstallSnapsResult>,
+        next,
+        end,
+        hooks,
+      ),
     );
 
-    const response: any = await engine.handle({
+    const response = (await engine.handle({
       jsonrpc: '2.0',
       id: 1,
       method: 'wallet_installSnaps',
       params: {
         [MOCK_SNAP_ID]: {},
       },
-    });
+    })) as JsonRpcSuccess<InstallSnapsResult>;
 
     expect(hooks.requestPermissions).not.toHaveBeenCalledWith({
       [getSnapPermissionName(MOCK_SNAP_ID)]: {},

diff --git a/packages/rpc-methods/src/permitted/requestSnaps.ts b/packages/rpc-methods/src/permitted/requestSnaps.ts
@@ -124,14 +124,12 @@ async function requestSnapsImplementation(
 
   try {
     // We expect the params to be the same as wallet_requestPermissions
-    const requestedPermissions = Object.keys(requestedSnaps).reduce(
-      (acc, key) => {
-        // @ts-expect-error TODO: Type error
-        acc[getSnapPermissionName(key)] = requestedSnaps[key];
-        return acc;
-      },
-      {},
-    );
+    const requestedPermissions = Object.keys(requestedSnaps).reduce<
+      Record<string, Partial<PermissionConstraint>>
+    >((acc, key) => {
+      acc[getSnapPermissionName(key)] = requestedSnaps[key];
+      return acc;
+    }, {});
     const existingPermissions = await getPermissions();
     if (
       !existingPermissions ||
@@ -152,7 +150,7 @@ async function requestSnapsImplementation(
   try {
     res.result = await handleInstallSnaps(requestedSnaps, installSnaps);
   } catch (err) {
-    res.error = err as Error;
+    res.error = err;
   }
   return end();
 }