fix: refacto

Author: salimtb

packages/network-enablement-controller/src/NetworkEnablementController.test.ts

@@ -16,10 +16,7 @@ import type { CaipChainId, CaipNamespace, Hex } from '@metamask/utils';
 import { useFakeTimers } from 'sinon';
 
 import { POPULAR_NETWORKS } from './constants';
-import {
-  NetworkEnablementController,
-  initNativeAssetIdentifiers,
-} from './NetworkEnablementController';
+import { NetworkEnablementController } from './NetworkEnablementController';
 import type {
   NetworkEnablementControllerMessenger,
   NativeAssetIdentifiersMap,
@@ -130,47 +127,6 @@ const setupController = ({
   };
 };
 
-describe('initNativeAssetIdentifiers', () => {
-  it('builds native asset identifiers from network configurations', () => {
-    const networks = [
-      { chainId: 'eip155:1' as const, nativeCurrency: 'ETH' },
-      { chainId: 'eip155:56' as const, nativeCurrency: 'BNB' },
-      {
-        chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as const,
-        nativeCurrency: 'SOL',
-      },
-    ];
-
-    const result = initNativeAssetIdentifiers(networks);
-
-    expect(result).toStrictEqual({
-      'eip155:1': 'eip155:1/slip44:60',
-      'eip155:56': 'eip155:56/slip44:714',
-      'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp':
-        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
-    });
-  });
-
-  it('skips networks with unknown symbols', () => {
-    const networks = [
-      { chainId: 'eip155:1' as const, nativeCurrency: 'ETH' },
-      { chainId: 'eip155:999' as const, nativeCurrency: 'UNKNOWN_XYZ' },
-    ];
-
-    const result = initNativeAssetIdentifiers(networks);
-
-    expect(result).toStrictEqual({
-      'eip155:1': 'eip155:1/slip44:60',
-    });
-    expect(result['eip155:999']).toBeUndefined();
-  });
-
-  it('returns empty map for empty input', () => {
-    const result = initNativeAssetIdentifiers([]);
-    expect(result).toStrictEqual({});
-  });
-});
-
 describe('NetworkEnablementController', () => {
   let clock: sinon.SinonFakeTimers;
 
@@ -1054,6 +1010,56 @@ describe('NetworkEnablementController', () => {
     });
   });
 
+  describe('initNativeAssetIdentifiers', () => {
+    it('populates nativeAssetIdentifiers from network configurations', () => {
+      const { controller } = setupController();
+
+      const networks = [
+        { chainId: 'eip155:1' as const, nativeCurrency: 'ETH' },
+        { chainId: 'eip155:56' as const, nativeCurrency: 'BNB' },
+        {
+          chainId: 'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp' as const,
+          nativeCurrency: 'SOL',
+        },
+      ];
+
+      controller.initNativeAssetIdentifiers(networks);
+
+      expect(controller.state.nativeAssetIdentifiers).toStrictEqual({
+        'eip155:1': 'eip155:1/slip44:60',
+        'eip155:56': 'eip155:56/slip44:714',
+        'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp':
+          'solana:5eykt4UsFv8P8NJdTREpY1vzqKqZKvdp/slip44:501',
+      });
+    });
+
+    it('skips networks with unknown symbols', () => {
+      const { controller } = setupController();
+
+      const networks = [
+        { chainId: 'eip155:1' as const, nativeCurrency: 'ETH' },
+        { chainId: 'eip155:999' as const, nativeCurrency: 'UNKNOWN_XYZ' },
+      ];
+
+      controller.initNativeAssetIdentifiers(networks);
+
+      expect(controller.state.nativeAssetIdentifiers['eip155:1']).toBe(
+        'eip155:1/slip44:60',
+      );
+      expect(
+        controller.state.nativeAssetIdentifiers['eip155:999'],
+      ).toBeUndefined();
+    });
+
+    it('does not modify state for empty input', () => {
+      const { controller } = setupController();
+
+      controller.initNativeAssetIdentifiers([]);
+
+      expect(controller.state.nativeAssetIdentifiers).toStrictEqual({});
+    });
+  });
+
   describe('enableAllPopularNetworks', () => {
     it('enables all popular networks that exist in controller configurations and Solana mainnet', () => {
       const { controller, messenger } = setupController();

packages/network-enablement-controller/src/NetworkEnablementController.ts

@@ -147,45 +147,6 @@ export type NetworkConfig = {
   nativeCurrency: string;
 };
 
-/**
- * Initializes the native asset identifiers map from network configurations.
- * This function should be called from the client during controller initialization
- * to populate the nativeAssetIdentifiers state based on actual network configurations.
- *
- * @param networks - Array of network configurations with chainId and nativeCurrency
- * @returns A map of CAIP-2 chain IDs to their native asset identifiers
- * @example
- * ```typescript
- * const evmNetworks = Object.values(networkControllerState.networkConfigurationsByChainId)
- *   .map(config => ({
- *     chainId: toEvmCaipChainId(config.chainId),
- *     nativeCurrency: config.nativeCurrency,
- *   }));
- *
- * const multichainNetworks = Object.values(multichainState.multichainNetworkConfigurationsByChainId)
- *   .map(config => ({
- *     chainId: config.chainId,
- *     nativeCurrency: config.nativeCurrency,
- *   }));
- *
- * const nativeAssetIdentifiers = initNativeAssetIdentifiers([...evmNetworks, ...multichainNetworks]);
- * ```
- */
-export function initNativeAssetIdentifiers(
-  networks: NetworkConfig[],
-): NativeAssetIdentifiersMap {
-  const result: NativeAssetIdentifiersMap = {};
-
-  for (const { chainId, nativeCurrency } of networks) {
-    const slip44CoinType = Slip44Service.getSlip44BySymbol(nativeCurrency);
-    if (slip44CoinType !== undefined) {
-      result[chainId] = buildNativeAssetIdentifier(chainId, slip44CoinType);
-    }
-  }
-
-  return result;
-}
-
 /**
  * Gets the default state for the NetworkEnablementController.
  *
@@ -555,6 +516,43 @@ export class NetworkEnablementController extends BaseController<
     });
   }
 
+  /**
+   * Initializes the native asset identifiers from network configurations.
+   * This method should be called from the client during controller initialization
+   * to populate the nativeAssetIdentifiers state based on actual network configurations.
+   *
+   * @param networks - Array of network configurations with chainId and nativeCurrency
+   * @example
+   * ```typescript
+   * const evmNetworks = Object.values(networkControllerState.networkConfigurationsByChainId)
+   *   .map(config => ({
+   *     chainId: toEvmCaipChainId(config.chainId),
+   *     nativeCurrency: config.nativeCurrency,
+   *   }));
+   *
+   * const multichainNetworks = Object.values(multichainState.multichainNetworkConfigurationsByChainId)
+   *   .map(config => ({
+   *     chainId: config.chainId,
+   *     nativeCurrency: config.nativeCurrency,
+   *   }));
+   *
+   * controller.initNativeAssetIdentifiers([...evmNetworks, ...multichainNetworks]);
+   * ```
+   */
+  initNativeAssetIdentifiers(networks: NetworkConfig[]): void {
+    this.update((state) => {
+      for (const { chainId, nativeCurrency } of networks) {
+        const slip44CoinType = Slip44Service.getSlip44BySymbol(nativeCurrency);
+        if (slip44CoinType !== undefined) {
+          state.nativeAssetIdentifiers[chainId] = buildNativeAssetIdentifier(
+            chainId,
+            slip44CoinType,
+          );
+        }
+      }
+    });
+  }
+
   /**
    * Disables a network for the user.
    *

packages/network-enablement-controller/src/index.ts

@@ -1,7 +1,4 @@
-export {
-  NetworkEnablementController,
-  initNativeAssetIdentifiers,
-} from './NetworkEnablementController';
+export { NetworkEnablementController } from './NetworkEnablementController';
 
 export type {
   NetworkEnablementControllerState,