apply @mcmire suggestions

Author: mikesposito

packages/approval-controller/src/ApprovalController.test.ts

@@ -1327,7 +1327,7 @@ describe('approval controller', () => {
     });
 
     it('updateRequestState', () => {
-      const { rootMessenger, approvalControllerMessenger } = getMessengers();
+      const { approvalControllerMessenger } = getMessengers();
 
       approvalController = new ApprovalController({
         messenger: approvalControllerMessenger,
@@ -1343,10 +1343,13 @@ describe('approval controller', () => {
         requestState: { foo: 'bar' },
       });
 
-      rootMessenger.call('ApprovalController:updateRequestState', {
-        id: 'foo',
-        requestState: { foo: 'foobar' },
-      });
+      approvalControllerMessenger.call(
+        'ApprovalController:updateRequestState',
+        {
+          id: 'foo',
+          requestState: { foo: 'foobar' },
+        },
+      );
 
       expect(approvalController.get('foo')?.requestState).toStrictEqual({
         foo: 'foobar',

packages/base-controller/src/next/BaseController.test.ts

@@ -1,5 +1,9 @@
 /* eslint-disable jest/no-export */
-import { Messenger } from '@metamask/messenger';
+import {
+  MOCK_ANY_NAMESPACE,
+  Messenger,
+  type MockAnyNamespace,
+} from '@metamask/messenger';
 import type { Json } from '@metamask/utils';
 import type { Draft, Patch } from 'immer';
 import * as sinon from 'sinon';
@@ -728,10 +732,10 @@ describe('BaseController', () => {
     it('should allow messaging between controllers', () => {
       // Construct root messenger
       const rootMessenger = new Messenger<
-        'Root',
+        MockAnyNamespace,
         VisitorControllerActions | VisitorOverflowControllerActions,
         VisitorControllerEvents | VisitorOverflowControllerEvents
-      >({ namespace: 'Root' });
+      >({ namespace: MOCK_ANY_NAMESPACE });
       // Construct controller messengers, delegating to parent
       const visitorControllerMessenger = new Messenger<
         typeof visitorName,

packages/transaction-controller/src/TransactionControllerIntegration.test.ts

@@ -13,7 +13,9 @@ import {
   NetworkType,
 } from '@metamask/controller-utils';
 import {
+  MOCK_ANY_NAMESPACE,
   Messenger,
+  type MockAnyNamespace,
   type MessengerActions,
   type MessengerEvents,
 } from '@metamask/messenger';
@@ -86,7 +88,7 @@ type AllEvents =
   | NetworkControllerEvents
   | ApprovalControllerEvents;
 
-type RootMessenger = Messenger<'Root', AllActions, AllEvents>;
+type RootMessenger = Messenger<MockAnyNamespace, AllActions, AllEvents>;
 
 const uuidV4Mock = jest.mocked(uuidV4);
 
@@ -170,7 +172,9 @@ const setupController = async (
     ],
   });
 
-  const rootMessenger: RootMessenger = new Messenger({ namespace: 'Root' });
+  const rootMessenger: RootMessenger = new Messenger({
+    namespace: MOCK_ANY_NAMESPACE,
+  });
 
   const networkControllerMessenger = new Messenger<
     'NetworkController',

packages/transaction-controller/src/utils/eip7702.test.ts

@@ -2,8 +2,10 @@ import { query } from '@metamask/controller-utils';
 import type EthQuery from '@metamask/eth-query';
 import {
   Messenger,
+  MockAnyNamespace,
   type MessengerActions,
   type MessengerEvents,
+  MOCK_ANY_NAMESPACE,
 } from '@metamask/messenger';
 import type { Hex } from '@metamask/utils';
 import { remove0x } from '@metamask/utils';
@@ -77,7 +79,7 @@ const AUTHORIZATION_LIST_MOCK: AuthorizationList = [
 
 describe('EIP-7702 Utils', () => {
   let rootMessenger: Messenger<
-    'Root',
+    MockAnyNamespace,
     MessengerActions<TransactionControllerMessenger>,
     MessengerEvents<TransactionControllerMessenger>
   >;
@@ -98,7 +100,7 @@ describe('EIP-7702 Utils', () => {
   beforeEach(() => {
     jest.resetAllMocks();
 
-    rootMessenger = new Messenger({ namespace: 'Root' });
+    rootMessenger = new Messenger({ namespace: MOCK_ANY_NAMESPACE });
 
     signAuthorizationMock = jest
       .fn()

packages/transaction-controller/src/utils/feature-flags.test.ts

@@ -1,5 +1,7 @@
 import {
+  MOCK_ANY_NAMESPACE,
   Messenger,
+  type MockAnyNamespace,
   type MessengerActions,
   type MessengerEvents,
 } from '@metamask/messenger';
@@ -41,7 +43,7 @@ const GAS_BUFFER_5_MOCK = 1.5;
 
 describe('Feature Flags Utils', () => {
   let rootMessenger: Messenger<
-    'Root',
+    MockAnyNamespace,
     MessengerActions<TransactionControllerMessenger>,
     MessengerEvents<TransactionControllerMessenger>
   >;
@@ -78,7 +80,7 @@ describe('Feature Flags Utils', () => {
 
     getFeatureFlagsMock = jest.fn();
 
-    rootMessenger = new Messenger({ namespace: 'Root' });
+    rootMessenger = new Messenger({ namespace: MOCK_ANY_NAMESPACE });
 
     remoteFeatureFlagControllerMessenger = new Messenger({
       namespace: 'RemoteFeatureFlagController',

packages/transaction-controller/src/utils/swaps.test.ts

@@ -1,6 +1,8 @@
 import { query } from '@metamask/controller-utils';
 import {
+  MOCK_ANY_NAMESPACE,
   Messenger,
+  type MockAnyNamespace,
   type MessengerActions,
   type MessengerEvents,
 } from '@metamask/messenger';
@@ -46,11 +48,11 @@ describe('updateSwapsTransaction', () => {
       },
     };
     const rootMessenger = new Messenger<
-      'Root',
+      MockAnyNamespace,
       MessengerActions<TransactionControllerMessenger>,
       MessengerEvents<TransactionControllerMessenger>
     >({
-      namespace: 'Root',
+      namespace: MOCK_ANY_NAMESPACE,
     });
     messenger = new Messenger<
       'TransactionController',