Skip to content

Commit f070663

Browse files
authored
Remove all network-controller lint warnings (#7048)
Existing lint warnings within the `network-controller` package were making it difficult to identify new warnings. This commit resolves all of them. There should be no `network-controller` warnings listed in `eslint-warning-thresholds.json`.
1 parent cf5334f commit f070663

File tree

3 files changed

+12
-28
lines changed

3 files changed

+12
-28
lines changed

eslint-warning-thresholds.json

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -321,22 +321,6 @@
321321
"packages/name-controller/src/util.ts": {
322322
"jsdoc/require-returns": 1
323323
},
324-
"packages/network-controller/src/NetworkController.ts": {
325-
"@typescript-eslint/prefer-promise-reject-errors": 1
326-
},
327-
"packages/network-controller/tests/NetworkController.test.ts": {
328-
"@typescript-eslint/no-unused-vars": 1,
329-
"@typescript-eslint/prefer-promise-reject-errors": 1
330-
},
331-
"packages/network-controller/tests/create-network-client.test.ts": {
332-
"import-x/order": 1
333-
},
334-
"packages/network-controller/tests/provider-api-tests/helpers.ts": {
335-
"@typescript-eslint/prefer-promise-reject-errors": 1,
336-
"import-x/namespace": 1,
337-
"import-x/no-named-as-default-member": 1,
338-
"promise/catch-or-return": 1
339-
},
340324
"packages/permission-controller/src/PermissionController.test.ts": {
341325
"jest/no-conditional-in-test": 4
342326
},

packages/network-controller/src/NetworkController.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1893,6 +1893,8 @@ export class NetworkController extends BaseController<
18931893
{ method: 'eth_getBlockByNumber', params: ['latest', false] },
18941894
(error: unknown, block?: unknown) => {
18951895
if (error) {
1896+
// This error comes from JsonRpcEngine, we don't control it.
1897+
// eslint-disable-next-line @typescript-eslint/prefer-promise-reject-errors
18961898
reject(error);
18971899
} else {
18981900
// TODO: Validate this type

packages/network-controller/tests/NetworkController.test.ts

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3834,7 +3834,7 @@ describe('NetworkController', () => {
38343834
operation: async () => {
38353835
try {
38363836
await controller.getEIP1559Compatibility();
3837-
} catch (error) {
3837+
} catch {
38383838
// ignore error
38393839
}
38403840
},
@@ -16506,9 +16506,7 @@ async function withController<ReturnValue>(
1650616506
return await fn({ controller, messenger, networkControllerMessenger });
1650716507
} finally {
1650816508
const { blockTracker } = controller.getProviderAndBlockTracker();
16509-
// TODO: Either fix this lint violation or explain why it's necessary to ignore.
16510-
// eslint-disable-next-line @typescript-eslint/no-floating-promises
16511-
blockTracker?.destroy();
16509+
await blockTracker?.destroy();
1651216510
}
1651316511
}
1651416512

@@ -16694,14 +16692,14 @@ async function waitForPublishedEvents<E extends NetworkControllerEvents>({
1669416692
resolve(interestingEventPayloads);
1669516693
} else {
1669616694
reject(
16697-
// False positive - eventType is a string.
16698-
// eslint-disable-next-line @typescript-eslint/restrict-template-expressions
16699-
`Expected to receive ${expectedNumberOfEvents} ${eventType} event(s), but received ${
16700-
interestingEventPayloads.length
16701-
} after ${timeBeforeAssumingNoMoreEvents}ms.\n\nAll payloads:\n\n${inspect(
16702-
allEventPayloads,
16703-
{ depth: null },
16704-
)}`,
16695+
new Error(
16696+
`Expected to receive ${expectedNumberOfEvents} ${String(eventType)} event(s), but received ${
16697+
interestingEventPayloads.length
16698+
} after ${timeBeforeAssumingNoMoreEvents}ms.\n\nAll payloads:\n\n${inspect(
16699+
allEventPayloads,
16700+
{ depth: null },
16701+
)}`,
16702+
),
1670516703
);
1670616704
}
1670716705
alreadyEnded = true;

0 commit comments

Comments
 (0)