fix: fix after rebase

Author: salimtb

app/scripts/controller-init/controller-list.ts

@@ -13,6 +13,7 @@ import { TransactionUpdateController } from '@metamask-institutional/transaction
 import { AccountsController } from '@metamask/accounts-controller';
 import {
   MultichainAssetsController,
+  MultiChainAssetsRatesController,
   MultichainBalancesController,
 } from '@metamask/assets-controllers';
 import { MultichainTransactionsController } from '@metamask/multichain-transactions-controller';
@@ -44,6 +45,7 @@ export type Controller =
   | MultichainAssetsController
   | MultichainBalancesController
   | MultichainTransactionsController
+  | MultiChainAssetsRatesController
   | NetworkController
   | OnboardingController
   | PermissionController<

app/scripts/controller-init/messengers/index.ts

@@ -37,6 +37,9 @@ export const CONTROLLER_MESSENGERS = {
   MultichainBalancesController: {
     getMessenger: getMultichainBalancesControllerMessenger,
   },
+  MultichainAssetsRatesController: {
+    getMessenger: getMultichainAssetsRatesControllerMessenger,
+  },
   MultichainTransactionsController: {
     getMessenger: getMultichainTransactionsControllerMessenger,
   },
@@ -65,7 +68,4 @@ export const CONTROLLER_MESSENGERS = {
     getMessenger: getTransactionControllerMessenger,
     getInitMessenger: getTransactionControllerInitMessenger,
   },
-  MultichainAssetsRatesController: {
-    getMessenger: getMultichainAssetsRatesControllerMessenger,
-  },
 } as const;

app/scripts/controller-init/messengers/multichain/index.ts

@@ -1,6 +1,7 @@
 export { getMultichainAssetsControllerMessenger } from './multichain-assets-controller-messenger';
 export { getMultichainBalancesControllerMessenger } from './multichain-balances-controller-messenger';
 export { getMultichainTransactionsControllerMessenger } from './multichain-transactions-controller-messenger';
+export { getMultichainAssetsRatesControllerMessenger } from './multichain-assets-rates-controller-messenger';
 
 export type { MultichainAssetsControllerMessenger } from './multichain-assets-controller-messenger';
 export type { MultichainBalancesControllerMessenger } from './multichain-balances-controller-messenger';

app/scripts/controller-init/multichain/index.ts

@@ -1,4 +1,4 @@
 export { MultichainAssetsControllerInit } from './multichain-assets-controller-init';
 export { MultichainBalancesControllerInit } from './multichain-balances-controller-init';
 export { MultichainTransactionsControllerInit } from './multichain-transactions-controller-init';
-export { MultichainAssetsRatesControllerInit } from './multichain-assets-rates-controller-init';
+export { MultiChainAssetsRatesControllerInit } from './multichain-rates-assets-controller-init';

app/scripts/controller-init/multichain/multichain-rates-assets-controller-init.test.ts

@@ -0,0 +1,51 @@
+import { MultiChainAssetsRatesController } from '@metamask/assets-controllers';
+import { Messenger } from '@metamask/base-controller';
+import { buildControllerInitRequestMock } from '../test/utils';
+import { ControllerInitRequest } from '../types';
+import {
+  getMultichainAssetsRatesControllerMessenger,
+  MultichainAssetsRatesControllerMessenger,
+} from '../messengers/multichain';
+import { MultiChainAssetsRatesControllerInit } from './multichain-rates-assets-controller-init';
+
+jest.mock('@metamask/assets-controllers');
+
+function buildInitRequestMock(): jest.Mocked<
+  ControllerInitRequest<MultichainAssetsRatesControllerMessenger>
+> {
+  const baseControllerMessenger = new Messenger();
+
+  return {
+    ...buildControllerInitRequestMock(),
+    controllerMessenger: getMultichainAssetsRatesControllerMessenger(
+      baseControllerMessenger,
+    ),
+  };
+}
+
+describe('MultiChainAssetsRatesControllerInit', () => {
+  const multiChainAssetsRatesControllerClassMock = jest.mocked(
+    MultiChainAssetsRatesController,
+  );
+
+  beforeEach(() => {
+    jest.resetAllMocks();
+  });
+
+  it('returns controller instance', () => {
+    const requestMock = buildInitRequestMock();
+    expect(
+      MultiChainAssetsRatesControllerInit(requestMock).controller,
+    ).toBeInstanceOf(MultiChainAssetsRatesController);
+  });
+
+  it('initializes with correct messenger and state', () => {
+    const requestMock = buildInitRequestMock();
+    MultiChainAssetsRatesControllerInit(requestMock);
+
+    expect(multiChainAssetsRatesControllerClassMock).toHaveBeenCalledWith({
+      messenger: requestMock.controllerMessenger,
+      state: requestMock.persistedState.MultiChainAssetsRatesController,
+    });
+  });
+});

app/scripts/controller-init/multichain/multichain-rates-assets-controller-init.ts

@@ -1,4 +1,4 @@
-import { MultichainAssetsRatesController } from '@metamask/assets-controllers';
+import { MultiChainAssetsRatesController } from '@metamask/assets-controllers';
 import { ControllerInitFunction } from '../types';
 import { MultichainAssetsRatesControllerMessenger } from '../messengers/multichain';
 
@@ -10,14 +10,13 @@ import { MultichainAssetsRatesControllerMessenger } from '../messengers/multicha
  * @param request.persistedState - The persisted state of the extension.
  * @returns The initialized controller.
  */
-export const MultichainAssetsRatesControllerInit: ControllerInitFunction<
-  MultichainAssetsRatesController,
+export const MultiChainAssetsRatesControllerInit: ControllerInitFunction<
+  MultiChainAssetsRatesController,
   MultichainAssetsRatesControllerMessenger
 > = ({ controllerMessenger, persistedState }) => {
-  const controller = new MultichainAssetsRatesController({
-    // @ts-expect-error TODO: Resolve mismatch between base-controller versions.
+  const controller = new MultiChainAssetsRatesController({
     messenger: controllerMessenger,
-    state: persistedState.MultichainAssetsRatesController,
+    state: persistedState.MultiChainAssetsRatesController,
   });
 
   return {

app/scripts/metamask-controller.js

@@ -363,6 +363,7 @@ import {
   MultichainAssetsControllerInit,
   MultichainTransactionsControllerInit,
   MultichainBalancesControllerInit,
+  MultiChainAssetsRatesControllerInit,
 } from './controller-init/multichain';
 ///: END:ONLY_INCLUDE_IF
 import { TransactionControllerInit } from './controller-init/confirmations/transaction-controller-init';
@@ -2056,6 +2057,7 @@ export default class MetamaskController extends EventEmitter {
       MultichainAssetsController: MultichainAssetsControllerInit,
       MultichainBalancesController: MultichainBalancesControllerInit,
       MultichainTransactionsController: MultichainTransactionsControllerInit,
+      MultiChainAssetsRatesController: MultiChainAssetsRatesControllerInit,
       ///: END:ONLY_INCLUDE_IF
     };