diff --git a/packages/logging-controller/src/LoggingController.test.ts b/packages/logging-controller/src/LoggingController.test.ts index 3f092f56b4d..929cbb42f98 100644 --- a/packages/logging-controller/src/LoggingController.test.ts +++ b/packages/logging-controller/src/LoggingController.test.ts @@ -1,4 +1,4 @@ -import { ControllerMessenger } from '@metamask/base-controller'; +import { Messenger } from '@metamask/base-controller'; import * as uuid from 'uuid'; import type { LoggingControllerActions } from './LoggingController'; @@ -18,24 +18,22 @@ jest.mock('uuid', () => { const name = 'LoggingController'; /** - * Constructs a unrestricted controller messenger. + * Constructs a unrestricted messenger. * - * @returns A unrestricted controller messenger. + * @returns A unrestricted messenger. */ function getUnrestrictedMessenger() { - return new ControllerMessenger(); + return new Messenger(); } /** - * Constructs a restricted controller messenger. + * Constructs a restricted messenger. * - * @param controllerMessenger - An optional unrestricted messenger - * @returns A restricted controller messenger. + * @param messenger - An optional unrestricted messenger + * @returns A restricted messenger. */ -function getRestrictedMessenger( - controllerMessenger = getUnrestrictedMessenger(), -) { - return controllerMessenger.getRestricted({ +function getRestrictedMessenger(messenger = getUnrestrictedMessenger()) { + return messenger.getRestricted({ name, allowedActions: [], allowedEvents: [], diff --git a/packages/logging-controller/src/LoggingController.ts b/packages/logging-controller/src/LoggingController.ts index 502fbedd4c4..384108d78fa 100644 --- a/packages/logging-controller/src/LoggingController.ts +++ b/packages/logging-controller/src/LoggingController.ts @@ -1,7 +1,7 @@ import type { ControllerGetStateAction, ControllerStateChangeEvent, - RestrictedControllerMessenger, + RestrictedMessenger, } from '@metamask/base-controller'; import { BaseController } from '@metamask/base-controller'; import { v1 as random } from 'uuid'; @@ -54,7 +54,7 @@ export type LoggingControllerStateChangeEvent = ControllerStateChangeEvent< export type LoggingControllerEvents = LoggingControllerStateChangeEvent; -export type LoggingControllerMessenger = RestrictedControllerMessenger< +export type LoggingControllerMessenger = RestrictedMessenger< typeof name, LoggingControllerActions, LoggingControllerEvents, @@ -82,7 +82,7 @@ export class LoggingController extends BaseController< * Creates a LoggingController instance. * * @param options - Constructor options - * @param options.messenger - An instance of the ControllerMessenger + * @param options.messenger - An instance of the Messenger * @param options.state - Initial state to set on this controller. */ constructor({