chore(address-book-controller): Rename ControllerMessenger to `Mess…

…enger`

Rename `ControllerMessenger` to `Messenger` in the
`@metamask/address-book-controller` package. The `AddressBookControllerMessenger`
type export was renamed to `AddressBookMessenger`, but the old name is
preserved as an alias.

Relates to #4538

packages/address-book-controller/CHANGELOG.md

@@ -10,6 +10,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 
 - Bump `@metamask/base-controller` from `^7.0.0` to `^7.1.0` ([#5079](https://github.com/MetaMask/core/pull/5079))
+- Rename `AddressBookControllerMessenger` to `AddressBookMessenger` ([#5091](https://github.com/MetaMask/core/pull/5091))
+  - The old name is preserved as an alias, so this is not a breaking change.
 
 ## [6.0.2]
 

packages/address-book-controller/src/AddressBookController.test.ts

@@ -1,4 +1,4 @@
-import { ControllerMessenger } from '@metamask/base-controller';
+import { Messenger } from '@metamask/base-controller';
 import { toHex } from '@metamask/controller-utils';
 
 import type {
@@ -17,11 +17,11 @@ import {
  * @returns A restricted controller messenger.
  */
 function getRestrictedMessenger() {
-  const controllerMessenger = new ControllerMessenger<
+  const messenger = new Messenger<
     AddressBookControllerActions,
     AddressBookControllerEvents
   >();
-  return controllerMessenger.getRestricted({
+  return messenger.getRestricted({
     name: controllerName,
     allowedActions: [],
     allowedEvents: [],

packages/address-book-controller/src/AddressBookController.ts

@@ -1,7 +1,7 @@
 import type {
   ControllerGetStateAction,
   ControllerStateChangeEvent,
-  RestrictedControllerMessenger,
+  RestrictedMessenger,
 } from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
 import {
@@ -122,7 +122,7 @@ export const getDefaultAddressBookControllerState =
 /**
  * The messenger of the {@link AddressBookController} for communication.
  */
-export type AddressBookControllerMessenger = RestrictedControllerMessenger<
+export type AddressBookMessenger = RestrictedMessenger<
   typeof controllerName,
   AddressBookControllerActions,
   AddressBookControllerEvents,
@@ -136,7 +136,7 @@ export type AddressBookControllerMessenger = RestrictedControllerMessenger<
 export class AddressBookController extends BaseController<
   typeof controllerName,
   AddressBookControllerState,
-  AddressBookControllerMessenger
+  AddressBookMessenger
 > {
   /**
    * Creates an AddressBookController instance.
@@ -149,7 +149,7 @@ export class AddressBookController extends BaseController<
     messenger,
     state,
   }: {
-    messenger: AddressBookControllerMessenger;
+    messenger: AddressBookMessenger;
     state?: Partial<AddressBookControllerState>;
   }) {
     const mergedState = { ...getDefaultAddressBookControllerState(), ...state };

packages/address-book-controller/src/index.ts

@@ -6,7 +6,8 @@ export type {
   AddressBookControllerActions,
   AddressBookControllerStateChangeEvent,
   AddressBookControllerEvents,
-  AddressBookControllerMessenger,
+  AddressBookMessenger,
+  AddressBookMessenger as AddressBookControllerMessenger,
   ContactEntry,
 } from './AddressBookController';
 export {