Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
180 changes: 10 additions & 170 deletions eslint-warning-thresholds.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,8 @@
"@typescript-eslint/no-unsafe-enum-comparison": 8
},
"packages/approval-controller/src/ApprovalController.test.ts": {
"import-x/order": 1,
"jest/no-conditional-in-test": 16
},
"packages/approval-controller/src/ApprovalController.ts": {
"@typescript-eslint/prefer-readonly": 4
},
"packages/assets-controllers/jest.environment.js": {
"n/prefer-global/text-encoder": 1,
"n/prefer-global/text-decoder": 1,
Expand Down Expand Up @@ -46,34 +42,17 @@
"@typescript-eslint/no-misused-promises": 2
},
"packages/assets-controllers/src/NftDetectionController.test.ts": {
"import-x/namespace": 6,
"import-x/order": 3
"import-x/namespace": 6
},
"packages/assets-controllers/src/NftDetectionController.ts": {
"jsdoc/check-tag-names": 34,
"jsdoc/tag-lines": 1
},
"packages/assets-controllers/src/RatesController/RatesController.test.ts": {
"import-x/order": 1,
"jsdoc/tag-lines": 2
},
"packages/assets-controllers/src/RatesController/RatesController.ts": {
"@typescript-eslint/prefer-readonly": 1,
"import-x/order": 1,
"jsdoc/tag-lines": 3
},
"packages/assets-controllers/src/RatesController/types.ts": {
"import-x/order": 1
"jsdoc/check-tag-names": 34
},
"packages/assets-controllers/src/Standards/ERC20Standard.test.ts": {
"jest/no-commented-out-tests": 1
},
"packages/assets-controllers/src/Standards/NftStandards/ERC1155/ERC1155Standard.test.ts": {
"import-x/no-named-as-default-member": 1
},
"packages/assets-controllers/src/Standards/NftStandards/ERC721/ERC721Standard.ts": {
"prettier/prettier": 1
},
"packages/assets-controllers/src/TokenBalancesController.ts": {
"@typescript-eslint/no-misused-promises": 1
},
Expand All @@ -82,45 +61,31 @@
},
"packages/assets-controllers/src/TokenListController.test.ts": {
"import-x/namespace": 7,
"import-x/order": 2,
"jest/no-conditional-in-test": 2
},
"packages/assets-controllers/src/TokenRatesController.ts": {
"@typescript-eslint/prefer-readonly": 1,
"jsdoc/check-tag-names": 11
},
"packages/assets-controllers/src/TokensController.test.ts": {
"import-x/namespace": 1,
"import-x/order": 3,
"jest/no-conditional-in-test": 2
},
"packages/assets-controllers/src/TokensController.ts": {
"@typescript-eslint/no-unused-vars": 1,
"@typescript-eslint/prefer-readonly": 1,
"jsdoc/check-tag-names": 10,
"jsdoc/tag-lines": 2
"jsdoc/check-tag-names": 10
},
"packages/assets-controllers/src/assetsUtil.test.ts": {
"jest/no-conditional-in-test": 2
},
"packages/assets-controllers/src/assetsUtil.ts": {
"jsdoc/tag-lines": 2
},
"packages/assets-controllers/src/multicall.test.ts": {
"@typescript-eslint/prefer-promise-reject-errors": 2
},
"packages/assets-controllers/src/token-prices-service/codefi-v2.ts": {
"jsdoc/tag-lines": 2
},
"packages/base-controller/src/BaseController.test.ts": {
"import-x/namespace": 13
},
"packages/bridge-status-controller/src/utils/transaction.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 2
},
"packages/build-utils/src/transforms/remove-fenced-code.test.ts": {
"import-x/order": 1
},
"packages/build-utils/src/transforms/remove-fenced-code.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 1
},
Expand All @@ -136,9 +101,6 @@
"@typescript-eslint/no-unused-vars": 1,
"jsdoc/check-tag-names": 5
},
"packages/controller-utils/src/types.ts": {
"jsdoc/tag-lines": 1
},
"packages/controller-utils/src/util.test.ts": {
"import-x/no-named-as-default": 1,
"jest/no-conditional-in-test": 1,
Expand All @@ -153,9 +115,6 @@
"packages/eip-5792-middleware/src/hooks/processSendCalls.ts": {
"@typescript-eslint/no-misused-promises": 1
},
"packages/ens-controller/src/EnsController.test.ts": {
"import-x/order": 1
},
"packages/ens-controller/src/EnsController.ts": {
"jsdoc/check-tag-names": 6
},
Expand Down Expand Up @@ -260,15 +219,10 @@
"jsdoc/match-description": 11
},
"packages/gas-fee-controller/src/GasFeeController.test.ts": {
"import-x/namespace": 2,
"import-x/order": 1
"import-x/namespace": 2
},
"packages/gas-fee-controller/src/GasFeeController.ts": {
"@typescript-eslint/prefer-readonly": 1,
"jsdoc/check-tag-names": 21
},
"packages/gas-fee-controller/src/determineGasFeeCalculations.ts": {
"jsdoc/tag-lines": 4
"jsdoc/check-tag-names": 20
},
"packages/json-rpc-middleware-stream/src/index.test.ts": {
"@typescript-eslint/prefer-promise-reject-errors": 1,
Expand All @@ -285,24 +239,17 @@
"@typescript-eslint/no-unsafe-enum-comparison": 2,
"@typescript-eslint/no-unused-vars": 1
},
"packages/keyring-controller/tests/mocks/mockKeyring.ts": {
"@typescript-eslint/prefer-readonly": 1
},
"packages/logging-controller/src/LoggingController.test.ts": {
"import-x/namespace": 1
},
"packages/logging-controller/src/LoggingController.ts": {
"jsdoc/check-tag-names": 1
},
"packages/logging-controller/src/logTypes/index.ts": {
"@typescript-eslint/consistent-type-exports": 1
},
"packages/message-manager/src/AbstractMessageManager.test.ts": {
"jest/no-conditional-in-test": 7
},
"packages/message-manager/src/AbstractMessageManager.ts": {
"jsdoc/check-tag-names": 25,
"jsdoc/tag-lines": 2
"jsdoc/check-tag-names": 25
},
"packages/message-manager/src/DecryptMessageManager.test.ts": {
"jest/no-conditional-in-test": 3
Expand All @@ -316,9 +263,6 @@
"packages/message-manager/src/EncryptionPublicKeyManager.ts": {
"jsdoc/check-tag-names": 13
},
"packages/message-manager/src/index.ts": {
"@typescript-eslint/consistent-type-exports": 1
},
"packages/message-manager/src/utils.ts": {
"@typescript-eslint/no-unused-vars": 1
},
Expand All @@ -329,32 +273,7 @@
"@typescript-eslint/no-misused-promises": 2
},
"packages/name-controller/src/NameController.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 1,
"@typescript-eslint/prefer-readonly": 2
},
"packages/name-controller/src/providers/ens.test.ts": {
"import-x/order": 1
},
"packages/name-controller/src/providers/ens.ts": {
"@typescript-eslint/prefer-readonly": 2
},
"packages/name-controller/src/providers/etherscan.test.ts": {
"import-x/order": 1
},
"packages/name-controller/src/providers/etherscan.ts": {
"@typescript-eslint/prefer-readonly": 2
},
"packages/name-controller/src/providers/lens.test.ts": {
"import-x/order": 1
},
"packages/name-controller/src/providers/lens.ts": {
"@typescript-eslint/prefer-readonly": 1
},
"packages/name-controller/src/providers/token.test.ts": {
"import-x/order": 1
},
"packages/name-controller/src/providers/token.ts": {
"@typescript-eslint/prefer-readonly": 1
"@typescript-eslint/no-unsafe-enum-comparison": 1
},
"packages/name-controller/src/util.ts": {
"jsdoc/require-returns": 1
Expand All @@ -368,16 +287,8 @@
"packages/permission-controller/src/PermissionController.test.ts": {
"jest/no-conditional-in-test": 4
},
"packages/permission-controller/src/rpc-methods/getPermissions.test.ts": {
"import-x/order": 1
},
"packages/permission-controller/src/rpc-methods/requestPermissions.ts": {
"prettier/prettier": 1
},
"packages/permission-log-controller/src/PermissionLogController.ts": {
"@typescript-eslint/prefer-readonly": 1,
"jsdoc/check-tag-names": 2,
"jsdoc/tag-lines": 1
"jsdoc/check-tag-names": 2
},
"packages/phishing-controller/src/PhishingController.ts": {
"jsdoc/check-tag-names": 32
Expand All @@ -388,28 +299,12 @@
"packages/phishing-controller/src/utils.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 1
},
"packages/polling-controller/src/AbstractPollingController.ts": {
"@typescript-eslint/prefer-readonly": 1
},
"packages/rate-limit-controller/src/RateLimitController.ts": {
"jsdoc/check-tag-names": 4
},
"packages/remote-feature-flag-controller/src/client-config-api-service/client-config-api-service.test.ts": {
"import-x/order": 1,
"jsdoc/tag-lines": 1,
"promise/param-names": 1
},
"packages/remote-feature-flag-controller/src/client-config-api-service/client-config-api-service.ts": {
"@typescript-eslint/prefer-readonly": 4,
"jsdoc/tag-lines": 2
},
"packages/remote-feature-flag-controller/src/remote-feature-flag-controller.ts": {
"@typescript-eslint/prefer-readonly": 1,
"jsdoc/check-tag-names": 2
},
"packages/remote-feature-flag-controller/src/utils/user-segmentation-utils.ts": {
"jsdoc/tag-lines": 2
},
"packages/sample-controllers/src/sample-gas-prices-controller.ts": {
"@typescript-eslint/no-misused-promises": 1
},
Expand Down Expand Up @@ -441,85 +336,30 @@
"@typescript-eslint/no-base-to-string": 1,
"@typescript-eslint/no-unused-vars": 2
},
"packages/user-operation-controller/src/UserOperationController.test.ts": {
"jsdoc/tag-lines": 4
},
"packages/user-operation-controller/src/UserOperationController.ts": {
"@typescript-eslint/prefer-promise-reject-errors": 1,
"@typescript-eslint/prefer-readonly": 3,
"jsdoc/require-returns": 2
},
"packages/user-operation-controller/src/helpers/Bundler.test.ts": {
"import-x/order": 1,
"jsdoc/require-returns": 1,
"jsdoc/tag-lines": 1
},
"packages/user-operation-controller/src/helpers/Bundler.ts": {
"@typescript-eslint/prefer-readonly": 1,
"jsdoc/tag-lines": 2
},
"packages/user-operation-controller/src/helpers/PendingUserOperationTracker.test.ts": {
"import-x/order": 2,
"jsdoc/tag-lines": 4,
"prettier/prettier": 1
},
"packages/user-operation-controller/src/helpers/PendingUserOperationTracker.ts": {
"@typescript-eslint/prefer-readonly": 2,
"import-x/order": 1
},
"packages/user-operation-controller/src/helpers/SnapSmartContractAccount.test.ts": {
"import-x/order": 1,
"jsdoc/tag-lines": 1
},
"packages/user-operation-controller/src/helpers/SnapSmartContractAccount.ts": {
"@typescript-eslint/prefer-readonly": 1
},
"packages/user-operation-controller/src/types.ts": {
"jsdoc/tag-lines": 3
},
"packages/user-operation-controller/src/utils/gas-fees.ts": {
"jsdoc/tag-lines": 7
},
"packages/user-operation-controller/src/utils/gas.test.ts": {
"import-x/order": 1,
"jsdoc/tag-lines": 1
},
"packages/user-operation-controller/src/utils/gas.ts": {
"jsdoc/tag-lines": 2
},
"packages/user-operation-controller/src/utils/transaction.test.ts": {
"import-x/order": 1
},
"packages/user-operation-controller/src/utils/transaction.ts": {
"jsdoc/tag-lines": 2
},
"packages/user-operation-controller/src/utils/validation.test.ts": {
"import-x/order": 1,
"jsdoc/tag-lines": 2
},
"packages/user-operation-controller/src/utils/validation.ts": {
"jsdoc/tag-lines": 8
"jsdoc/require-returns": 1
},
"scripts/create-package/utils.test.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 3,
"import-x/no-named-as-default-member": 2,
"jest/no-conditional-in-test": 1
},
"scripts/create-package/utils.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 5,
"prettier/prettier": 1
"@typescript-eslint/no-unsafe-enum-comparison": 5
},
"tests/fake-block-tracker.ts": {
"no-empty-function": 1
},
"tests/fake-provider.ts": {
"@typescript-eslint/prefer-promise-reject-errors": 1,
"@typescript-eslint/prefer-readonly": 2,
"jsdoc/check-tag-names": 12
},
"tests/mock-network.ts": {
"@typescript-eslint/no-unsafe-enum-comparison": 1,
"@typescript-eslint/prefer-readonly": 3,
"jsdoc/check-tag-names": 10
},
"tests/setupAfterEnv/nock.ts": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
import { errorCodes, JsonRpcError } from '@metamask/rpc-errors';
import { nanoid } from 'nanoid';

