Skip to content
Open
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
21 changes: 2 additions & 19 deletions oxlint-suppressions.json
Original file line number Diff line number Diff line change
Expand Up @@ -4232,11 +4232,6 @@
"count": 1
}
},
"packages/network-controller/jest.config.cjs": {
"import/unambiguous": {
"count": 1
}
},
"packages/network-controller/src/NetworkController.ts": {
"typescript/no-unsafe-assignment": {
"count": 1
Expand Down Expand Up @@ -4291,7 +4286,7 @@
"count": 1
},
"typescript/no-unsafe-argument": {
"count": 4
"count": 1
},
"typescript/no-unsafe-assignment": {
"count": 14
Expand Down Expand Up @@ -4321,16 +4316,10 @@
"count": 2
},
"typescript/no-unsafe-assignment": {
"count": 60
},
"typescript/no-unsafe-return": {
"count": 1
"count": 59
}
},
"packages/network-controller/tests/network-client/block-hash-in-response.ts": {
"typescript/no-unsafe-argument": {
"count": 4
},
"typescript/no-unsafe-assignment": {
"count": 14
},
Expand All @@ -4339,9 +4328,6 @@
}
},
"packages/network-controller/tests/network-client/block-param.ts": {
"typescript/no-unsafe-argument": {
"count": 4
},
"typescript/no-unsafe-assignment": {
"count": 25
},
Expand All @@ -4364,9 +4350,6 @@
}
},
"packages/network-controller/tests/network-client/no-block-param.ts": {
"typescript/no-unsafe-argument": {
"count": 4
},
"typescript/no-unsafe-assignment": {
"count": 16
},
Expand Down
32 changes: 0 additions & 32 deletions packages/network-controller/jest.config.cjs

This file was deleted.

20 changes: 6 additions & 14 deletions packages/network-controller/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -44,14 +44,10 @@
"messenger-action-types:check": "node --import ../../scripts/resolver/register.ts --experimental-transform-types ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --check",
"messenger-action-types:generate": "node --import ../../scripts/resolver/register.ts --experimental-transform-types ../../packages/messenger-cli/src/cli.ts --formatter oxfmt --esm --generate",
"since-latest-release": "../../scripts/since-latest-release.sh",
"test": "yarn test:unit && yarn test:types",
"test:clean": "yarn test:unit:clean && yarn test:types",
"test:types": "tstyche",
"test:unit": "NODE_OPTIONS=--experimental-vm-modules jest --reporters=jest-silent-reporter",
"test:unit:clean": "NODE_OPTIONS=--experimental-vm-modules jest --clearCache",
"test:unit:verbose": "NODE_OPTIONS=--experimental-vm-modules jest --verbose",
"test:verbose": "yarn test:unit:verbose && yarn test:types",
"test:watch": "NODE_OPTIONS=--experimental-vm-modules jest --watch"
"test": "vitest",
"test:clean": "vitest --clearCache",
"test:verbose": "vitest --reporter=verbose",
"test:watch": "vitest --watch"
},
"dependencies": {
"@metamask/analytics-controller": "^4.0.0",
Expand Down Expand Up @@ -89,18 +85,14 @@
"cockatiel": "^3.2.1",
"deep-freeze-strict": "^1.1.1",
"deepmerge": "^4.3.1",
"jest": "^30.5.2",
"jest-environment-jsdom": "^30.5.2",
"jest-when": "^4.0.3",
"lodash-es": "^4.18.1",
"nock": "^13.5.6",
"node-fetch": "^2.7.0",
"rimraf": "^6.1.3",
"ts-jest": "^29.4.14",
"tstyche": "^7.2.5",
"typedoc": "^0.28.20",
"typedoc-plugin-missing-exports": "^4.1.4",
"typescript": "npm:@typescript/typescript6@^6.0.2"
"typescript": "npm:@typescript/typescript6@^6.0.2",
"vitest": "^5.0.0"
},
"engines": {
"node": "^22.14.0 || ^24"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
import type { Infer } from '@metamask/superstruct';
import { describe, expect, test } from 'tstyche';
import { describe, expectTypeOf, test } from 'vitest';

import { NetworkController } from './NetworkController.js';
import type { NetworkState } from './NetworkController.js';

describe('NetworkController.struct', () => {
test('is assignable to the NetworkState type', () => {
expect<
expectTypeOf<
Infer<typeof NetworkController.struct>
>().type.toBeAssignableTo<NetworkState>();
>().toExtend<NetworkState>();
});
});
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { BUILT_IN_NETWORKS, NetworkType } from '@metamask/controller-utils';
import { PollingBlockTrackerOptions } from '@metamask/eth-block-tracker';
import { describe, expect, it, vi } from 'vitest';

import { buildNetworkControllerMessenger } from '../tests/helpers.js';
import { mockNetwork } from '../tests/mock-network.js';
Expand Down Expand Up @@ -141,7 +142,7 @@ describe('createAutoManagedNetworkClient', () => {
},
],
});
const createNetworkClientMock = jest.spyOn(
const createNetworkClientMock = vi.spyOn(
createNetworkClientModule,
'createNetworkClient',
);
Expand Down Expand Up @@ -206,7 +207,7 @@ describe('createAutoManagedNetworkClient', () => {
},
],
});
const createNetworkClientMock = jest.spyOn(
const createNetworkClientMock = vi.spyOn(
createNetworkClientModule,
'createNetworkClient',
);
Expand Down Expand Up @@ -281,7 +282,7 @@ describe('createAutoManagedNetworkClient', () => {
},
],
});
const createNetworkClientMock = jest.spyOn(
const createNetworkClientMock = vi.spyOn(
createNetworkClientModule,
'createNetworkClient',
);
Expand Down Expand Up @@ -463,7 +464,7 @@ describe('createAutoManagedNetworkClient', () => {
},
],
});
const createNetworkClientMock = jest.spyOn(
const createNetworkClientMock = vi.spyOn(
createNetworkClientModule,
'createNetworkClient',
);
Expand Down Expand Up @@ -524,7 +525,7 @@ describe('createAutoManagedNetworkClient', () => {
},
],
});
const createNetworkClientMock = jest.spyOn(
const createNetworkClientMock = vi.spyOn(
createNetworkClientModule,
'createNetworkClient',
);
Expand Down Expand Up @@ -593,7 +594,7 @@ describe('createAutoManagedNetworkClient', () => {
},
],
});
const createNetworkClientMock = jest.spyOn(
const createNetworkClientMock = vi.spyOn(
createNetworkClientModule,
'createNetworkClient',
);
Expand Down Expand Up @@ -664,7 +665,7 @@ describe('createAutoManagedNetworkClient', () => {
},
],
});
const createNetworkClientMock = jest.spyOn(
const createNetworkClientMock = vi.spyOn(
createNetworkClientModule,
'createNetworkClient',
);
Expand Down Expand Up @@ -739,7 +740,7 @@ describe('createAutoManagedNetworkClient', () => {
},
],
});
const createNetworkClientMock = jest.spyOn(
const createNetworkClientMock = vi.spyOn(
createNetworkClientModule,
'createNetworkClient',
);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { HttpError } from '@metamask/controller-utils';
import { FetchError } from 'node-fetch';
import { describe, expect, it } from 'vitest';

import { classifyRetryReason } from '../create-network-client.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe } from 'vitest';

import { testsForRpcMethodsThatCheckForBlockHashInResponse } from '../../../tests/network-client/block-hash-in-response.js';
import { NetworkClientType } from '../../types.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe } from 'vitest';

import { testsForRpcMethodSupportingBlockParam } from '../../../tests/network-client/block-param.js';
import { NetworkClientType } from '../../types.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe } from 'vitest';

import { testsForRpcMethodAssumingNoBlockParam } from '../../../tests/network-client/no-block-param.js';
import { NetworkClientType } from '../../types.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe } from 'vitest';

import { testsForRpcMethodNotHandledByMiddleware } from '../../../tests/network-client/not-handled-by-middleware.js';
import { NetworkClientType } from '../../types.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import {
withMockedCommunications,
withNetworkClient,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe } from 'vitest';

import { testsForRpcMethodAssumingNoBlockParam } from '../../../tests/network-client/no-block-param.js';
import { NetworkClientType } from '../../types.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe } from 'vitest';

import { testsForRpcMethodNotHandledByMiddleware } from '../../../tests/network-client/not-handled-by-middleware.js';
import { NetworkClientType } from '../../types.js';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
import { describe, expect, it } from 'vitest';

import { TESTNET } from '../../../tests/helpers.js';
import {
withMockedCommunications,
Expand Down
Loading
Loading