Fix subpath imports, which are no longer supported unless specified i…

…n the upstream package's package.json exports field

packages/assets-controllers/src/AccountTrackerController.test.ts

@@ -1,24 +1,24 @@
 import { ControllerMessenger } from '@metamask/base-controller';
-import type {
-  ExtractAvailableAction,
-  ExtractAvailableEvent,
-} from '@metamask/base-controller/tests/helpers';
 import { query, toChecksumHexAddress } from '@metamask/controller-utils';
 import type { InternalAccount } from '@metamask/keyring-api';
 import {
   type NetworkClientId,
   type NetworkClientConfiguration,
   defaultState as defaultnetworkControllerState,
 } from '@metamask/network-controller';
-import {
-  buildCustomNetworkClientConfiguration,
-  buildMockGetNetworkClientById,
-} from '@metamask/network-controller/tests/helpers';
 import { getDefaultPreferencesState } from '@metamask/preferences-controller';
 import * as sinon from 'sinon';
 
 import { advanceTime } from '../../../tests/helpers';
 import { createMockInternalAccount } from '../../accounts-controller/src/tests/mocks';
+import type {
+  ExtractAvailableAction,
+  ExtractAvailableEvent,
+} from '../../base-controller/tests/helpers';
+import {
+  buildCustomNetworkClientConfiguration,
+  buildMockGetNetworkClientById,
+} from '../../network-controller/tests/helpers';
 import type {
   AccountTrackerControllerMessenger,
   AllowedActions,

packages/assets-controllers/src/TokenRatesController.test.ts

@@ -1,4 +1,3 @@
-import { createMockInternalAccount } from '@metamask/accounts-controller/src/tests/mocks';
 import type { AddApprovalRequest } from '@metamask/approval-controller';
 import { ControllerMessenger } from '@metamask/base-controller';
 import {
@@ -10,18 +9,19 @@ import {
 } from '@metamask/controller-utils';
 import type { InternalAccount } from '@metamask/keyring-api';
 import type {
+  NetworkClientConfiguration,
   NetworkClientId,
   NetworkState,
 } from '@metamask/network-controller';
 import { defaultState as defaultNetworkState } from '@metamask/network-controller';
-import type { NetworkClientConfiguration } from '@metamask/network-controller/src/types';
 import type { Hex } from '@metamask/utils';
 import { add0x } from '@metamask/utils';
 import assert from 'assert';
 import nock from 'nock';
 import { useFakeTimers } from 'sinon';
 
 import { advanceTime } from '../../../tests/helpers';
+import { createMockInternalAccount } from '../../accounts-controller/src/tests/mocks';
 import {
   buildCustomNetworkClientConfiguration,
   buildMockGetNetworkClientById,