import { flushPromises } from '../../../tests/helpers';
import type {
AddApprovalOptions,
ApprovalControllerActions,
Expand All @@ -33,6 +32,7 @@
MissingApprovalFlowError,
NoApprovalFlowsError,
} from './errors';
import { flushPromises } from '../../../tests/helpers';

jest.mock('nanoid');

Expand Down Expand Up @@ -373,7 +373,7 @@
const id = Object.keys(
approvalController.state[PENDING_APPROVALS_STORE_KEY],
)[0];
expect(id && typeof id === 'string').toBe(true);

Check warning on line 376 in packages/approval-controller/src/ApprovalController.test.ts

View workflow job for this annotation

GitHub Actions / Lint, build, and test / Lint (22.x)

Avoid having conditionals in tests
});

it('adds correctly specified entry with request data', () => {
Expand Down
10 changes: 4 additions & 6 deletions packages/approval-controller/src/ApprovalController.ts
Original file line number Diff line number Diff line change
Expand Up @@ -369,13 +369,13 @@ export class ApprovalController extends BaseController<
ApprovalControllerState,
ApprovalControllerMessenger
> {
#approvals: Map<string, ApprovalCallbacks>;
readonly #approvals: Map<string, ApprovalCallbacks>;

#origins: Map<string, Map<string, number>>;
readonly #origins: Map<string, Map<string, number>>;

#showApprovalRequest: () => void;
readonly #showApprovalRequest: () => void;

#typesExcludedFromRateLimiting: string[];
readonly #typesExcludedFromRateLimiting: string[];

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

Expand Down
Loading
Loading