refactor: rename CONTROLLER_MESSENGERS to MESSENGER_FACTORIES

app/core/Engine/messengers/index.ts

@@ -155,9 +155,9 @@ import { getComplianceServiceMessenger } from './compliance/compliance-service-m
 import { getComplianceControllerMessenger } from './compliance/compliance-controller-messenger';
 
 /**
- * The messengers for the controllers that have been.
+ * The messenger factories for the messenger clients that have been modularized.
  */
-export const CONTROLLER_MESSENGERS = {
+export const MESSENGER_FACTORIES = {
   AccountsController: {
     getMessenger: getAccountsControllerMessenger,
     getInitMessenger: noop,

app/core/Engine/types.ts

@@ -348,7 +348,7 @@ import { EncryptionKey } from '../Encryptor/types';
 
 import { Hex } from '@metamask/utils';
 
-import { CONTROLLER_MESSENGERS } from './messengers';
+import { MESSENGER_FACTORIES } from './messengers';
 import type { RootState } from '../../reducers';
 import {
   AppMetadataController,
@@ -982,11 +982,11 @@ type MessengerClientPersistedState = Partial<{
 /**
  * Map of messenger client messengers by name.
  */
-export type MessengerClientMessengersByName = typeof CONTROLLER_MESSENGERS;
+export type MessengerClientMessengersByName = typeof MESSENGER_FACTORIES;
 
 /**
- * Request to initialize and return a controller instance.
- * Includes standard data and methods not coupled to any specific controller.
+ * Request to initialize and return a messenger client instance.
+ * Includes standard data and methods not coupled to any specific messenger client.
  */
 // eslint-disable-next-line @typescript-eslint/consistent-type-definitions
 export type MessengerClientInitRequest<
@@ -1089,8 +1089,8 @@ export type MessengerClientInitFunction<
 export type MessengerClientInitFunctionsByMessengerClientName = {
   [Name in MessengerClientsToInitialize]: MessengerClientInitFunction<
     MessengerClientsByName[Name],
-    ReturnType<(typeof CONTROLLER_MESSENGERS)[Name]['getMessenger']>,
-    ReturnType<(typeof CONTROLLER_MESSENGERS)[Name]['getInitMessenger']>
+    ReturnType<(typeof MESSENGER_FACTORIES)[Name]['getMessenger']>,
+    ReturnType<(typeof MESSENGER_FACTORIES)[Name]['getInitMessenger']>
   >;
 };
 

app/core/Engine/utils/utils.ts

@@ -9,7 +9,7 @@ import type {
   MessengerClientInitRequest,
   MessengerClientInitFunction,
 } from '../types';
-import { CONTROLLER_MESSENGERS } from '../messengers';
+import { MESSENGER_FACTORIES } from '../messengers';
 
 const log = createProjectLogger('controller-init');
 
@@ -21,8 +21,8 @@ type BaseControllerInitRequest = MessengerClientInitRequest<
 type InitFunction<Name extends MessengerClientsToInitialize> =
   MessengerClientInitFunction<
     MessengerClientsByName[Name],
-    ReturnType<(typeof CONTROLLER_MESSENGERS)[Name]['getMessenger']>,
-    ReturnType<(typeof CONTROLLER_MESSENGERS)[Name]['getInitMessenger']>
+    ReturnType<(typeof MESSENGER_FACTORIES)[Name]['getMessenger']>,
+    ReturnType<(typeof MESSENGER_FACTORIES)[Name]['getInitMessenger']>
   >;
 
 /**
@@ -64,7 +64,7 @@ export const initModularizedControllers: InitMessengerClientsFunction = ({
     >;
 
     // Get the messenger for the controller
-    const messengerCallbacks = CONTROLLER_MESSENGERS[controllerName];
+    const messengerCallbacks = MESSENGER_FACTORIES[controllerName];
 
     const controllerMessengerCallback =
       messengerCallbacks.getMessenger as ControllerMessengerCallback;