refactor: Refactor remaining controllers to remove duplicate messenger types

app/scripts/messenger-client-init/account-tracker-controller-init.test.ts

@@ -5,7 +5,10 @@ import {
   MockAnyNamespace,
 } from '@metamask/messenger';
 import { RemoteFeatureFlagControllerGetStateAction } from '@metamask/remote-feature-flag-controller';
-import { AccountTrackerController } from '@metamask/assets-controllers';
+import {
+  AccountTrackerController,
+  AccountTrackerControllerMessenger,
+} from '@metamask/assets-controllers';
 import {
   AutoManagedNetworkClient,
   CustomNetworkClientConfiguration,
@@ -21,7 +24,6 @@ import { MessengerClientInitRequest } from './types';
 import { buildControllerInitRequestMock } from './test/utils';
 import {
   getAccountTrackerControllerMessenger,
-  AccountTrackerControllerMessenger,
   getAccountTrackerControllerInitMessenger,
   AccountTrackerControllerInitMessenger,
 } from './messengers';

app/scripts/messenger-client-init/account-tracker-controller-init.ts

@@ -1,10 +1,10 @@
-import { AccountTrackerController } from '@metamask/assets-controllers';
-import { NetworkClientId } from '@metamask/network-controller';
-import { MessengerClientInitFunction } from './types';
 import {
-  AccountTrackerControllerInitMessenger,
+  AccountTrackerController,
   AccountTrackerControllerMessenger,
-} from './messengers';
+} from '@metamask/assets-controllers';
+import { NetworkClientId } from '@metamask/network-controller';
+import { MessengerClientInitFunction } from './types';
+import { AccountTrackerControllerInitMessenger } from './messengers';
 
 export const AccountTrackerControllerInit: MessengerClientInitFunction<
   AccountTrackerController,

app/scripts/messenger-client-init/accounts-controller-init.test.ts

@@ -1,11 +1,11 @@
-import { AccountsController } from '@metamask/accounts-controller';
+import {
+  AccountsController,
+  AccountsControllerMessenger,
+} from '@metamask/accounts-controller';
 import { getRootMessenger } from '../lib/messenger';
 import { MessengerClientInitRequest } from './types';
 import { buildControllerInitRequestMock } from './test/utils';
-import {
-  getAccountsControllerMessenger,
-  AccountsControllerMessenger,
-} from './messengers';
+import { getAccountsControllerMessenger } from './messengers';
 import { AccountsControllerInit } from './accounts-controller-init';
 
 jest.mock('@metamask/accounts-controller');

app/scripts/messenger-client-init/accounts-controller-init.ts

@@ -1,6 +1,8 @@
-import { AccountsController } from '@metamask/accounts-controller';
+import {
+  AccountsController,
+  AccountsControllerMessenger,
+} from '@metamask/accounts-controller';
 import { MessengerClientInitFunction } from './types';
