export NotificationController and fix types (#815)

MetaMask · May 3, 2022 · 0b6e5a0 · 0b6e5a0
1 parent 654e5dc
commit 0b6e5a0
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 8 deletions.
diff --git a/src/index.ts b/src/index.ts
@@ -38,4 +38,5 @@ export * from './assets/CollectibleDetectionController';
 export * from './permissions';
 export * from './subject-metadata';
 export * from './ratelimit/RateLimitController';
+export * from './notification/NotificationController';
 export { util };
diff --git a/src/notification/NotificationController.test.ts b/src/notification/NotificationController.test.ts
@@ -1,6 +1,6 @@
 import { ControllerMessenger } from '../ControllerMessenger';
 import {
-  ControllerActions,
+  NotificationControllerActions,
   NotificationController,
   NotificationControllerStateChange,
 } from './NotificationController';
@@ -14,7 +14,7 @@ const name = 'NotificationController';
  */
 function getUnrestrictedMessenger() {
   return new ControllerMessenger<
-    ControllerActions,
+    NotificationControllerActions,
     NotificationControllerStateChange
   >();
 }

diff --git a/src/notification/NotificationController.ts b/src/notification/NotificationController.ts
@@ -57,15 +57,15 @@ export type MarkNotificationRead = {
   handler: NotificationController['markRead'];
 };
 
-export type ControllerActions =
+export type NotificationControllerActions =
   | GetNotificationControllerState
   | ShowNotification
   | DismissNotification
   | MarkNotificationRead;
 
 export type NotificationControllerMessenger = RestrictedControllerMessenger<
   typeof name,
-  ControllerActions,
+  NotificationControllerActions,
   NotificationControllerStateChange,
   never,
   never

diff --git a/src/ratelimit/RateLimitController.test.ts b/src/ratelimit/RateLimitController.test.ts
@@ -1,6 +1,6 @@
 import { ControllerMessenger } from '../ControllerMessenger';
 import {
-  ControllerActions,
+  RateLimitControllerActions,
   RateLimitStateChange,
   RateLimitController,
   RateLimitMessenger,
@@ -39,7 +39,7 @@ function getRestrictedMessenger(
 ) {
   return controllerMessenger.getRestricted<
     typeof name,
-    ControllerActions<RateLimitedApis>['type'],
+    RateLimitControllerActions<RateLimitedApis>['type'],
     never
   >({
     name,

diff --git a/src/ratelimit/RateLimitController.ts b/src/ratelimit/RateLimitController.ts
@@ -38,15 +38,15 @@ export type CallApi<
   handler: RateLimitController<RateLimitedApis>['call'];
 };
 
-export type ControllerActions<
+export type RateLimitControllerActions<
   RateLimitedApis extends Record<string, (...args: any[]) => any>,
 > = GetRateLimitState<RateLimitedApis> | CallApi<RateLimitedApis>;
 
 export type RateLimitMessenger<
   RateLimitedApis extends Record<string, (...args: any[]) => any>,
 > = RestrictedControllerMessenger<
   typeof name,
-  ControllerActions<RateLimitedApis>,
+  RateLimitControllerActions<RateLimitedApis>,
   RateLimitStateChange<RateLimitedApis>,
   never,
   never