Skip to content

Commit 232f0b8

Browse files
GudahttMrtenz
andauthored
chore: Fix all auto-fixable ESLint warnings (#7105)
## Explanation Fix all auto-fixable ESLint warnings. These changes were generated by running `yarn eslint --fix`. There were a number of blank JSDoc entries added by the initial auto-fix command, which had to be reverted because the empty blocks generated errors. The JSDoc auto-fix rules also messed up some of our malformated type doc blocks, which were reverted as well (the current invalid syntax isn't good, but we should at least preserve it until we can fix it properly). I also had to do a manual pass to remove obsolete comments and extra newlines from the auto-fix rule that removed unused ESLint ignore directives. Aside from that, everything else ESLint recognized as auto-fixable seems to have been fixed correctly. ## References N/A ## Checklist - [x] I've updated the test suite for new or updated code as appropriate - [x] I've updated documentation (JSDoc, Markdown, etc.) for new or updated code as appropriate - [x] I've communicated my changes to consumers by [updating changelogs for packages I've changed](https://github.com/MetaMask/core/tree/main/docs/contributing.md#updating-changelogs), highlighting breaking changes as necessary - [x] I've prepared draft pull requests for clients and consumer packages to resolve any breaking changes <!-- CURSOR_SUMMARY --> --- > [!NOTE] > Repo-wide ESLint autofixes: mark private fields as readonly, reorder imports, clean/adjust ESLint disables and JSDoc, switch some re-exports to type-only, and update lint warning thresholds; no functional changes. > > - **Codebase-wide ESLint autofixes**: > - Mark many private fields as `readonly` (e.g., in `ApprovalController`, `RatesController`, `TokenRatesController`, `NameController`, various providers/controllers/tests). > - Reorder/normalize imports across numerous files and tests. > - Remove or relocate obsolete `eslint-disable` comments; trim extra newlines and comments. > - JSDoc tidying: add missing spacing, brief descriptions, and param docs; remove empty/malformed blocks. > - Convert some re-exports to type-only (e.g., `logging-controller/src/logTypes/index.ts`, `message-manager/src/index.ts`). > - Minor string/template/comment fixes to satisfy lint rules. > - **Config/metadata**: > - Update `eslint-warning-thresholds.json` to reflect fewer rule violations. > - **Tests/Utilities**: > - Align tests and helpers with import/order and readonly changes; minor noop function/type tweaks. > > <sup>Written by [Cursor Bugbot](https://cursor.com/dashboard?tab=bugbot) for commit cf8849f. This will update automatically on new commits. Configure [here](https://cursor.com/dashboard?tab=bugbot).</sup> <!-- /CURSOR_SUMMARY --> --------- Co-authored-by: Maarten Zuidhoorn <[email protected]>
1 parent 800e615 commit 232f0b8

File tree

103 files changed

+216
-682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+216
-682
lines changed

eslint-warning-thresholds.json

Lines changed: 10 additions & 170 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,8 @@
66
"@typescript-eslint/no-unsafe-enum-comparison": 8
77
},
88
"packages/approval-controller/src/ApprovalController.test.ts": {
9-
"import-x/order": 1,
109
"jest/no-conditional-in-test": 16
1110
},
12-
"packages/approval-controller/src/ApprovalController.ts": {
13-
"@typescript-eslint/prefer-readonly": 4
14-
},
1511
"packages/assets-controllers/jest.environment.js": {
1612
"n/prefer-global/text-encoder": 1,
1713
"n/prefer-global/text-decoder": 1,
@@ -46,34 +42,17 @@
4642
"@typescript-eslint/no-misused-promises": 2
4743
},
4844
"packages/assets-controllers/src/NftDetectionController.test.ts": {
49-
"import-x/namespace": 6,
50-
"import-x/order": 3
45+
"import-x/namespace": 6
5146
},
5247
"packages/assets-controllers/src/NftDetectionController.ts": {
53-
"jsdoc/check-tag-names": 34,
54-
"jsdoc/tag-lines": 1
55-
},
56-
"packages/assets-controllers/src/RatesController/RatesController.test.ts": {
57-
"import-x/order": 1,
58-
"jsdoc/tag-lines": 2
59-
},
60-
"packages/assets-controllers/src/RatesController/RatesController.ts": {
61-
"@typescript-eslint/prefer-readonly": 1,
62-
"import-x/order": 1,
63-
"jsdoc/tag-lines": 3
64-
},
65-
"packages/assets-controllers/src/RatesController/types.ts": {
66-
"import-x/order": 1
48+
"jsdoc/check-tag-names": 34
6749
},
6850
"packages/assets-controllers/src/Standards/ERC20Standard.test.ts": {
6951
"jest/no-commented-out-tests": 1
7052
},
7153
"packages/assets-controllers/src/Standards/NftStandards/ERC1155/ERC1155Standard.test.ts": {
7254
"import-x/no-named-as-default-member": 1
7355
},
74-
"packages/assets-controllers/src/Standards/NftStandards/ERC721/ERC721Standard.ts": {
75-
"prettier/prettier": 1
76-
},
7756
"packages/assets-controllers/src/TokenBalancesController.ts": {
7857
"@typescript-eslint/no-misused-promises": 1
7958
},
@@ -82,45 +61,31 @@
8261
},
8362
"packages/assets-controllers/src/TokenListController.test.ts": {
8463
"import-x/namespace": 7,
85-
"import-x/order": 2,
8664
"jest/no-conditional-in-test": 2
8765
},
8866
"packages/assets-controllers/src/TokenRatesController.ts": {
89-
"@typescript-eslint/prefer-readonly": 1,
9067
"jsdoc/check-tag-names": 11
9168
},
9269
"packages/assets-controllers/src/TokensController.test.ts": {
9370
"import-x/namespace": 1,
94-
"import-x/order": 3,
9571
"jest/no-conditional-in-test": 2
9672
},
9773
"packages/assets-controllers/src/TokensController.ts": {
9874
"@typescript-eslint/no-unused-vars": 1,
99-
"@typescript-eslint/prefer-readonly": 1,
100-
"jsdoc/check-tag-names": 10,
101-
"jsdoc/tag-lines": 2
75+
"jsdoc/check-tag-names": 10
10276
},
10377
"packages/assets-controllers/src/assetsUtil.test.ts": {
10478
"jest/no-conditional-in-test": 2
10579
},
106-
"packages/assets-controllers/src/assetsUtil.ts": {
107-
"jsdoc/tag-lines": 2
108-
},
10980
"packages/assets-controllers/src/multicall.test.ts": {
11081
"@typescript-eslint/prefer-promise-reject-errors": 2
11182
},
112-
"packages/assets-controllers/src/token-prices-service/codefi-v2.ts": {
113-
"jsdoc/tag-lines": 2
114-
},
11583
"packages/base-controller/src/BaseController.test.ts": {
11684
"import-x/namespace": 13
11785
},
11886
"packages/bridge-status-controller/src/utils/transaction.ts": {
11987
"@typescript-eslint/no-unsafe-enum-comparison": 2
12088
},
121-
"packages/build-utils/src/transforms/remove-fenced-code.test.ts": {
122-
"import-x/order": 1
123-
},
12489
"packages/build-utils/src/transforms/remove-fenced-code.ts": {
12590
"@typescript-eslint/no-unsafe-enum-comparison": 1
12691
},
@@ -136,9 +101,6 @@
136101
"@typescript-eslint/no-unused-vars": 1,
137102
"jsdoc/check-tag-names": 5
138103
},
139-
"packages/controller-utils/src/types.ts": {
140-
"jsdoc/tag-lines": 1
141-
},
142104
"packages/controller-utils/src/util.test.ts": {
143105
"import-x/no-named-as-default": 1,
144106
"jest/no-conditional-in-test": 1,
@@ -153,9 +115,6 @@
153115
"packages/eip-5792-middleware/src/hooks/processSendCalls.ts": {
154116
"@typescript-eslint/no-misused-promises": 1
155117
},
156-
"packages/ens-controller/src/EnsController.test.ts": {
157-
"import-x/order": 1
158-
},
159118
"packages/ens-controller/src/EnsController.ts": {
160119
"jsdoc/check-tag-names": 6
161120
},
@@ -260,15 +219,10 @@
260219
"jsdoc/match-description": 11
261220
},
262221
"packages/gas-fee-controller/src/GasFeeController.test.ts": {
263-
"import-x/namespace": 2,
264-
"import-x/order": 1
222+
"import-x/namespace": 2
265223
},
266224
"packages/gas-fee-controller/src/GasFeeController.ts": {
267-
"@typescript-eslint/prefer-readonly": 1,
268-
"jsdoc/check-tag-names": 21
269-
},
270-
"packages/gas-fee-controller/src/determineGasFeeCalculations.ts": {
271-
"jsdoc/tag-lines": 4
225+
"jsdoc/check-tag-names": 20
272226
},
273227
"packages/json-rpc-middleware-stream/src/index.test.ts": {
274228
"@typescript-eslint/prefer-promise-reject-errors": 1,
@@ -285,24 +239,17 @@
285239
"@typescript-eslint/no-unsafe-enum-comparison": 2,
286240
"@typescript-eslint/no-unused-vars": 1
287241
},
288-
"packages/keyring-controller/tests/mocks/mockKeyring.ts": {
289-
"@typescript-eslint/prefer-readonly": 1
290-
},
291242
"packages/logging-controller/src/LoggingController.test.ts": {
292243
"import-x/namespace": 1
293244
},
294245
"packages/logging-controller/src/LoggingController.ts": {
295246
"jsdoc/check-tag-names": 1
296247
},
297-
"packages/logging-controller/src/logTypes/index.ts": {
298-
"@typescript-eslint/consistent-type-exports": 1
299-
},
300248
"packages/message-manager/src/AbstractMessageManager.test.ts": {
301249
"jest/no-conditional-in-test": 7
302250
},
303251
"packages/message-manager/src/AbstractMessageManager.ts": {
304-
"jsdoc/check-tag-names": 25,
305-
"jsdoc/tag-lines": 2
252+
"jsdoc/check-tag-names": 25
306253
},
307254
"packages/message-manager/src/DecryptMessageManager.test.ts": {
308255
"jest/no-conditional-in-test": 3
@@ -316,9 +263,6 @@
316263
"packages/message-manager/src/EncryptionPublicKeyManager.ts": {
317264
"jsdoc/check-tag-names": 13
318265
},
319-
"packages/message-manager/src/index.ts": {
320-
"@typescript-eslint/consistent-type-exports": 1
321-
},
322266
"packages/message-manager/src/utils.ts": {
323267
"@typescript-eslint/no-unused-vars": 1
324268
},
@@ -329,32 +273,7 @@
329273
"@typescript-eslint/no-misused-promises": 2
330274
},
331275
"packages/name-controller/src/NameController.ts": {
332-
"@typescript-eslint/no-unsafe-enum-comparison": 1,
333-
"@typescript-eslint/prefer-readonly": 2
334-
},
335-
"packages/name-controller/src/providers/ens.test.ts": {
336-
"import-x/order": 1
337-
},
338-
"packages/name-controller/src/providers/ens.ts": {
339-
"@typescript-eslint/prefer-readonly": 2
340-
},
341-
"packages/name-controller/src/providers/etherscan.test.ts": {
342-
"import-x/order": 1
343-
},
344-
"packages/name-controller/src/providers/etherscan.ts": {
345-
"@typescript-eslint/prefer-readonly": 2
346-
},
347-
"packages/name-controller/src/providers/lens.test.ts": {
348-
"import-x/order": 1
349-
},
350-
"packages/name-controller/src/providers/lens.ts": {
351-
"@typescript-eslint/prefer-readonly": 1
352-
},
353-
"packages/name-controller/src/providers/token.test.ts": {
354-
"import-x/order": 1
355-
},
356-
"packages/name-controller/src/providers/token.ts": {
357-
"@typescript-eslint/prefer-readonly": 1
276+
"@typescript-eslint/no-unsafe-enum-comparison": 1
358277
},
359278
"packages/name-controller/src/util.ts": {
360279
"jsdoc/require-returns": 1
@@ -368,16 +287,8 @@
368287
"packages/permission-controller/src/PermissionController.test.ts": {
369288
"jest/no-conditional-in-test": 4
370289
},
371-
"packages/permission-controller/src/rpc-methods/getPermissions.test.ts": {
372-
"import-x/order": 1
373-
},
374-
"packages/permission-controller/src/rpc-methods/requestPermissions.ts": {
375-
"prettier/prettier": 1
376-
},
377290
"packages/permission-log-controller/src/PermissionLogController.ts": {
378-
"@typescript-eslint/prefer-readonly": 1,
379-
"jsdoc/check-tag-names": 2,
380-
"jsdoc/tag-lines": 1
291+
"jsdoc/check-tag-names": 2
381292
},
382293
"packages/phishing-controller/src/PhishingController.ts": {
383294
"jsdoc/check-tag-names": 32
@@ -388,28 +299,12 @@
388299
"packages/phishing-controller/src/utils.ts": {
389300
"@typescript-eslint/no-unsafe-enum-comparison": 1
390301
},
391-
"packages/polling-controller/src/AbstractPollingController.ts": {
392-
"@typescript-eslint/prefer-readonly": 1
393-
},
394302
"packages/rate-limit-controller/src/RateLimitController.ts": {
395303
"jsdoc/check-tag-names": 4
396304
},
397305
"packages/remote-feature-flag-controller/src/client-config-api-service/client-config-api-service.test.ts": {
398-
"import-x/order": 1,
399-
"jsdoc/tag-lines": 1,
400306
"promise/param-names": 1
401307
},
402-
"packages/remote-feature-flag-controller/src/client-config-api-service/client-config-api-service.ts": {
403-
"@typescript-eslint/prefer-readonly": 4,
404-
"jsdoc/tag-lines": 2
405-
},
406-
"packages/remote-feature-flag-controller/src/remote-feature-flag-controller.ts": {
407-
"@typescript-eslint/prefer-readonly": 1,
408-
"jsdoc/check-tag-names": 2
409-
},
410-
"packages/remote-feature-flag-controller/src/utils/user-segmentation-utils.ts": {
411-
"jsdoc/tag-lines": 2
412-
},
413308
"packages/sample-controllers/src/sample-gas-prices-controller.ts": {
414309
"@typescript-eslint/no-misused-promises": 1
415310
},
@@ -441,85 +336,30 @@
441336
"@typescript-eslint/no-base-to-string": 1,
442337
"@typescript-eslint/no-unused-vars": 2
443338
},
444-
"packages/user-operation-controller/src/UserOperationController.test.ts": {
445-
"jsdoc/tag-lines": 4
446-
},
447339
"packages/user-operation-controller/src/UserOperationController.ts": {
448340
"@typescript-eslint/prefer-promise-reject-errors": 1,
449-
"@typescript-eslint/prefer-readonly": 3,
450341
"jsdoc/require-returns": 2
451342
},
452343
"packages/user-operation-controller/src/helpers/Bundler.test.ts": {
453-
"import-x/order": 1,
454-
"jsdoc/require-returns": 1,
455-
"jsdoc/tag-lines": 1
456-
},
457-
"packages/user-operation-controller/src/helpers/Bundler.ts": {
458-
"@typescript-eslint/prefer-readonly": 1,
459-
"jsdoc/tag-lines": 2
460-
},
461-
"packages/user-operation-controller/src/helpers/PendingUserOperationTracker.test.ts": {
462-
"import-x/order": 2,
463-
"jsdoc/tag-lines": 4,
464-
"prettier/prettier": 1
465-
},
466-
"packages/user-operation-controller/src/helpers/PendingUserOperationTracker.ts": {
467-
"@typescript-eslint/prefer-readonly": 2,
468-
"import-x/order": 1
469-
},
470-
"packages/user-operation-controller/src/helpers/SnapSmartContractAccount.test.ts": {
471-
"import-x/order": 1,
472-
"jsdoc/tag-lines": 1
473-
},
474-
"packages/user-operation-controller/src/helpers/SnapSmartContractAccount.ts": {
475-
"@typescript-eslint/prefer-readonly": 1
476-
},
477-
"packages/user-operation-controller/src/types.ts": {
478-
"jsdoc/tag-lines": 3
479-
},
480-
"packages/user-operation-controller/src/utils/gas-fees.ts": {
481-
"jsdoc/tag-lines": 7
482-
},
483-
"packages/user-operation-controller/src/utils/gas.test.ts": {
484-
"import-x/order": 1,
485-
"jsdoc/tag-lines": 1
486-
},
487-
"packages/user-operation-controller/src/utils/gas.ts": {
488-
"jsdoc/tag-lines": 2
489-
},
490-
"packages/user-operation-controller/src/utils/transaction.test.ts": {
491-
"import-x/order": 1
492-
},
493-
"packages/user-operation-controller/src/utils/transaction.ts": {
494-
"jsdoc/tag-lines": 2
495-
},
496-
"packages/user-operation-controller/src/utils/validation.test.ts": {
497-
"import-x/order": 1,
498-
"jsdoc/tag-lines": 2
499-
},
500-
"packages/user-operation-controller/src/utils/validation.ts": {
501-
"jsdoc/tag-lines": 8
344+
"jsdoc/require-returns": 1
502345
},
503346
"scripts/create-package/utils.test.ts": {
504347
"@typescript-eslint/no-unsafe-enum-comparison": 3,
505348
"import-x/no-named-as-default-member": 2,
506349
"jest/no-conditional-in-test": 1
507350
},
508351
"scripts/create-package/utils.ts": {
509-
"@typescript-eslint/no-unsafe-enum-comparison": 5,
510-
"prettier/prettier": 1
352+
"@typescript-eslint/no-unsafe-enum-comparison": 5
511353
},
512354
"tests/fake-block-tracker.ts": {
513355
"no-empty-function": 1
514356
},
515357
"tests/fake-provider.ts": {
516358
"@typescript-eslint/prefer-promise-reject-errors": 1,
517-
"@typescript-eslint/prefer-readonly": 2,
518359
"jsdoc/check-tag-names": 12
519360
},
520361
"tests/mock-network.ts": {
521362
"@typescript-eslint/no-unsafe-enum-comparison": 1,
522-
"@typescript-eslint/prefer-readonly": 3,
523363
"jsdoc/check-tag-names": 10
524364
},
525365
"tests/setupAfterEnv/nock.ts": {

packages/approval-controller/src/ApprovalController.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ import {
1111
import { errorCodes, JsonRpcError } from '@metamask/rpc-errors';
1212
import { nanoid } from 'nanoid';
1313

14-
import { flushPromises } from '../../../tests/helpers';
1514
import type {
1615
AddApprovalOptions,
1716
ApprovalControllerActions,
@@ -33,6 +32,7 @@ import {
3332
MissingApprovalFlowError,
3433
NoApprovalFlowsError,
3534
} from './errors';
35+
import { flushPromises } from '../../../tests/helpers';
3636

3737
jest.mock('nanoid');
3838

packages/approval-controller/src/ApprovalController.ts

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -369,13 +369,13 @@ export class ApprovalController extends BaseController<
369369
ApprovalControllerState,
370370
ApprovalControllerMessenger
371371
> {
372-
#approvals: Map<string, ApprovalCallbacks>;
372+
readonly #approvals: Map<string, ApprovalCallbacks>;
373373

374-
#origins: Map<string, Map<string, number>>;
374+
readonly #origins: Map<string, Map<string, number>>;
375375

376-
#showApprovalRequest: () => void;
376+
readonly #showApprovalRequest: () => void;
377377

378-
#typesExcludedFromRateLimiting: string[];
378+
readonly #typesExcludedFromRateLimiting: string[];
379379

380380
/**
381381
* Construct an Approval controller.
@@ -615,8 +615,6 @@ export class ApprovalController extends BaseController<
615615
if (origin) {
616616
return Array.from(
617617
(this.#origins.get(origin) || new Map()).values(),
618-
// TODO: Either fix this lint violation or explain why it's necessary to ignore.
619-
// eslint-disable-next-line @typescript-eslint/restrict-plus-operands
620618
).reduce((total, value) => total + value, 0);
621619
}
622620

0 commit comments

Comments
 (0)