Merge branch 'main' into cryptodev2s/fix-snaps-packages-bump-changelogs

MetaMask · Feb 4, 2025 · 37d4bba · 37d4bba
2 parents cc6e949 + 3748f24
commit 37d4bba
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/packages/earn-controller/src/EarnController.test.ts b/packages/earn-controller/src/EarnController.test.ts
@@ -1,5 +1,5 @@
 import type { AccountsController } from '@metamask/accounts-controller';
-import { ControllerMessenger } from '@metamask/base-controller';
+import { Messenger } from '@metamask/base-controller';
 import { getDefaultNetworkControllerState } from '@metamask/network-controller';
 import { StakeSdk, StakingApiService } from '@metamask/stake-sdk';
 
@@ -30,12 +30,12 @@ jest.mock('@metamask/stake-sdk', () => ({
 }));
 
 /**
- * Builds a new instance of the ControllerMessenger class for the AccountsController.
+ * Builds a new instance of the Messenger class for the AccountsController.
  *
- * @returns A new instance of the ControllerMessenger class for the AccountsController.
+ * @returns A new instance of the Messenger class for the AccountsController.
  */
 function buildMessenger() {
-  return new ControllerMessenger<
+  return new Messenger<
     EarnControllerActions | AllowedActions,
     EarnControllerEvents | AllowedEvents
   >();

diff --git a/packages/earn-controller/src/EarnController.ts b/packages/earn-controller/src/EarnController.ts
@@ -6,7 +6,7 @@ import type {
 import type {
   ControllerGetStateAction,
   ControllerStateChangeEvent,
-  RestrictedControllerMessenger,
+  RestrictedMessenger,
   StateMetadata,
 } from '@metamask/base-controller';
 import { BaseController } from '@metamask/base-controller';
@@ -163,7 +163,7 @@ export type AllowedEvents =
  * The messenger which is restricted to actions and events accessed by
  * EarnController.
  */
-export type EarnControllerMessenger = RestrictedControllerMessenger<
+export type EarnControllerMessenger = RestrictedMessenger<
   typeof controllerName,
   EarnControllerActions | AllowedActions,
   EarnControllerEvents | AllowedEvents,