Fix snaps-simulation tests

Author: Mrtenz

packages/snaps-jest/package.json

@@ -74,6 +74,7 @@
     "@jest/types": "^29.6.3",
     "@lavamoat/allow-scripts": "^3.3.5",
     "@metamask/auto-changelog": "^5.0.2",
+    "@metamask/phishing-controller": "^13.1.0",
     "@metamask/snaps-utils": "workspace:^",
     "@swc/core": "1.11.31",
     "@swc/jest": "^0.2.38",

packages/snaps-jest/src/test-utils/controller.ts

@@ -1,8 +1,7 @@
-import type { SnapInterfaceControllerAllowedActions } from '@metamask/snaps-controllers';
+import { PhishingDetectorResultType } from '@metamask/phishing-controller';
+import type { RootControllerAllowedActions } from '@metamask/snaps-simulation';
 import { MockControllerMessenger } from '@metamask/snaps-utils/test-utils';
 
-import type { RootControllerAllowedActions } from '../internals/simulation/controllers';
-
 export const getRootControllerMessenger = (mocked = true) => {
   const messenger = new MockControllerMessenger<
     RootControllerAllowedActions,
@@ -12,7 +11,7 @@ export const getRootControllerMessenger = (mocked = true) => {
   if (mocked) {
     messenger.registerActionHandler('PhishingController:testOrigin', () => ({
       result: false,
-      type: 'all',
+      type: PhishingDetectorResultType.All,
     }));
 
     messenger.registerActionHandler(
@@ -33,24 +32,3 @@ export const getRootControllerMessenger = (mocked = true) => {
 
   return messenger;
 };
-
-export const getRestrictedSnapInterfaceControllerMessenger = (
-  messenger: ReturnType<
-    typeof getRootControllerMessenger
-  > = getRootControllerMessenger(),
-) => {
-  const snapInterfaceControllerMessenger = messenger.getRestricted<
-    'SnapInterfaceController',
-    SnapInterfaceControllerAllowedActions['type']
-  >({
-    name: 'SnapInterfaceController',
-    allowedActions: [
-      'PhishingController:testOrigin',
-      'ApprovalController:hasRequest',
-      'ApprovalController:acceptRequest',
-    ],
-    allowedEvents: [],
-  });
-
-  return snapInterfaceControllerMessenger;
-};

packages/snaps-simulation/package.json

@@ -55,7 +55,6 @@
     "test:watch": "jest --watch"
   },
   "dependencies": {
-    "@metamask/base-controller": "^8.3.0",
     "@metamask/eth-json-rpc-middleware": "^17.0.1",
     "@metamask/json-rpc-engine": "^10.0.2",
     "@metamask/json-rpc-middleware-stream": "^8.0.7",

packages/snaps-simulation/src/methods/specifications.test.ts

@@ -1,4 +1,5 @@
-import { Messenger } from '@metamask/messenger';
+import type { MockAnyNamespace } from '@metamask/messenger';
+import { MOCK_ANY_NAMESPACE, Messenger } from '@metamask/messenger';
 import {
   getSnapManifest,
   MOCK_SNAP_ID,
@@ -15,13 +16,10 @@ import type { RestrictedMiddlewareHooks } from '../simulation';
 import { getMockOptions } from '../test-utils/options';
 
 const MOCK_HOOKS: RestrictedMiddlewareHooks = {
+  getClientCryptography: jest.fn(),
   getMnemonic: jest.fn(),
-  getSnapFile: jest.fn(),
-  createInterface: jest.fn(),
-  updateInterface: jest.fn(),
-  getInterfaceState: jest.fn(),
+  getMnemonicSeed: jest.fn(),
   getIsLocked: jest.fn(),
-  resolveInterface: jest.fn(),
 };
 
 describe('resolve', () => {
@@ -45,7 +43,9 @@ describe('getPermissionSpecifications', () => {
         hooks: MOCK_HOOKS,
         runSaga: jest.fn(),
         options: getMockOptions(),
-        controllerMessenger: new Messenger(),
+        controllerMessenger: new Messenger<MockAnyNamespace>({
+          namespace: MOCK_ANY_NAMESPACE,
+        }),
       }),
     ).toMatchInlineSnapshot(`
       {
@@ -324,7 +324,9 @@ describe('getPermissionSpecifications', () => {
 describe('getEndowments', () => {
   it('returns the endowments', async () => {
     const controllers = getControllers({
-      controllerMessenger: new Messenger(),
+      controllerMessenger: new Messenger<MockAnyNamespace>({
+        namespace: MOCK_ANY_NAMESPACE,
+      }),
       hooks: MOCK_HOOKS,
       runSaga: jest.fn(),
       options: getMockOptions(),

packages/snaps-simulation/src/simulation.test.ts

@@ -236,7 +236,11 @@ describe('getRestrictedHooks', () => {
 
 describe('getPermittedHooks', () => {
   const { runSaga, store } = createStore(getMockOptions());
-  const controllerMessenger = getRootControllerMessenger();
+  let controllerMessenger = getRootControllerMessenger();
+
+  beforeEach(() => {
+    controllerMessenger = getRootControllerMessenger();
+  });
 
   it('returns the `hasPermission` hook', async () => {
     const { snapId, close } = await getMockServer({

packages/snaps-simulation/src/test-utils/controller.ts

@@ -1,8 +1,6 @@
+import { Messenger } from '@metamask/messenger';
 import { PhishingDetectorResultType } from '@metamask/phishing-controller';
-import type {
-  SnapInterfaceControllerAllowedActions,
-  SnapInterfaceControllerEvents,
-} from '@metamask/snaps-controllers';
+import type { SnapInterfaceControllerAllowedActions } from '@metamask/snaps-controllers';
 import { MockControllerMessenger } from '@metamask/snaps-utils/test-utils';
 
 import type { RootControllerAllowedActions } from '../controllers';
@@ -43,13 +41,19 @@ export const getRestrictedSnapInterfaceControllerMessenger = (
     typeof getRootControllerMessenger
   > = getRootControllerMessenger(),
 ) => {
-  const snapInterfaceControllerMessenger = messenger.getRestricted<
+  const controllerMessenger = new Messenger<
     'SnapInterfaceController',
-    SnapInterfaceControllerAllowedActions['type'],
-    SnapInterfaceControllerEvents['type']
+    SnapInterfaceControllerAllowedActions,
+    never,
+    any
   >({
-    name: 'SnapInterfaceController',
-    allowedActions: [
+    namespace: 'SnapInterfaceController',
+    parent: messenger,
+  });
+
+  messenger.delegate({
+    messenger: controllerMessenger,
+    actions: [
       'PhishingController:testOrigin',
       'ApprovalController:hasRequest',
       'ApprovalController:acceptRequest',
@@ -58,8 +62,8 @@ export const getRestrictedSnapInterfaceControllerMessenger = (
       'AccountsController:listMultichainAccounts',
       'MultichainAssetsController:getState',
     ],
-    allowedEvents: ['NotificationServicesController:notificationsListUpdated'],
+    events: ['NotificationServicesController:notificationsListUpdated'],
   });
 
-  return snapInterfaceControllerMessenger;
+  return controllerMessenger;
 };

packages/snaps-utils/package.json

@@ -80,7 +80,6 @@
   "dependencies": {
     "@babel/core": "^7.23.2",
     "@babel/types": "^7.23.0",
-    "@metamask/base-controller": "^8.3.0",
     "@metamask/key-tree": "^10.1.1",
     "@metamask/messenger": "^0.2.0",
     "@metamask/permission-controller": "^11.0.6",

yarn.lock

@@ -4354,6 +4354,7 @@ __metadata:
     "@jest/types": "npm:^29.6.3"
     "@lavamoat/allow-scripts": "npm:^3.3.5"
     "@metamask/auto-changelog": "npm:^5.0.2"
+    "@metamask/phishing-controller": "npm:^13.1.0"
     "@metamask/snaps-controllers": "workspace:^"
     "@metamask/snaps-sdk": "workspace:^"
     "@metamask/snaps-simulation": "workspace:^"
@@ -4514,7 +4515,6 @@ __metadata:
   dependencies:
     "@lavamoat/allow-scripts": "npm:^3.3.5"
     "@metamask/auto-changelog": "npm:^5.0.2"
-    "@metamask/base-controller": "npm:^8.3.0"
     "@metamask/eth-json-rpc-middleware": "npm:^17.0.1"
     "@metamask/json-rpc-engine": "npm:^10.0.2"
     "@metamask/json-rpc-middleware-stream": "npm:^8.0.7"
@@ -4561,7 +4561,6 @@ __metadata:
     "@babel/types": "npm:^7.23.0"
     "@lavamoat/allow-scripts": "npm:^3.3.5"
     "@metamask/auto-changelog": "npm:^5.0.2"
-    "@metamask/base-controller": "npm:^8.3.0"
     "@metamask/key-tree": "npm:^10.1.1"
     "@metamask/messenger": "npm:^0.2.0"
     "@metamask/permission-controller": "npm:^11.0.6"