-import { AccountsControllerMessenger } from './messengers';
 
 /**
  * Initialize the accounts controller.

app/scripts/messenger-client-init/announcement-controller-init.test.ts

@@ -1,12 +1,12 @@
-import { AnnouncementController } from '@metamask/announcement-controller';
+import {
+  AnnouncementController,
+  AnnouncementControllerMessenger,
+} from '@metamask/announcement-controller';
 import { UI_NOTIFICATIONS } from '../../../shared/notifications';
 import { getRootMessenger } from '../lib/messenger';
 import { MessengerClientInitRequest } from './types';
 import { buildControllerInitRequestMock } from './test/utils';
-import {
-  getAnnouncementControllerMessenger,
-  AnnouncementControllerMessenger,
-} from './messengers';
+import { getAnnouncementControllerMessenger } from './messengers';
 import { AnnouncementControllerInit } from './announcement-controller-init';
 
 jest.mock('@metamask/announcement-controller');

app/scripts/messenger-client-init/announcement-controller-init.ts

@@ -1,7 +1,9 @@
-import { AnnouncementController } from '@metamask/announcement-controller';
+import {
+  AnnouncementController,
+  AnnouncementControllerMessenger,
+} from '@metamask/announcement-controller';
 import { UI_NOTIFICATIONS } from '../../../shared/notifications';
 import { MessengerClientInitFunction } from './types';
-import { AnnouncementControllerMessenger } from './messengers';
 
 /**
  * Initialize the announcement controller.

app/scripts/messenger-client-init/assets/assets-contract-controller-init.test.ts

@@ -4,7 +4,10 @@ import {
   Messenger,
   MockAnyNamespace,
 } from '@metamask/messenger';
-import { AssetsContractController } from '@metamask/assets-controllers';
+import {
+  AssetsContractController,
+  AssetsContractControllerMessenger,
+} from '@metamask/assets-controllers';
 import {
   NetworkControllerGetNetworkClientByIdAction,
   NetworkControllerGetStateAction,
@@ -13,7 +16,6 @@ import { buildControllerInitRequestMock, CHAIN_ID_MOCK } from '../test/utils';
 import { MessengerClientInitRequest } from '../types';
 import {
   AssetsContractControllerInitMessenger,
-  AssetsContractControllerMessenger,
   getAssetsContractControllerInitMessenger,
   getAssetsContractControllerMessenger,
 } from '../messengers/assets';

app/scripts/messenger-client-init/assets/assets-contract-controller-init.ts

@@ -1,9 +1,9 @@
-import { AssetsContractController } from '@metamask/assets-controllers';
-import { MessengerClientInitFunction } from '../types';
 import {
-  AssetsContractControllerInitMessenger,
+  AssetsContractController,
   AssetsContractControllerMessenger,
-} from '../messengers/assets';
+} from '@metamask/assets-controllers';
+import { MessengerClientInitFunction } from '../types';
+import { AssetsContractControllerInitMessenger } from '../messengers/assets';
 import { getGlobalChainId } from '../init-utils';
 
 /**

app/scripts/messenger-client-init/assets/assets-controller-init.test.ts

@@ -1,6 +1,6 @@
 import {
   AssetsController,
-  AssetsControllerMessenger,
+  type AssetsControllerMessenger,
 } from '@metamask/assets-controller';
 import { createApiPlatformClient } from '@metamask/core-backend';
 import { MessengerClientInitRequest } from '../types';

app/scripts/messenger-client-init/assets/client-controller-init.ts

@@ -1,6 +1,6 @@
 import { ClientController } from '@metamask/client-controller';
+import type { ClientControllerMessenger } from '@metamask/client-controller';
 import { type MessengerClientInitFunction } from '../types';
-import type { ClientControllerMessenger } from '../messengers/assets';
 
 /**
  * Initialize the ClientController.

app/scripts/messenger-client-init/assets/network-enablement-controller-init.test.ts

@@ -3,7 +3,10 @@ import {
   MOCK_ANY_NAMESPACE,
   MockAnyNamespace,
 } from '@metamask/messenger';
-import { NetworkEnablementController } from '@metamask/network-enablement-controller';
+import {
+  NetworkEnablementController,
+  NetworkEnablementControllerMessenger,
+} from '@metamask/network-enablement-controller';
 import { BtcScope, SolAccountType, SolScope } from '@metamask/keyring-api';
 import { AccountsControllerSelectedAccountChangeEvent } from '@metamask/accounts-controller';
 import {
@@ -18,7 +21,6 @@ import {
   getNetworkEnablementControllerInitMessenger,
   getNetworkEnablementControllerMessenger,
   NetworkEnablementControllerInitMessenger,
-  NetworkEnablementControllerMessenger,
 } from '../messengers/assets';
 import { getRootMessenger } from '../../lib/messenger';
 import { NetworkEnablementControllerInit } from './network-enablement-controller-init';

app/scripts/messenger-client-init/assets/network-enablement-controller-init.ts

@@ -1,6 +1,7 @@
 import {
   NetworkEnablementController,
   NetworkEnablementControllerState,
+  NetworkEnablementControllerMessenger,
 } from '@metamask/network-enablement-controller';
 import { NetworkState } from '@metamask/network-controller';
 import { MultichainNetworkControllerState } from '@metamask/multichain-network-controller';
@@ -17,10 +18,7 @@ import {
   KnownCaipNamespace,
   parseCaipChainId,
 } from '@metamask/utils';
-import {
-  NetworkEnablementControllerMessenger,
-  NetworkEnablementControllerInitMessenger,
-} from '../messengers/assets';
+import { NetworkEnablementControllerInitMessenger } from '../messengers/assets';
 import { MessengerClientInitFunction } from '../types';
 import {
   CHAIN_IDS,

app/scripts/messenger-client-init/assets/nft-controller-init.ts

@@ -1,10 +1,10 @@
-import { NftController } from '@metamask/assets-controllers';
-import { AssetType } from '@metamask/bridge-controller';
-import { MessengerClientInitFunction } from '../types';
 import {
+  NftController,
   NftControllerMessenger,
-  NftControllerInitMessenger,
-} from '../messengers/assets';
+} from '@metamask/assets-controllers';
+import { AssetType } from '@metamask/bridge-controller';
+import { MessengerClientInitFunction } from '../types';
+import { NftControllerInitMessenger } from '../messengers/assets';
 import {
   MetaMetricsEventCategory,
   MetaMetricsEventName,

app/scripts/messenger-client-init/assets/nft-detection-controller-init.ts

@@ -1,6 +1,8 @@
-import { NftDetectionController } from '@metamask/assets-controllers';
+import {
+  NftDetectionController,
+  NftDetectionControllerMessenger,
+} from '@metamask/assets-controllers';
 import { MessengerClientInitFunction } from '../types';
-import { NftDetectionControllerMessenger } from '../messengers/assets';
 
 /**
  * Initialize the NFT detection controller.

app/scripts/messenger-client-init/assets/token-rates-controller-init.ts

@@ -1,12 +1,10 @@
 import {
   CodefiTokenPricesServiceV2,
   TokenRatesController,
+  TokenRatesControllerMessenger,
 } from '@metamask/assets-controllers';
 import { MessengerClientInitFunction } from '../types';
-import {
-  TokenRatesControllerMessenger,
-  TokenRatesControllerInitMessenger,
-} from '../messengers/assets';
+import { TokenRatesControllerInitMessenger } from '../messengers/assets';
 import { previousValueComparator } from '../../lib/util';
 
 /**

app/scripts/messenger-client-init/confirmations/address-book-controller-init.test.ts

@@ -1,10 +1,10 @@
-import { AddressBookController } from '@metamask/address-book-controller';
-import { MessengerClientInitRequest } from '../types';
-import { buildControllerInitRequestMock } from '../test/utils';
 import {
-  getAddressBookControllerMessenger,
+  AddressBookController,
   AddressBookControllerMessenger,
-} from '../messengers';
+} from '@metamask/address-book-controller';
+import { MessengerClientInitRequest } from '../types';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { getAddressBookControllerMessenger } from '../messengers';
 import { getRootMessenger } from '../../lib/messenger';
 import { AddressBookControllerInit } from './address-book-controller-init';
 

app/scripts/messenger-client-init/confirmations/address-book-controller-init.ts

@@ -1,6 +1,8 @@
-import { AddressBookController } from '@metamask/address-book-controller';
+import {
+  AddressBookController,
+  AddressBookControllerMessenger,
+} from '@metamask/address-book-controller';
 import { MessengerClientInitFunction } from '../types';
-import { AddressBookControllerMessenger } from '../messengers';
 
 /**
  * Initialize the address book controller.

app/scripts/messenger-client-init/confirmations/decrypt-message-manager-init.test.ts

@@ -1,10 +1,10 @@
-import { DecryptMessageManager } from '@metamask/message-manager';
-import { MessengerClientInitRequest } from '../types';
-import { buildControllerInitRequestMock } from '../test/utils';
 import {
-  getDecryptMessageManagerMessenger,
+  DecryptMessageManager,
   DecryptMessageManagerMessenger,
-} from '../messengers';
+} from '@metamask/message-manager';
+import { MessengerClientInitRequest } from '../types';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { getDecryptMessageManagerMessenger } from '../messengers';
 import { getRootMessenger } from '../../lib/messenger';
 import { DecryptMessageManagerInit } from './decrypt-message-manager-init';
 

app/scripts/messenger-client-init/confirmations/decrypt-message-manager-init.ts

@@ -1,6 +1,8 @@
-import { DecryptMessageManager } from '@metamask/message-manager';
+import {
+  DecryptMessageManager,
+  DecryptMessageManagerMessenger,
+} from '@metamask/message-manager';
 import { MessengerClientInitFunction } from '../types';
-import { DecryptMessageManagerMessenger } from '../messengers';
 
 /**
  * Initialize the decrypt message manager.

app/scripts/messenger-client-init/confirmations/encryption-public-key-message-manager-init.test.ts

@@ -1,10 +1,10 @@
-import { EncryptionPublicKeyManager } from '@metamask/message-manager';
-import { MessengerClientInitRequest } from '../types';
-import { buildControllerInitRequestMock } from '../test/utils';
 import {
-  getEncryptionPublicKeyManagerMessenger,
+  EncryptionPublicKeyManager,
   EncryptionPublicKeyManagerMessenger,
-} from '../messengers';
+} from '@metamask/message-manager';
+import { MessengerClientInitRequest } from '../types';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { getEncryptionPublicKeyManagerMessenger } from '../messengers';
 import { getRootMessenger } from '../../lib/messenger';
 import { EncryptionPublicKeyManagerInit } from './encryption-public-key-message-manager-init';
 

app/scripts/messenger-client-init/confirmations/encryption-public-key-message-manager-init.ts

@@ -1,6 +1,8 @@
-import { EncryptionPublicKeyManager } from '@metamask/message-manager';
+import {
+  EncryptionPublicKeyManager,
+  EncryptionPublicKeyManagerMessenger,
+} from '@metamask/message-manager';
 import { MessengerClientInitFunction } from '../types';
-import { EncryptionPublicKeyManagerMessenger } from '../messengers';
 
 /**
  * Initialize the encryption public key message manager.

app/scripts/messenger-client-init/confirmations/name-controller-init.test.ts

@@ -1,9 +1,11 @@
-import { NameController } from '@metamask/name-controller';
+import {
+  NameController,
+  NameControllerMessenger,
+} from '@metamask/name-controller';
 import { MessengerClientInitRequest } from '../types';
 import { buildControllerInitRequestMock } from '../test/utils';
 import {
   getNameControllerMessenger,
-  NameControllerMessenger,
   getNameControllerInitMessenger,
   NameControllerInitMessenger,
 } from '../messengers';

app/scripts/messenger-client-init/confirmations/name-controller-init.ts

@@ -4,11 +4,9 @@ import {
   LensNameProvider,
   NameController,
   TokenNameProvider,
-} from '@metamask/name-controller';
-import {
-  NameControllerInitMessenger,
   NameControllerMessenger,
-} from '../messengers';
+} from '@metamask/name-controller';
+import { NameControllerInitMessenger } from '../messengers';
 import { MessengerClientInitFunction } from '../types';
 
 /**

app/scripts/messenger-client-init/confirmations/user-operation-controller-init.test.ts

@@ -1,10 +1,12 @@
-import { UserOperationController } from '@metamask/user-operation-controller';
+import {
+  UserOperationController,
+  UserOperationControllerMessenger,
+} from '@metamask/user-operation-controller';
 import { MessengerClientInitRequest } from '../types';
 import { buildControllerInitRequestMock } from '../test/utils';
 import {
   getUserOperationControllerMessenger,
   getUserOperationControllerInitMessenger,
-  UserOperationControllerMessenger,
   UserOperationControllerInitMessenger,
 } from '../messengers';
 import { getRootMessenger } from '../../lib/messenger';

app/scripts/messenger-client-init/confirmations/user-operation-controller-init.ts

@@ -1,9 +1,9 @@
-import { UserOperationController } from '@metamask/user-operation-controller';
-import { MessengerClientInitFunction } from '../types';
 import {
+  UserOperationController,
   UserOperationControllerMessenger,
-  UserOperationControllerInitMessenger,
-} from '../messengers';
+} from '@metamask/user-operation-controller';
+import { MessengerClientInitFunction } from '../types';
+import { UserOperationControllerInitMessenger } from '../messengers';
 
 /**
  * Initialize the user operation controller.

app/scripts/messenger-client-init/currency-rate-controller-init.test.ts

@@ -1,13 +1,13 @@
 import {
   CodefiTokenPricesServiceV2,
   CurrencyRateController,
+  CurrencyRateMessenger,
 } from '@metamask/assets-controllers';
 import { getRootMessenger } from '../lib/messenger';
 import { MessengerClientInitRequest } from './types';
 import { buildControllerInitRequestMock } from './test/utils';
 import {
   getCurrencyRateControllerMessenger,
-  CurrencyRateControllerMessenger,
   getCurrencyRateControllerInitMessenger,
   CurrencyRateControllerInitMessenger,
 } from './messengers';
@@ -31,7 +31,7 @@ jest.mock('@metamask/assets-controllers', () => ({
 
 function getInitRequestMock(): jest.Mocked<
   MessengerClientInitRequest<
-    CurrencyRateControllerMessenger,
+    CurrencyRateMessenger,
     CurrencyRateControllerInitMessenger
   >
 > {