diff --git a/eslint-warning-thresholds.json b/eslint-warning-thresholds.json index f93165ac4ae..9697b47c0f4 100644 --- a/eslint-warning-thresholds.json +++ b/eslint-warning-thresholds.json @@ -321,22 +321,6 @@ "packages/name-controller/src/util.ts": { "jsdoc/require-returns": 1 }, - "packages/network-controller/src/NetworkController.ts": { - "@typescript-eslint/prefer-promise-reject-errors": 1 - }, - "packages/network-controller/tests/NetworkController.test.ts": { - "@typescript-eslint/no-unused-vars": 1, - "@typescript-eslint/prefer-promise-reject-errors": 1 - }, - "packages/network-controller/tests/create-network-client.test.ts": { - "import-x/order": 1 - }, - "packages/network-controller/tests/provider-api-tests/helpers.ts": { - "@typescript-eslint/prefer-promise-reject-errors": 1, - "import-x/namespace": 1, - "import-x/no-named-as-default-member": 1, - "promise/catch-or-return": 1 - }, "packages/permission-controller/src/PermissionController.test.ts": { "jest/no-conditional-in-test": 4 }, diff --git a/packages/network-controller/src/NetworkController.ts b/packages/network-controller/src/NetworkController.ts index edaacc2dcab..2449fe7c53d 100644 --- a/packages/network-controller/src/NetworkController.ts +++ b/packages/network-controller/src/NetworkController.ts @@ -1893,6 +1893,8 @@ export class NetworkController extends BaseController< { method: 'eth_getBlockByNumber', params: ['latest', false] }, (error: unknown, block?: unknown) => { if (error) { + // This error comes from JsonRpcEngine, we don't control it. + // eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors reject(error); } else { // TODO: Validate this type diff --git a/packages/network-controller/tests/NetworkController.test.ts b/packages/network-controller/tests/NetworkController.test.ts index 124378ac773..ab7ea3aa877 100644 --- a/packages/network-controller/tests/NetworkController.test.ts +++ b/packages/network-controller/tests/NetworkController.test.ts @@ -3834,7 +3834,7 @@ describe('NetworkController', () => { operation: async () => { try { await controller.getEIP1559Compatibility(); - } catch (error) { + } catch { // ignore error } }, @@ -16506,9 +16506,7 @@ async function withController( return await fn({ controller, messenger, networkControllerMessenger }); } finally { const { blockTracker } = controller.getProviderAndBlockTracker(); - // TODO: Either fix this lint violation or explain why it's necessary to ignore. - // eslint-disable-next-line @typescript-eslint/no-floating-promises - blockTracker?.destroy(); + await blockTracker?.destroy(); } } @@ -16694,14 +16692,14 @@ async function waitForPublishedEvents({ resolve(interestingEventPayloads); } else { reject( - // False positive - eventType is a string. - // eslint-disable-next-line @typescript-eslint/restrict-template-expressions - `Expected to receive ${expectedNumberOfEvents} ${eventType} event(s), but received ${ - interestingEventPayloads.length - } after ${timeBeforeAssumingNoMoreEvents}ms.\n\nAll payloads:\n\n${inspect( - allEventPayloads, - { depth: null }, - )}`, + new Error( + `Expected to receive ${expectedNumberOfEvents} ${String(eventType)} event(s), but received ${ + interestingEventPayloads.length + } after ${timeBeforeAssumingNoMoreEvents}ms.\n\nAll payloads:\n\n${inspect( + allEventPayloads, + { depth: null }, + )}`, + ), ); } alreadyEnded = true;