Skip to content

chore(network-enablement-controller): replace Sinon with Jest fake timers #7971

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cryptodev-2s merged 1 commit into from
Feb 18, 2026
+21 −26
Merged

chore(network-enablement-controller): replace Sinon with Jest fake timers #7971

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 0 additions & 1 deletion packages/network-enablement-controller/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@
"@types/jest": "^29.5.14",
"deepmerge": "^4.2.2",
"jest": "^29.7.0",
"sinon": "^9.2.4",
"ts-jest": "^29.2.5",
"typedoc": "^0.25.13",
"typedoc-plugin-missing-exports": "^2.0.0",
Expand Down
45 changes: 21 additions & 24 deletions packages/network-enablement-controller/src/NetworkEnablementController.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ import { TransactionStatus } from '@metamask/transaction-controller';
import type { TransactionMeta } from '@metamask/transaction-controller';
import { KnownCaipNamespace } from '@metamask/utils';
import type { CaipChainId, CaipNamespace, Hex } from '@metamask/utils';
import { useFakeTimers } from 'sinon';

import { POPULAR_NETWORKS } from './constants';
import { NetworkEnablementController } from './NetworkEnablementController';
Expand All @@ -22,7 +21,7 @@ import type {
NativeAssetIdentifiersMap,
} from './NetworkEnablementController';
import { Slip44Service } from './services';
import { advanceTime } from '../../../tests/helpers';
import { jestAdvanceTime } from '../../../tests/helpers';

// Known chainId mappings from chainid.network for mocking
const chainIdToSlip44: Record<number, number> = {
Expand Down Expand Up @@ -142,10 +141,8 @@ const setupController = ({
};

describe('NetworkEnablementController', () => {
let clock: sinon.SinonFakeTimers;

beforeEach(() => {
clock = useFakeTimers();
jest.useFakeTimers({ doNotFake: ['nextTick', 'queueMicrotask'] });
// Mock Slip44Service.getEvmSlip44 to avoid network calls
jest
.spyOn(Slip44Service, 'getEvmSlip44')
Expand All @@ -155,7 +152,7 @@ describe('NetworkEnablementController', () => {
});

afterEach(() => {
clock.restore();
jest.useRealTimers();
jest.restoreAllMocks();
});

Expand Down Expand Up @@ -215,7 +212,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

expect(controller.state).toStrictEqual({
enabledNetworkMap: {
Expand Down Expand Up @@ -272,7 +269,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Create expected nativeAssetIdentifiers without Linea
const expectedNativeAssetIdentifiers = {
Expand Down Expand Up @@ -334,7 +331,7 @@ describe('NetworkEnablementController', () => {
} as TransactionMeta, // Simplified structure for testing
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// State should remain unchanged
expect(controller.state).toStrictEqual(initialState);
Expand All @@ -351,7 +348,7 @@ describe('NetworkEnablementController', () => {
// Missing transactionMeta entirely
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// State should remain unchanged
expect(controller.state).toStrictEqual(initialState);
Expand All @@ -368,7 +365,7 @@ describe('NetworkEnablementController', () => {
transactionMeta: null,
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// State should remain unchanged
expect(controller.state).toStrictEqual(initialState);
Expand All @@ -379,7 +376,7 @@ describe('NetworkEnablementController', () => {
transactionMeta: undefined,
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// State should still remain unchanged
expect(controller.state).toStrictEqual(initialState);
Expand Down Expand Up @@ -413,7 +410,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Create expected nativeAssetIdentifiers without Linea
const expectedNativeAssetIdentifiersForFallback = {
Expand Down Expand Up @@ -1382,7 +1379,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// The added network should be enabled (exclusive behavior of network addition)
expect(controller.isNetworkEnabled('0x2')).toBe(true);
Expand Down Expand Up @@ -1546,7 +1543,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

expect(controller.state).toStrictEqual({
enabledNetworkMap: {
Expand Down Expand Up @@ -1767,7 +1764,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

expect(controller.state).toStrictEqual({
enabledNetworkMap: {
Expand Down Expand Up @@ -2046,7 +2043,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Now it should be added but not enabled (keeps current selection in popular mode)
expect(controller.isNetworkEnabled('0xa86a')).toBe(true);
Expand Down Expand Up @@ -2087,7 +2084,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Bitcoin should be enabled, all others should be disabled due to exclusive behavior
expect(
Expand Down Expand Up @@ -2294,7 +2291,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Bitcoin testnet should be enabled, others should be disabled (exclusive behavior across all namespaces)
expect(controller.isNetworkEnabled(BtcScope.Testnet)).toBe(true);
Expand Down Expand Up @@ -2528,7 +2525,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Tron Nile should be enabled, others should be disabled (exclusive behavior across all namespaces)
expect(controller.isNetworkEnabled(TrxScope.Nile)).toBe(true);
Expand Down Expand Up @@ -2904,7 +2901,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Should switch to Avalanche (disable all others, enable Avalanche)
expect(controller.isNetworkEnabled('0xa86a')).toBe(true);
Expand Down Expand Up @@ -2937,7 +2934,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Should switch to the non-popular network (disable all others, enable new one)
expect(controller.isNetworkEnabled('0x999')).toBe(true);
Expand Down Expand Up @@ -2970,7 +2967,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Should keep current selection (add Polygon but don't enable it)
expect(controller.isNetworkEnabled('0x89')).toBe(true); // Polygon enabled
Expand Down Expand Up @@ -3004,7 +3001,7 @@ describe('NetworkEnablementController', () => {
],
});

await advanceTime({ clock, duration: 1 });
await jestAdvanceTime({ duration: 1 });

// Should switch to Avalanche since we're not in popular networks mode (2 ≤ 2, not >2)
expect(controller.isNetworkEnabled('0xa86a')).toBe(true);
Expand Down
1 change: 0 additions & 1 deletion yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4221,7 +4221,6 @@ __metadata:
deepmerge: "npm:^4.2.2"
jest: "npm:^29.7.0"
reselect: "npm:^5.1.1"
sinon: "npm:^9.2.4"
ts-jest: "npm:^29.2.5"
typedoc: "npm:^0.25.13"
typedoc-plugin-missing-exports: "npm:^2.0.0"
Expand Down
Loading