From e0486f32ddec498dc0354f4429878537f50532bb Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Mon, 10 Nov 2025 17:31:09 -0330
Subject: [PATCH 1/2] chore: Remove unused ESLint ignore directives

---
 .../src/backup-and-sync/syncing/group.test.ts  | 12 ------------
 .../src/backup-and-sync/syncing/wallet.test.ts |  4 ----
 .../user-storage/validation.test.ts            |  1 -
 .../src/NftController.test.ts                  |  2 --
 .../TokenSearchDiscoveryDataController.test.ts |  4 ----
 .../src/bridge-controller.test.ts              |  1 -
 .../src/utils/balance.test.ts                  |  1 -
 .../src/bridge-status-controller.test.ts       |  1 -
 .../src/scope/filter.test.ts                   |  5 -----
 .../src/create-service-policy.test.ts          |  1 -
 .../earn-controller/src/EarnController.test.ts |  1 -
 .../eth-json-rpc-middleware/src/fetch.test.ts  |  2 --
 .../src/inflight-cache.test.ts                 |  1 -
 .../src/internal-provider.test.ts              |  2 --
 .../json-rpc-engine/src/JsonRpcEngine.test.ts  |  2 --
 .../src/v2/JsonRpcEngineV2.test.ts             |  3 ---
 .../src/rpc-service/rpc-service-chain.test.ts  |  2 --
 .../src/rpc-service/rpc-service.test.ts        |  1 -
 .../tests/NetworkController.test.ts            |  1 -
 .../network-client/block-hash-in-response.ts   |  2 --
 .../tests/network-client/block-param.ts        |  2 --
 .../tests/network-client/no-block-param.ts     |  2 --
 .../tests/network-client/rpc-failover.ts       |  7 -------
 .../src/NetworkEnablementController.test.ts    | 18 ------------------
 .../AuthenticationController.test.ts           |  4 ----
 .../src/sdk/user-storage.test.ts               |  4 ----
 .../src/sample-gas-prices-controller.test.ts   |  5 -----
 .../src/polling-with-policy.test.ts            |  4 ----
 28 files changed, 95 deletions(-)

