From c17fa4011487fd1db99f4076bde206f6d154d6dc Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Wed, 8 Dec 2021 07:07:35 -0330
Subject: [PATCH] Consolidate permission exports (#13012)

The permission-related modules are now all exported together in the
index of the `app/scripts/controllers/permissions` directory.
---
 app/scripts/controllers/permissions/index.js               | 2 ++
 app/scripts/controllers/permissions/permission-log.js      | 2 +-
 app/scripts/controllers/permissions/permission-log.test.js | 2 +-
 app/scripts/metamask-controller.js                         | 4 ++--
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/scripts/controllers/permissions/index.js b/app/scripts/controllers/permissions/index.js
index e1c9b89c9..419d03993 100644
--- a/app/scripts/controllers/permissions/index.js
+++ b/app/scripts/controllers/permissions/index.js
@@ -1,4 +1,6 @@
 export * from './caveat-mutators';
 export * from './background-api';
+export * from './enums';
+export * from './permission-log';
 export * from './specifications';
 export * from './selectors';
diff --git a/app/scripts/controllers/permissions/permission-log.js b/app/scripts/controllers/permissions/permission-log.js
index 255af9945..f49e9401a 100644
--- a/app/scripts/controllers/permissions/permission-log.js
+++ b/app/scripts/controllers/permissions/permission-log.js
@@ -12,7 +12,7 @@ import {
  * Controller with middleware for logging requests and responses to restricted
  * and permissions-related methods.
  */
-export default class PermissionLogController {
+export class PermissionLogController {
   /**
    * @param {{ restrictedMethods: Set<string>, initState: Record<string, unknown> }} options - Options bag.
    */
diff --git a/app/scripts/controllers/permissions/permission-log.test.js b/app/scripts/controllers/permissions/permission-log.test.js
index 0ad4940b2..ecbb169dc 100644
--- a/app/scripts/controllers/permissions/permission-log.test.js
+++ b/app/scripts/controllers/permissions/permission-log.test.js
@@ -2,7 +2,7 @@ import nanoid from 'nanoid';
 import { useFakeTimers } from 'sinon';
 import stringify from 'fast-safe-stringify';
 import { constants, getters, noop } from '../../../../test/mocks/permissions';
-import PermissionLogController from './permission-log';
+import { PermissionLogController } from './permission-log';
 import { LOG_LIMIT, LOG_METHOD_TYPES } from './enums';
 
 const { PERMS, RPC_REQUESTS } = getters;
diff --git a/app/scripts/metamask-controller.js b/app/scripts/metamask-controller.js
index ceda7c391..ccdf93d6c 100644
--- a/app/scripts/metamask-controller.js
+++ b/app/scripts/metamask-controller.js
@@ -85,9 +85,7 @@ import PersonalMessageManager from './lib/personal-message-manager';
 import TypedMessageManager from './lib/typed-message-manager';
 import TransactionController from './controllers/transactions';
 import DetectTokensController from './controllers/detect-tokens';
-import PermissionLogController from './controllers/permissions/permission-log';
 import SwapsController from './controllers/swaps';
-import { NOTIFICATION_NAMES } from './controllers/permissions/enums';
 import { nodeify, nodeifyObject } from './lib/nodeify';
 import accountImporter from './account-import-strategies';
 import seedPhraseVerifier from './lib/seed-phrase-verifier';
@@ -101,6 +99,8 @@ import {
   getPermissionBackgroundApiMethods,
   getPermissionSpecifications,
   getPermittedAccountsByOrigin,
+  PermissionLogController,
+  NOTIFICATION_NAMES,
   unrestrictedMethods,
 } from './controllers/permissions';