diff --git a/packages/account-tree-controller/src/backup-and-sync/syncing/group.test.ts b/packages/account-tree-controller/src/backup-and-sync/syncing/group.test.ts
index 8fa00f12b04..4579aeda6d8 100644
--- a/packages/account-tree-controller/src/backup-and-sync/syncing/group.test.ts
+++ b/packages/account-tree-controller/src/backup-and-sync/syncing/group.test.ts
@@ -239,7 +239,6 @@ describe('BackupAndSync - Syncing - Group', () => {
         async (
           options: Parameters<typeof metadataExports.compareAndSyncMetadata>[0],
         ) => {
-          /* eslint-disable jest/no-conditional-in-test */
           if (
             options.userStorageMetadata &&
             'value' in options.userStorageMetadata &&
@@ -249,7 +248,6 @@ describe('BackupAndSync - Syncing - Group', () => {
             applyNameUpdate = options.applyLocalUpdate;
           }
           return false;
-          /* eslint-enable jest/no-conditional-in-test */
         },
       );
 
@@ -265,7 +263,6 @@ describe('BackupAndSync - Syncing - Group', () => {
 
       expect(validateNameFunction).toBeDefined();
       expect(applyNameUpdate).toBeDefined();
-      /* eslint-disable jest/no-conditional-in-test */
       /* eslint-disable jest/no-conditional-expect */
       if (validateNameFunction) {
         expect(validateNameFunction('New Name')).toBe(true);
@@ -281,7 +278,6 @@ describe('BackupAndSync - Syncing - Group', () => {
           true,
         );
       }
-      /* eslint-enable jest/no-conditional-in-test */
       /* eslint-enable jest/no-conditional-expect */
     });
 
@@ -305,7 +301,6 @@ describe('BackupAndSync - Syncing - Group', () => {
         async (
           options: Parameters<typeof metadataExports.compareAndSyncMetadata>[0],
         ) => {
-          /* eslint-disable jest/no-conditional-in-test */
           if (
             options.userStorageMetadata &&
             'value' in options.userStorageMetadata &&
@@ -315,7 +310,6 @@ describe('BackupAndSync - Syncing - Group', () => {
             applyPinnedUpdate = options.applyLocalUpdate;
           }
           return false;
-          /* eslint-enable jest/no-conditional-in-test */
         },
       );
 
@@ -331,7 +325,6 @@ describe('BackupAndSync - Syncing - Group', () => {
 
       expect(validatePinnedFunction).toBeDefined();
       expect(applyPinnedUpdate).toBeDefined();
-      /* eslint-disable jest/no-conditional-in-test */
       /* eslint-disable jest/no-conditional-expect */
       if (validatePinnedFunction) {
         expect(validatePinnedFunction(true)).toBe(true);
@@ -346,7 +339,6 @@ describe('BackupAndSync - Syncing - Group', () => {
           mockContext.controller.setAccountGroupPinned,
         ).toHaveBeenCalledWith(mockLocalGroup.id, true);
       }
-      /* eslint-enable jest/no-conditional-in-test */
       /* eslint-enable jest/no-conditional-expect */
     });
 
@@ -370,7 +362,6 @@ describe('BackupAndSync - Syncing - Group', () => {
         async (
           options: Parameters<typeof metadataExports.compareAndSyncMetadata>[0],
         ) => {
-          /* eslint-disable jest/no-conditional-in-test */
           if (
             options.userStorageMetadata &&
             'value' in options.userStorageMetadata &&
@@ -380,7 +371,6 @@ describe('BackupAndSync - Syncing - Group', () => {
             applyHiddenUpdate = options.applyLocalUpdate;
           }
           return false;
-          /* eslint-enable jest/no-conditional-in-test */
         },
       );
 
@@ -396,7 +386,6 @@ describe('BackupAndSync - Syncing - Group', () => {
 
       expect(validateHiddenFunction).toBeDefined();
       expect(applyHiddenUpdate).toBeDefined();
-      /* eslint-disable jest/no-conditional-in-test */
       /* eslint-disable jest/no-conditional-expect */
       if (validateHiddenFunction) {
         expect(validateHiddenFunction(true)).toBe(true);
@@ -411,7 +400,6 @@ describe('BackupAndSync - Syncing - Group', () => {
           mockContext.controller.setAccountGroupHidden,
         ).toHaveBeenCalledWith(mockLocalGroup.id, false);
       }
-      /* eslint-enable jest/no-conditional-in-test */
       /* eslint-enable jest/no-conditional-expect */
     });
   });
diff --git a/packages/account-tree-controller/src/backup-and-sync/syncing/wallet.test.ts b/packages/account-tree-controller/src/backup-and-sync/syncing/wallet.test.ts
index 6f6a912d495..e1074c07b7f 100644
--- a/packages/account-tree-controller/src/backup-and-sync/syncing/wallet.test.ts
+++ b/packages/account-tree-controller/src/backup-and-sync/syncing/wallet.test.ts
@@ -131,7 +131,6 @@ describe('BackupAndSync - Syncing - Wallet', () => {
       );
 
       expect(applyLocalUpdate).toBeDefined();
-      /* eslint-disable jest/no-conditional-in-test */
       /* eslint-disable jest/no-conditional-expect */
       if (applyLocalUpdate) {
         await applyLocalUpdate('New Name');
@@ -139,7 +138,6 @@ describe('BackupAndSync - Syncing - Wallet', () => {
           mockContext.controller.setAccountWalletName,
         ).toHaveBeenCalledWith(mockLocalWallet.id, 'New Name');
       }
-      /* eslint-enable jest/no-conditional-in-test */
       /* eslint-enable jest/no-conditional-expect */
     });
 
@@ -169,7 +167,6 @@ describe('BackupAndSync - Syncing - Wallet', () => {
       );
 
       expect(validateUserStorageValue).toBeDefined();
-      /* eslint-disable jest/no-conditional-in-test */
       /* eslint-disable jest/no-conditional-expect */
       if (validateUserStorageValue) {
         expect(validateUserStorageValue('valid string')).toBe(true);
@@ -177,7 +174,6 @@ describe('BackupAndSync - Syncing - Wallet', () => {
         expect(validateUserStorageValue(null)).toBe(false);
         expect(validateUserStorageValue(undefined)).toBe(false);
       }
-      /* eslint-enable jest/no-conditional-in-test */
       /* eslint-enable jest/no-conditional-expect */
     });
   });
diff --git a/packages/account-tree-controller/src/backup-and-sync/user-storage/validation.test.ts b/packages/account-tree-controller/src/backup-and-sync/user-storage/validation.test.ts
index 5fb6387f92b..c404ab3731d 100644
--- a/packages/account-tree-controller/src/backup-and-sync/user-storage/validation.test.ts
+++ b/packages/account-tree-controller/src/backup-and-sync/user-storage/validation.test.ts
@@ -203,7 +203,6 @@ describe('BackupAndSync - UserStorage - Validation', () => {
       try {
         assertValidLegacyUserStorageAccount(multipleFailuresData);
       } catch (error) {
-        // eslint-disable-next-line jest/no-conditional-in-test
         errorMessage = error instanceof Error ? error.message : String(error);
       }
 
diff --git a/packages/assets-controllers/src/NftController.test.ts b/packages/assets-controllers/src/NftController.test.ts
index 09b37101869..78b78a41f4e 100644
--- a/packages/assets-controllers/src/NftController.test.ts
+++ b/packages/assets-controllers/src/NftController.test.ts
@@ -3348,7 +3348,6 @@ describe('NftController', () => {
 
       const { nftController } = setupController({
         getERC721TokenURI: jest.fn().mockImplementation((tokenAddress) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           switch (tokenAddress) {
             case '0x01':
               return 'https://testtokenuri-1.com';
@@ -3359,7 +3358,6 @@ describe('NftController', () => {
           }
         }),
         getERC1155TokenURI: jest.fn().mockImplementation((tokenAddress) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           switch (tokenAddress) {
             case '0x03':
               return 'https://testtokenuri-3.com';
diff --git a/packages/assets-controllers/src/TokenSearchDiscoveryDataController/TokenSearchDiscoveryDataController.test.ts b/packages/assets-controllers/src/TokenSearchDiscoveryDataController/TokenSearchDiscoveryDataController.test.ts
index 9861cfd7ec3..3a0e8d5bbd0 100644
--- a/packages/assets-controllers/src/TokenSearchDiscoveryDataController/TokenSearchDiscoveryDataController.test.ts
+++ b/packages/assets-controllers/src/TokenSearchDiscoveryDataController/TokenSearchDiscoveryDataController.test.ts
@@ -671,7 +671,6 @@ describe('TokenSearchDiscoveryDataController', () => {
           return {
             [tokenAddress as Hex]: {
               ...basePrice,
-              // eslint-disable-next-line jest/no-conditional-in-test
               price: currency === 'USD' ? 10.5 : 9.5,
               currency,
             },
@@ -740,7 +739,6 @@ describe('TokenSearchDiscoveryDataController', () => {
       const mockFetchTokenPrices = jest
         .fn()
         .mockImplementation(({ currency }: { currency: string }) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (currency === 'USD') {
             return Promise.resolve({ [tokenAddress as Hex]: mockTokenPrice });
           }
@@ -783,14 +781,12 @@ describe('TokenSearchDiscoveryDataController', () => {
 
       (fetchTokenMetadata as jest.Mock).mockImplementation(
         (_chainId, address) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (address === tokenAddress1) {
             return Promise.resolve({
               decimals: 18,
               symbol: 'DAI',
               name: 'Dai Stablecoin',
             });
-            // eslint-disable-next-line jest/no-conditional-in-test
           } else if (address === tokenAddress2) {
             return Promise.resolve({
               decimals: 6,
diff --git a/packages/bridge-controller/src/bridge-controller.test.ts b/packages/bridge-controller/src/bridge-controller.test.ts
index 6eaaf2e5b91..03ce729f772 100644
--- a/packages/bridge-controller/src/bridge-controller.test.ts
+++ b/packages/bridge-controller/src/bridge-controller.test.ts
@@ -1,5 +1,4 @@
 /* eslint-disable jest/no-restricted-matchers */
-/* eslint-disable jest/no-conditional-in-test */
 import { Contract } from '@ethersproject/contracts';
 import { deriveStateFromMetadata } from '@metamask/base-controller';
 import {
diff --git a/packages/bridge-controller/src/utils/balance.test.ts b/packages/bridge-controller/src/utils/balance.test.ts
index ede03d0b49b..dbbd5f08723 100644
--- a/packages/bridge-controller/src/utils/balance.test.ts
+++ b/packages/bridge-controller/src/utils/balance.test.ts
@@ -10,7 +10,6 @@ import { fetchTokenBalance } from './balance';
 import { FakeProvider } from '../../../../tests/fake-provider';
 
 declare global {
-  // eslint-disable-next-line no-var
   var ethereumProvider: Provider;
 }
 
diff --git a/packages/bridge-status-controller/src/bridge-status-controller.test.ts b/packages/bridge-status-controller/src/bridge-status-controller.test.ts
index ca4f3a90f6e..640027d8c45 100644
--- a/packages/bridge-status-controller/src/bridge-status-controller.test.ts
+++ b/packages/bridge-status-controller/src/bridge-status-controller.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable jest/no-conditional-in-test */
 /* eslint-disable jest/no-restricted-matchers */
 import { deriveStateFromMetadata } from '@metamask/base-controller';
 import type {
diff --git a/packages/chain-agnostic-permission/src/scope/filter.test.ts b/packages/chain-agnostic-permission/src/scope/filter.test.ts
index c8ded6f5d19..1adb6d2d5dd 100644
--- a/packages/chain-agnostic-permission/src/scope/filter.test.ts
+++ b/packages/chain-agnostic-permission/src/scope/filter.test.ts
@@ -73,7 +73,6 @@ describe('filter', () => {
     it('returns supported and unsupported scopes', () => {
       MockAssert.assertScopeSupported.mockImplementation((scopeString) => {
         // This is okay; we are inside of a mock.
-        // eslint-disable-next-line jest/no-conditional-in-test
         if (scopeString === 'eip155:1') {
           throw new Error('scope not supported');
         }
@@ -175,12 +174,10 @@ describe('filter', () => {
       MockSupported.isSupportedMethod.mockImplementation(
         (scopeString, method) => {
           // This is okay; we are inside of a mock.
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (scopeString === 'eip155:1' && method === 'method1') {
             return false;
           }
           // This is okay; we are inside of a mock.
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (scopeString === 'eip155:5' && method === 'methodB') {
             return false;
           }
@@ -262,12 +259,10 @@ describe('filter', () => {
       MockSupported.isSupportedNotification.mockImplementation(
         (scopeString, notification) => {
           // This is okay; we are inside of a mock.
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (scopeString === 'eip155:1' && notification === 'notification1') {
             return false;
           }
           // This is okay; we are inside of a mock.
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (scopeString === 'eip155:5' && notification === 'notificationB') {
             return false;
           }
diff --git a/packages/controller-utils/src/create-service-policy.test.ts b/packages/controller-utils/src/create-service-policy.test.ts
index 0b5894dad8c..6f5e7f024a4 100644
--- a/packages/controller-utils/src/create-service-policy.test.ts
+++ b/packages/controller-utils/src/create-service-policy.test.ts
@@ -1,5 +1,4 @@
 // We use conditions exclusively in this file.
-/* eslint-disable jest/no-conditional-in-test */
 
 import { handleWhen } from 'cockatiel';
 import { useFakeTimers } from 'sinon';
diff --git a/packages/earn-controller/src/EarnController.test.ts b/packages/earn-controller/src/EarnController.test.ts
index 1f05259ab80..d8d46ced428 100644
--- a/packages/earn-controller/src/EarnController.test.ts
+++ b/packages/earn-controller/src/EarnController.test.ts
@@ -1,4 +1,3 @@
-/* eslint-disable jest/no-conditional-in-test */
 import { deriveStateFromMetadata } from '@metamask/base-controller';
 import { toHex } from '@metamask/controller-utils';
 import type { InternalAccount } from '@metamask/keyring-internal-api';
diff --git a/packages/eth-json-rpc-middleware/src/fetch.test.ts b/packages/eth-json-rpc-middleware/src/fetch.test.ts
index 917abbd560d..290e66e7261 100644
--- a/packages/eth-json-rpc-middleware/src/fetch.test.ts
+++ b/packages/eth-json-rpc-middleware/src/fetch.test.ts
@@ -33,11 +33,9 @@ describe('createFetchMiddleware', () => {
       });
 
       const context = new MiddlewareContext<{ origin: string }>(
-        // eslint-disable-next-line jest/no-conditional-in-test
         origin ? { origin } : [],
       );
       const expectedHeaders =
-        // eslint-disable-next-line jest/no-conditional-in-test
         originHttpHeaderKey && origin ? { [originHttpHeaderKey]: origin } : {};
 
       await engine.handle(
diff --git a/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts b/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
index 4f797961f0e..a211ce1b082 100644
--- a/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
+++ b/packages/eth-json-rpc-middleware/src/inflight-cache.test.ts
@@ -11,7 +11,6 @@ describe('inflight cache', () => {
         createInflightCacheMiddleware(),
         async () => {
           hitCount += 1;
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (hitCount === 1) {
             await new Promise((resolve) => setTimeout(resolve, 100));
           }
diff --git a/packages/eth-json-rpc-provider/src/internal-provider.test.ts b/packages/eth-json-rpc-provider/src/internal-provider.test.ts
index 322958d9dc3..4a9ea84ea0b 100644
--- a/packages/eth-json-rpc-provider/src/internal-provider.test.ts
+++ b/packages/eth-json-rpc-provider/src/internal-provider.test.ts
@@ -255,7 +255,6 @@ describe.each([
     it('forwards the context to the JSON-RPC handler', async () => {
       const rpcHandler = createRpcHandler('test', (request, context) => {
         // @ts-expect-error - Intentional type abuse.
-        // eslint-disable-next-line jest/no-conditional-in-test
         return context?.assertGet('foo') ?? request.foo;
       });
       const provider = new InternalProvider({ engine: rpcHandler });
@@ -327,7 +326,6 @@ describe.each([
       // Transform the engine into a server so we can mock the "handle" method.
       // The "handle" method should never throw, but we should be resilient to it anyway.
       rpcHandler =
-        // eslint-disable-next-line jest/no-conditional-in-test
         'push' in rpcHandler
           ? JsonRpcEngineV2.create({ middleware: [asV2Middleware(rpcHandler)] })
           : rpcHandler;
diff --git a/packages/json-rpc-engine/src/JsonRpcEngine.test.ts b/packages/json-rpc-engine/src/JsonRpcEngine.test.ts
index ff0f0cc845a..eef05d2e4ee 100644
--- a/packages/json-rpc-engine/src/JsonRpcEngine.test.ts
+++ b/packages/json-rpc-engine/src/JsonRpcEngine.test.ts
@@ -429,7 +429,6 @@ describe('JsonRpcEngine', () => {
 
     engine.push(function (request, response, _next, end) {
       // Separate handling for the 4th request.
-      // eslint-disable-next-line jest/no-conditional-in-test
       if (request.id === 4) {
         delete response.result;
         response.error = rpcErrors.internal({ message: 'foobar' });
@@ -468,7 +467,6 @@ describe('JsonRpcEngine', () => {
 
     engine.push(function (request, response, _next, end) {
       // Separate handling for the 4th request.
-      // eslint-disable-next-line jest/no-conditional-in-test
       if (request.id === 4) {
         delete response.result;
         response.error = rpcErrors.internal({ message: 'foobar' });
diff --git a/packages/json-rpc-engine/src/v2/JsonRpcEngineV2.test.ts b/packages/json-rpc-engine/src/v2/JsonRpcEngineV2.test.ts
index a3d2eb91094..1106f745827 100644
--- a/packages/json-rpc-engine/src/v2/JsonRpcEngineV2.test.ts
+++ b/packages/json-rpc-engine/src/v2/JsonRpcEngineV2.test.ts
@@ -765,7 +765,6 @@ describe('JsonRpcEngineV2', () => {
           Json,
           Context
         > = async ({ context, next, request }) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           context.set('id', context.get('id') ?? request.id);
 
           inFlight += 1;
@@ -1221,7 +1220,6 @@ describe('JsonRpcEngineV2', () => {
 
       it('constructs a mixed engine', async () => {
         const mixedMiddleware: JsonRpcMiddleware = ({ request }) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           return isRequest(request) ? null : undefined;
         };
         const engine = JsonRpcEngineV2.create({
@@ -1245,7 +1243,6 @@ describe('JsonRpcEngineV2', () => {
         const orchestratorEngine = JsonRpcEngineV2.create({
           middleware: [
             ({ request, context }) =>
-              // eslint-disable-next-line jest/no-conditional-in-test
               isRequest(request)
                 ? requestEngine.handle(request, { context })
                 : notificationEngine.handle(request as JsonRpcNotification, {
diff --git a/packages/network-controller/src/rpc-service/rpc-service-chain.test.ts b/packages/network-controller/src/rpc-service/rpc-service-chain.test.ts
index dfa509376da..fb94fc2a30c 100644
--- a/packages/network-controller/src/rpc-service/rpc-service-chain.test.ts
+++ b/packages/network-controller/src/rpc-service/rpc-service-chain.test.ts
@@ -452,7 +452,6 @@ describe('RpcServiceChain', () => {
           (memo, call) => {
             const { endpointUrl } = call[0];
             // There is nothing wrong with this.
-            // eslint-disable-next-line jest/no-conditional-in-test
             memo[endpointUrl] = (memo[endpointUrl] ?? 0) + 1;
             return memo;
           },
@@ -682,7 +681,6 @@ describe('RpcServiceChain', () => {
           (memo: Record<string, number>, call) => {
             const { endpointUrl } = call[0];
             // There is nothing wrong with this.
-            // eslint-disable-next-line jest/no-conditional-in-test
             memo[endpointUrl] = (memo[endpointUrl] ?? 0) + 1;
             return memo;
           },
diff --git a/packages/network-controller/src/rpc-service/rpc-service.test.ts b/packages/network-controller/src/rpc-service/rpc-service.test.ts
index 83e2aeaacec..d20f4f937f1 100644
--- a/packages/network-controller/src/rpc-service/rpc-service.test.ts
+++ b/packages/network-controller/src/rpc-service/rpc-service.test.ts
@@ -1,5 +1,4 @@
 // We use conditions exclusively in this file.
-/* eslint-disable jest/no-conditional-in-test */
 
 import { HttpError } from '@metamask/controller-utils';
 import { errorCodes } from '@metamask/rpc-errors';
diff --git a/packages/network-controller/tests/NetworkController.test.ts b/packages/network-controller/tests/NetworkController.test.ts
index 18cbac232a2..2abee706095 100644
--- a/packages/network-controller/tests/NetworkController.test.ts
+++ b/packages/network-controller/tests/NetworkController.test.ts
@@ -1,5 +1,4 @@
 // A lot of the tests in this file have conditionals.
-/* eslint-disable jest/no-conditional-in-test */
 
 import { deriveStateFromMetadata } from '@metamask/base-controller';
 import {
diff --git a/packages/network-controller/tests/network-client/block-hash-in-response.ts b/packages/network-controller/tests/network-client/block-hash-in-response.ts
index a3f3e379de9..91d9ddc18e6 100644
--- a/packages/network-controller/tests/network-client/block-hash-in-response.ts
+++ b/packages/network-controller/tests/network-client/block-hash-in-response.ts
@@ -88,7 +88,6 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(
             // Start the block tracker
             blockTracker.on('latest', () => {
               numberOfBlocks += 1;
-              // eslint-disable-next-line jest/no-conditional-in-test
               if (numberOfBlocks === 2) {
                 resolve();
               }
@@ -328,7 +327,6 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(
       );
 
       // This is not ideal, but we can refactor this later.
-      // eslint-disable-next-line jest/no-conditional-in-test
       if (providerType === NetworkClientType.Infura) {
         // This is not ideal, but we can refactor this later.
         // eslint-disable-next-line jest/no-conditional-expect
diff --git a/packages/network-controller/tests/network-client/block-param.ts b/packages/network-controller/tests/network-client/block-param.ts
index f71326c6bde..119d8c2bbc5 100644
--- a/packages/network-controller/tests/network-client/block-param.ts
+++ b/packages/network-controller/tests/network-client/block-param.ts
@@ -188,7 +188,6 @@ export function testsForRpcMethodSupportingBlockParam(
               // Start the block tracker
               blockTracker.on('latest', () => {
                 numberOfBlocks += 1;
-                // eslint-disable-next-line jest/no-conditional-in-test
                 if (numberOfBlocks === 2) {
                   resolve();
                 }
@@ -405,7 +404,6 @@ export function testsForRpcMethodSupportingBlockParam(
         );
 
         // This is not ideal, but we can refactor this later.
-        // eslint-disable-next-line jest/no-conditional-in-test
         if (providerType === NetworkClientType.Infura) {
           // This is not ideal, but we can refactor this later.
           // eslint-disable-next-line jest/no-conditional-expect
diff --git a/packages/network-controller/tests/network-client/no-block-param.ts b/packages/network-controller/tests/network-client/no-block-param.ts
index d79f4357f01..901d1148998 100644
--- a/packages/network-controller/tests/network-client/no-block-param.ts
+++ b/packages/network-controller/tests/network-client/no-block-param.ts
@@ -128,7 +128,6 @@ export function testsForRpcMethodAssumingNoBlockParam(
             // Start the block tracker
             blockTracker.on('latest', () => {
               numberOfBlocks += 1;
-              // eslint-disable-next-line jest/no-conditional-in-test
               if (numberOfBlocks === 2) {
                 resolve();
               }
@@ -284,7 +283,6 @@ export function testsForRpcMethodAssumingNoBlockParam(
       );
 
       // This is not ideal, but we can refactor this later.
-      // eslint-disable-next-line jest/no-conditional-in-test
       if (providerType === NetworkClientType.Infura) {
         // This is not ideal, but we can refactor this later.
         // eslint-disable-next-line jest/no-conditional-expect
diff --git a/packages/network-controller/tests/network-client/rpc-failover.ts b/packages/network-controller/tests/network-client/rpc-failover.ts
index 7ddb1120828..3c61466f95e 100644
--- a/packages/network-controller/tests/network-client/rpc-failover.ts
+++ b/packages/network-controller/tests/network-client/rpc-failover.ts
@@ -57,7 +57,6 @@ export function testsForRpcFailoverBehavior({
             const requestToMock = getRequestToMock(request, blockNumber);
             const additionalMockRpcCallOptions =
               // This condition is intentional.
-              // eslint-disable-next-line jest/no-conditional-in-test
               failure instanceof Error || typeof failure === 'string'
                 ? { error: failure }
                 : { response: failure };
@@ -136,7 +135,6 @@ export function testsForRpcFailoverBehavior({
             const requestToMock = getRequestToMock(request, blockNumber);
             const additionalMockRpcCallOptions =
               // This condition is intentional.
-              // eslint-disable-next-line jest/no-conditional-in-test
               failure instanceof Error || typeof failure === 'string'
                 ? { error: failure }
                 : { response: failure };
@@ -227,7 +225,6 @@ export function testsForRpcFailoverBehavior({
             const requestToMock = getRequestToMock(request, blockNumber);
             const additionalMockRpcCallOptions =
               // This condition is intentional.
-              // eslint-disable-next-line jest/no-conditional-in-test
               failure instanceof Error || typeof failure === 'string'
                 ? { error: failure }
                 : { response: failure };
@@ -312,7 +309,6 @@ export function testsForRpcFailoverBehavior({
       const customMaxConsecutiveFailures = 6;
       const customMaxRetries = 2;
       // This is okay.
-      // eslint-disable-next-line jest/no-conditional-in-test
       const customNumRequestsToMake = isRetriableFailure
         ? customMaxConsecutiveFailures / (customMaxRetries + 1)
         : customMaxConsecutiveFailures;
@@ -338,7 +334,6 @@ export function testsForRpcFailoverBehavior({
               const requestToMock = getRequestToMock(request, blockNumber);
               const additionalMockRpcCallOptions =
                 // This condition is intentional.
-                // eslint-disable-next-line jest/no-conditional-in-test
                 failure instanceof Error || typeof failure === 'string'
                   ? { error: failure }
                   : { response: failure };
@@ -372,7 +367,6 @@ export function testsForRpcFailoverBehavior({
                   getRpcServiceOptions: (rpcEndpointUrl) => {
                     const commonOptions = { fetch, btoa };
                     // We need to return different results.
-                    // eslint-disable-next-line jest/no-conditional-in-test
                     if (rpcEndpointUrl === 'https://failover.endpoint') {
                       const headers: HeadersInit = {
                         'X-Baz': 'Qux',
@@ -434,7 +428,6 @@ export function testsForRpcFailoverBehavior({
         const request = requestToCall;
         const requestToMock = getRequestToMock(request, blockNumber);
         const additionalMockRpcCallOptions =
-          // eslint-disable-next-line jest/no-conditional-in-test
           failure instanceof Error || typeof failure === 'string'
             ? { error: failure }
             : { response: failure };
diff --git a/packages/network-enablement-controller/src/NetworkEnablementController.test.ts b/packages/network-enablement-controller/src/NetworkEnablementController.test.ts
index ba969af1cc9..477eab8131a 100644
--- a/packages/network-enablement-controller/src/NetworkEnablementController.test.ts
+++ b/packages/network-enablement-controller/src/NetworkEnablementController.test.ts
@@ -410,7 +410,6 @@ describe('NetworkEnablementController', () => {
         .spyOn(messenger, 'call')
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .mockImplementation((actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             return {
               selectedNetworkClientId: 'mainnet',
@@ -422,7 +421,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {
@@ -497,7 +495,6 @@ describe('NetworkEnablementController', () => {
       jest.spyOn(messenger, 'call').mockImplementation(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             return {
               selectedNetworkClientId: 'mainnet',
@@ -509,7 +506,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {
@@ -553,7 +549,6 @@ describe('NetworkEnablementController', () => {
         .spyOn(messenger, 'call')
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .mockImplementation((actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             return {
               selectedNetworkClientId: 'mainnet',
@@ -565,7 +560,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {},
@@ -593,7 +587,6 @@ describe('NetworkEnablementController', () => {
         .spyOn(messenger, 'call')
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .mockImplementation((actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             return {
               selectedNetworkClientId: 'mainnet',
@@ -604,7 +597,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {
@@ -704,7 +696,6 @@ describe('NetworkEnablementController', () => {
         .spyOn(messenger, 'call')
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .mockImplementation((actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             return {
               selectedNetworkClientId: 'mainnet',
@@ -714,7 +705,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {
@@ -755,7 +745,6 @@ describe('NetworkEnablementController', () => {
         .spyOn(messenger, 'call')
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .mockImplementation((actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             return {
               selectedNetworkClientId: 'mainnet',
@@ -765,7 +754,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {
@@ -808,7 +796,6 @@ describe('NetworkEnablementController', () => {
         .spyOn(messenger, 'call')
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .mockImplementation((actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             return {
               selectedNetworkClientId: 'mainnet',
@@ -820,7 +807,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {
@@ -921,7 +907,6 @@ describe('NetworkEnablementController', () => {
       jest.spyOn(messenger, 'call').mockImplementation(
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         (actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             // Create mock configurations for all popular networks
             const networkConfigurationsByChainId = POPULAR_NETWORKS.reduce(
@@ -938,7 +923,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {
@@ -1004,7 +988,6 @@ describe('NetworkEnablementController', () => {
         .spyOn(messenger, 'call')
         // eslint-disable-next-line @typescript-eslint/no-explicit-any
         .mockImplementation((actionType: string, ..._args: any[]): any => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'NetworkController:getState') {
             return {
               selectedNetworkClientId: 'mainnet',
@@ -1017,7 +1000,6 @@ describe('NetworkEnablementController', () => {
               networksMetadata: {},
             };
           }
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (actionType === 'MultichainNetworkController:getState') {
             return {
               multichainNetworkConfigurationsByChainId: {
diff --git a/packages/profile-sync-controller/src/controllers/authentication/AuthenticationController.test.ts b/packages/profile-sync-controller/src/controllers/authentication/AuthenticationController.test.ts
index f3e5706ee11..2e4547f2ac5 100644
--- a/packages/profile-sync-controller/src/controllers/authentication/AuthenticationController.test.ts
+++ b/packages/profile-sync-controller/src/controllers/authentication/AuthenticationController.test.ts
@@ -298,7 +298,6 @@ describe('AuthenticationController', () => {
       const { messenger } = createMockAuthenticationMessenger();
       mockAuthenticationFlowEndpoints();
       const originalState = mockSignedInState();
-      // eslint-disable-next-line jest/no-conditional-in-test
       if (originalState.srpSessionData) {
         originalState.srpSessionData[
           MOCK_ENTROPY_SOURCE_IDS[0]
@@ -332,7 +331,6 @@ describe('AuthenticationController', () => {
 
       // Invalid/old state
       const originalState = mockSignedInState();
-      // eslint-disable-next-line jest/no-conditional-in-test
       if (originalState.srpSessionData) {
         originalState.srpSessionData[
           MOCK_ENTROPY_SOURCE_IDS[0]
@@ -406,7 +404,6 @@ describe('AuthenticationController', () => {
       const { messenger } = createMockAuthenticationMessenger();
       mockAuthenticationFlowEndpoints();
       const originalState = mockSignedInState();
-      // eslint-disable-next-line jest/no-conditional-in-test
       if (originalState.srpSessionData) {
         originalState.srpSessionData[
           MOCK_ENTROPY_SOURCE_IDS[0]
@@ -443,7 +440,6 @@ describe('AuthenticationController', () => {
 
       // Invalid/old state
       const originalState = mockSignedInState();
-      // eslint-disable-next-line jest/no-conditional-in-test
       if (originalState.srpSessionData) {
         originalState.srpSessionData[
           MOCK_ENTROPY_SOURCE_IDS[0]
diff --git a/packages/profile-sync-controller/src/sdk/user-storage.test.ts b/packages/profile-sync-controller/src/sdk/user-storage.test.ts
index 3ae2bdbb5a4..82775648704 100644
--- a/packages/profile-sync-controller/src/sdk/user-storage.test.ts
+++ b/packages/profile-sync-controller/src/sdk/user-storage.test.ts
@@ -110,7 +110,6 @@ describe('User Storage', () => {
     const mockPut = handleMockUserStoragePut(
       undefined,
       async (_, requestBody) => {
-        // eslint-disable-next-line jest/no-conditional-in-test
         if (typeof requestBody === 'string') {
           return;
         }
@@ -179,7 +178,6 @@ describe('User Storage', () => {
     const mockPut = handleMockUserStoragePut(
       undefined,
       async (_, requestBody) => {
-        // eslint-disable-next-line jest/no-conditional-in-test
         if (typeof requestBody === 'string') {
           return;
         }
@@ -225,7 +223,6 @@ describe('User Storage', () => {
     const mockPut = handleMockUserStoragePut(
       undefined,
       async (_, requestBody) => {
-        // eslint-disable-next-line jest/no-conditional-in-test
         if (typeof requestBody === 'string') {
           return;
         }
@@ -371,7 +368,6 @@ describe('User Storage', () => {
     const mockPut = handleMockUserStorageBatchDelete(
       undefined,
       async (_, requestBody) => {
-        // eslint-disable-next-line jest/no-conditional-in-test
         if (typeof requestBody === 'string') {
           return;
         }
diff --git a/packages/sample-controllers/src/sample-gas-prices-controller.test.ts b/packages/sample-controllers/src/sample-gas-prices-controller.test.ts
index e09ae64a943..03c1ae19840 100644
--- a/packages/sample-controllers/src/sample-gas-prices-controller.test.ts
+++ b/packages/sample-controllers/src/sample-gas-prices-controller.test.ts
@@ -60,7 +60,6 @@ describe('SampleGasPricesController', () => {
         rootMessenger.registerActionHandler(
           'SampleGasPricesService:fetchGasPrices',
           async (givenChainId) => {
-            // eslint-disable-next-line jest/no-conditional-in-test
             if (givenChainId === chainId) {
               return {
                 low: 5,
@@ -109,7 +108,6 @@ describe('SampleGasPricesController', () => {
         let i = 0;
         const delays = [5000, 1000];
         const fetchGasPrices = jest.fn(async (givenChainId) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (givenChainId === chainId) {
             jest.advanceTimersByTime(delays[i]);
             i += 1;
@@ -163,7 +161,6 @@ describe('SampleGasPricesController', () => {
       await withController(async ({ rootMessenger }) => {
         const chainId = '0x42';
         const fetchGasPrices = jest.fn(async (givenChainId) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (givenChainId === chainId) {
             return {
               low: 5,
@@ -222,7 +219,6 @@ describe('SampleGasPricesController', () => {
         rootMessenger.registerActionHandler(
           'SampleGasPricesService:fetchGasPrices',
           async (givenChainId) => {
-            // eslint-disable-next-line jest/no-conditional-in-test
             if (givenChainId === chainId) {
               return {
                 low: 5,
@@ -268,7 +264,6 @@ describe('SampleGasPricesController', () => {
         rootMessenger.registerActionHandler(
           'SampleGasPricesService:fetchGasPrices',
           async (givenChainId) => {
-            // eslint-disable-next-line jest/no-conditional-in-test
             if (givenChainId === chainId) {
               return {
                 low: 5,
diff --git a/packages/shield-controller/src/polling-with-policy.test.ts b/packages/shield-controller/src/polling-with-policy.test.ts
index bfe60b59c40..a44d6e64603 100644
--- a/packages/shield-controller/src/polling-with-policy.test.ts
+++ b/packages/shield-controller/src/polling-with-policy.test.ts
@@ -21,7 +21,6 @@ describe('PollingWithCockatielPolicy', () => {
         invocationCount += 1;
         return new Promise((resolve, reject) => {
           setTimeout(() => {
-            // eslint-disable-next-line jest/no-conditional-in-test
             if (invocationCount < 3) {
               reject(new HttpError(412, 'Results are not available yet'));
             }
@@ -79,7 +78,6 @@ describe('PollingWithCockatielPolicy', () => {
       .mockImplementation(async (abortSignal: AbortSignal) => {
         return new Promise((_resolve, reject) => {
           setTimeout(() => {
-            // eslint-disable-next-line jest/no-conditional-in-test
             if (abortSignal.aborted) {
               reject(new Error('test error'));
             }
@@ -103,7 +101,6 @@ describe('PollingWithCockatielPolicy', () => {
       .mockImplementation(async (abortSignal: AbortSignal) => {
         return new Promise((resolve, reject) => {
           setTimeout(() => {
-            // eslint-disable-next-line jest/no-conditional-in-test
             if (abortSignal.aborted) {
               reject(new Error('test error'));
             }
@@ -125,7 +122,6 @@ describe('PollingWithCockatielPolicy', () => {
     const requestFn = (result: string) =>
       jest.fn().mockImplementation(async (abortSignal: AbortSignal) => {
         return new Promise((resolve, reject) => {
-          // eslint-disable-next-line jest/no-conditional-in-test
           if (abortSignal.aborted) {
             reject(new Error('test error'));
           }

From e38e3e790843d698b15e1d3c2fd7081eec57d54b Mon Sep 17 00:00:00 2001
From: Mark Stacey <markjstacey@gmail.com>
Date: Thu, 13 Nov 2025 12:11:03 -0330
Subject: [PATCH 2/2] Remove obsolete comments

Co-authored-by: Guillaume Roux <guillaumeroux123@gmail.com>
---
 packages/chain-agnostic-permission/src/scope/filter.test.ts | 5 -----
 packages/controller-utils/src/create-service-policy.test.ts | 2 --
 .../src/rpc-service/rpc-service-chain.test.ts               | 2 --
 .../network-controller/src/rpc-service/rpc-service.test.ts  | 2 --
 packages/network-controller/tests/NetworkController.test.ts | 2 --
 .../tests/network-client/block-hash-in-response.ts          | 1 -
 .../network-controller/tests/network-client/block-param.ts  | 1 -
 .../tests/network-client/no-block-param.ts                  | 1 -
 .../network-controller/tests/network-client/rpc-failover.ts | 6 ------
 9 files changed, 22 deletions(-)

diff --git a/packages/chain-agnostic-permission/src/scope/filter.test.ts b/packages/chain-agnostic-permission/src/scope/filter.test.ts
index 1adb6d2d5dd..336af7d3a98 100644
--- a/packages/chain-agnostic-permission/src/scope/filter.test.ts
+++ b/packages/chain-agnostic-permission/src/scope/filter.test.ts
@@ -72,7 +72,6 @@ describe('filter', () => {
 
     it('returns supported and unsupported scopes', () => {
       MockAssert.assertScopeSupported.mockImplementation((scopeString) => {
-        // This is okay; we are inside of a mock.
         if (scopeString === 'eip155:1') {
           throw new Error('scope not supported');
         }
@@ -173,11 +172,9 @@ describe('filter', () => {
     it('returns only supported methods', () => {
       MockSupported.isSupportedMethod.mockImplementation(
         (scopeString, method) => {
-          // This is okay; we are inside of a mock.
           if (scopeString === 'eip155:1' && method === 'method1') {
             return false;
           }
-          // This is okay; we are inside of a mock.
           if (scopeString === 'eip155:5' && method === 'methodB') {
             return false;
           }
@@ -258,11 +255,9 @@ describe('filter', () => {
     it('returns only supported notifications', () => {
       MockSupported.isSupportedNotification.mockImplementation(
         (scopeString, notification) => {
-          // This is okay; we are inside of a mock.
           if (scopeString === 'eip155:1' && notification === 'notification1') {
             return false;
           }
-          // This is okay; we are inside of a mock.
           if (scopeString === 'eip155:5' && notification === 'notificationB') {
             return false;
           }
diff --git a/packages/controller-utils/src/create-service-policy.test.ts b/packages/controller-utils/src/create-service-policy.test.ts
index 6f5e7f024a4..c42bea58b39 100644
--- a/packages/controller-utils/src/create-service-policy.test.ts
+++ b/packages/controller-utils/src/create-service-policy.test.ts
@@ -1,5 +1,3 @@
-// We use conditions exclusively in this file.
-
 import { handleWhen } from 'cockatiel';
 import { useFakeTimers } from 'sinon';
 import type { SinonFakeTimers } from 'sinon';
diff --git a/packages/network-controller/src/rpc-service/rpc-service-chain.test.ts b/packages/network-controller/src/rpc-service/rpc-service-chain.test.ts
index fb94fc2a30c..3a2c31bfd55 100644
--- a/packages/network-controller/src/rpc-service/rpc-service-chain.test.ts
+++ b/packages/network-controller/src/rpc-service/rpc-service-chain.test.ts
@@ -451,7 +451,6 @@ describe('RpcServiceChain', () => {
         onRetryListener.mock.calls.reduce(
           (memo, call) => {
             const { endpointUrl } = call[0];
-            // There is nothing wrong with this.
             memo[endpointUrl] = (memo[endpointUrl] ?? 0) + 1;
             return memo;
           },
@@ -680,7 +679,6 @@ describe('RpcServiceChain', () => {
         onDegradedListener.mock.calls.reduce(
           (memo: Record<string, number>, call) => {
             const { endpointUrl } = call[0];
-            // There is nothing wrong with this.
             memo[endpointUrl] = (memo[endpointUrl] ?? 0) + 1;
             return memo;
           },
diff --git a/packages/network-controller/src/rpc-service/rpc-service.test.ts b/packages/network-controller/src/rpc-service/rpc-service.test.ts
index d20f4f937f1..6faaa7799f3 100644
--- a/packages/network-controller/src/rpc-service/rpc-service.test.ts
+++ b/packages/network-controller/src/rpc-service/rpc-service.test.ts
@@ -1,5 +1,3 @@
-// We use conditions exclusively in this file.
-
 import { HttpError } from '@metamask/controller-utils';
 import { errorCodes } from '@metamask/rpc-errors';
 import deepFreeze from 'deep-freeze-strict';
diff --git a/packages/network-controller/tests/NetworkController.test.ts b/packages/network-controller/tests/NetworkController.test.ts
index 2abee706095..2e85aaddaad 100644
--- a/packages/network-controller/tests/NetworkController.test.ts
+++ b/packages/network-controller/tests/NetworkController.test.ts
@@ -1,5 +1,3 @@
-// A lot of the tests in this file have conditionals.
-
 import { deriveStateFromMetadata } from '@metamask/base-controller';
 import {
   BuiltInNetworkName,
diff --git a/packages/network-controller/tests/network-client/block-hash-in-response.ts b/packages/network-controller/tests/network-client/block-hash-in-response.ts
index 91d9ddc18e6..74a4cad16ff 100644
--- a/packages/network-controller/tests/network-client/block-hash-in-response.ts
+++ b/packages/network-controller/tests/network-client/block-hash-in-response.ts
@@ -326,7 +326,6 @@ export function testsForRpcMethodsThatCheckForBlockHashInResponse(
         },
       );
 
-      // This is not ideal, but we can refactor this later.
       if (providerType === NetworkClientType.Infura) {
         // This is not ideal, but we can refactor this later.
         // eslint-disable-next-line jest/no-conditional-expect
diff --git a/packages/network-controller/tests/network-client/block-param.ts b/packages/network-controller/tests/network-client/block-param.ts
index 119d8c2bbc5..a8c6a0fc77d 100644
--- a/packages/network-controller/tests/network-client/block-param.ts
+++ b/packages/network-controller/tests/network-client/block-param.ts
@@ -403,7 +403,6 @@ export function testsForRpcMethodSupportingBlockParam(
           },
         );
 
-        // This is not ideal, but we can refactor this later.
         if (providerType === NetworkClientType.Infura) {
           // This is not ideal, but we can refactor this later.
           // eslint-disable-next-line jest/no-conditional-expect
diff --git a/packages/network-controller/tests/network-client/no-block-param.ts b/packages/network-controller/tests/network-client/no-block-param.ts
index 901d1148998..717986e3222 100644
--- a/packages/network-controller/tests/network-client/no-block-param.ts
+++ b/packages/network-controller/tests/network-client/no-block-param.ts
@@ -282,7 +282,6 @@ export function testsForRpcMethodAssumingNoBlockParam(
         },
       );
 
-      // This is not ideal, but we can refactor this later.
       if (providerType === NetworkClientType.Infura) {
         // This is not ideal, but we can refactor this later.
         // eslint-disable-next-line jest/no-conditional-expect
diff --git a/packages/network-controller/tests/network-client/rpc-failover.ts b/packages/network-controller/tests/network-client/rpc-failover.ts
index 3c61466f95e..f214c939cb3 100644
--- a/packages/network-controller/tests/network-client/rpc-failover.ts
+++ b/packages/network-controller/tests/network-client/rpc-failover.ts
@@ -56,7 +56,6 @@ export function testsForRpcFailoverBehavior({
             const request = requestToCall;
             const requestToMock = getRequestToMock(request, blockNumber);
             const additionalMockRpcCallOptions =
-              // This condition is intentional.
               failure instanceof Error || typeof failure === 'string'
                 ? { error: failure }
                 : { response: failure };
@@ -134,7 +133,6 @@ export function testsForRpcFailoverBehavior({
             const request = requestToCall;
             const requestToMock = getRequestToMock(request, blockNumber);
             const additionalMockRpcCallOptions =
-              // This condition is intentional.
               failure instanceof Error || typeof failure === 'string'
                 ? { error: failure }
                 : { response: failure };
@@ -224,7 +222,6 @@ export function testsForRpcFailoverBehavior({
             const request = requestToCall;
             const requestToMock = getRequestToMock(request, blockNumber);
             const additionalMockRpcCallOptions =
-              // This condition is intentional.
               failure instanceof Error || typeof failure === 'string'
                 ? { error: failure }
                 : { response: failure };
@@ -308,7 +305,6 @@ export function testsForRpcFailoverBehavior({
     it('allows RPC service options to be customized', async () => {
       const customMaxConsecutiveFailures = 6;
       const customMaxRetries = 2;
-      // This is okay.
       const customNumRequestsToMake = isRetriableFailure
         ? customMaxConsecutiveFailures / (customMaxRetries + 1)
         : customMaxConsecutiveFailures;
@@ -333,7 +329,6 @@ export function testsForRpcFailoverBehavior({
               const request = requestToCall;
               const requestToMock = getRequestToMock(request, blockNumber);
               const additionalMockRpcCallOptions =
-                // This condition is intentional.
                 failure instanceof Error || typeof failure === 'string'
                   ? { error: failure }
                   : { response: failure };
@@ -366,7 +361,6 @@ export function testsForRpcFailoverBehavior({
                   messenger,
                   getRpcServiceOptions: (rpcEndpointUrl) => {
                     const commonOptions = { fetch, btoa };
-                    // We need to return different results.
                     if (rpcEndpointUrl === 'https://failover.endpoint') {
                       const headers: HeadersInit = {
                         'X-Baz': 'Qux',