Skip to content

Commit

Permalink
testing
Browse files Browse the repository at this point in the history
  • Loading branch information
@adonesky1
adonesky1 committed Sep 24, 2024
1 parent 5bd5b81 commit ec130f0
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 129 deletions.
133 changes: 4 additions & 129 deletions packages/queued-request-controller/src/QueuedRequestController.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -654,132 +654,7 @@ describe('QueuedRequestController', () => {
});
});

// describe('when the network switch for a batch fails', () => {
// it('throws error', async () => {
// const switchError = new Error('switch error');
// const { messenger } = buildControllerMessenger({
// networkControllerGetState: jest.fn().mockReturnValue({
// ...getDefaultNetworkControllerState(),
// selectedNetworkClientId: 'selectedNetworkClientId',
// }),
// networkControllerSetActiveNetwork: jest
// .fn()
// .mockRejectedValue(switchError),
// selectedNetworkControllerGetNetworkClientIdForDomain: jest
// .fn()
// .mockImplementation((origin) =>
// origin === 'https://secondorigin.metamask.io'
// ? 'differentNetworkClientId'
// : 'selectedNetworkClientId',
// ),
// });
// const controller = buildQueuedRequestController({
// messenger: buildQueuedRequestControllerMessenger(messenger),
// shouldRequestSwitchNetwork: ({ method }) =>
// method === 'method_requiring_network_switch',
// });
// const firstRequest = controller.enqueueRequest(
// {
// ...buildRequest(),
// method: 'method_requiring_network_switch',
// origin: 'https://firstorigin.metamask.io',
// },
// () => new Promise((resolve) => setTimeout(resolve, 10)),
// );
// // ensure first request skips queue
// expect(controller.state.queuedRequestCount).toBe(0);
// const secondRequestNext = jest
// .fn()
// .mockImplementation(
// () => new Promise((resolve) => setTimeout(resolve, 100)),
// );
// const secondRequest = controller.enqueueRequest(
// {
// ...buildRequest(),
// method: 'method_requiring_network_switch',
// origin: 'https://secondorigin.metamask.io',
// },
// secondRequestNext,
// );
// // ensure test starts with one request queued up
// expect(controller.state.queuedRequestCount).toBe(1);
// expect(secondRequestNext).not.toHaveBeenCalled();

// await firstRequest;
// await expect(secondRequest).rejects.toThrow(switchError);
// });

// it('correctly processes the next item in the queue', async () => {
// const switchError = new Error('switch error');
// const { messenger } = buildControllerMessenger({
// networkControllerGetState: jest.fn().mockReturnValue({
// ...getDefaultNetworkControllerState(),
// selectedNetworkClientId: 'selectedNetworkClientId',
// }),
// networkControllerSetActiveNetwork: jest
// .fn()
// .mockRejectedValue(switchError),
// selectedNetworkControllerGetNetworkClientIdForDomain: jest
// .fn()
// .mockImplementation((origin) =>
// origin === 'https://secondorigin.metamask.io'
// ? 'differentNetworkClientId'
// : 'selectedNetworkClientId',
// ),
// });
// const controller = buildQueuedRequestController({
// messenger: buildQueuedRequestControllerMessenger(messenger),
// shouldRequestSwitchNetwork: ({ method }) =>
// method === 'method_requiring_network_switch',
// });
// const firstRequest = controller.enqueueRequest(
// {
// ...buildRequest(),
// method: 'method_requiring_network_switch',
// origin: 'https://firstorigin.metamask.io',
// },
// () => new Promise((resolve) => setTimeout(resolve, 10)),
// );
// // ensure first request skips queue
// expect(controller.state.queuedRequestCount).toBe(0);
// const secondRequestNext = jest
// .fn()
// .mockImplementation(
// () => new Promise((resolve) => setTimeout(resolve, 100)),
// );
// const secondRequest = controller.enqueueRequest(
// {
// ...buildRequest(),
// method: 'method_requiring_network_switch',
// origin: 'https://secondorigin.metamask.io',
// },
// secondRequestNext,
// );
// const thirdRequestNext = jest
// .fn()
// .mockImplementation(
// () => new Promise((resolve) => setTimeout(resolve, 100)),
// );
// const thirdRequest = controller.enqueueRequest(
// {
// ...buildRequest(),
// method: 'method_requiring_network_switch',
// origin: 'https://thirdorigin.metamask.io',
// },
// thirdRequestNext,
// );
// // ensure test starts with two requests queued up
// expect(controller.state.queuedRequestCount).toBe(2);
// expect(secondRequestNext).not.toHaveBeenCalled();

// await firstRequest;
// await expect(secondRequest).rejects.toThrow(switchError);
// await thirdRequest;

// expect(thirdRequestNext).toHaveBeenCalled();
// });
// });
describe('when the network switch for a batch fails', () => {
describe.only('when the network switch for a batch fails', () => {

Check failure on line 657 in packages/queued-request-controller/src/QueuedRequestController.test.ts

View workflow job for this annotation

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

Unexpected focused test
let mockSetActiveNetwork: jest.Mock;
let controller: QueuedRequestController;

Expand All @@ -795,8 +670,8 @@ describe('QueuedRequestController', () => {
.fn()
.mockImplementation((origin) =>
origin === 'https://secondorigin.metamask.io'
? 'differentNetworkClientId'
: 'selectedNetworkClientId',
? 'selectedNetworkClientId'
: 'differentNetworkClientId',
),
});
controller = buildQueuedRequestController({
Expand All @@ -806,7 +681,7 @@ describe('QueuedRequestController', () => {
});
});

it('throws error', async () => {
it.only('throws error', async () => {

Check failure on line 684 in packages/queued-request-controller/src/QueuedRequestController.test.ts

View workflow job for this annotation

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

Unexpected focused test
// const switchError = new Error('switch error');
mockSetActiveNetwork.mockRejectedValue(new Error('switch error'));

Expand Down
11 changes: 11 additions & 0 deletions packages/queued-request-controller/src/QueuedRequestController.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -307,6 +307,9 @@ export class QueuedRequestController extends BaseController<
'NetworkController:getState',
);

console.log('networkClientId', networkClientId);
console.log('selectedNetworkClientId', selectedNetworkClientId);

if (networkClientId === selectedNetworkClientId) {
return;
}
Expand Down Expand Up @@ -385,6 +388,14 @@ export class QueuedRequestController extends BaseController<
const isMultichainRequestToQueue =
this.#originOfCurrentBatch === request.origin &&
this.#networkClientIdOfCurrentBatch !== request.networkClientId;

// console.log('isMultichainRequestToQueue', isMultichainRequestToQueue);
console.log('request', request);
// console.log('this.#originOfCurrentBatch', this.#originOfCurrentBatch);
// console.log(
// 'this.#networkClientIdOfCurrentBatch',
// this.#networkClientIdOfCurrentBatch,
// );
try {
// Queue request for later processing
// Network switch is handled when this batch is processed
Expand Down

0 comments on commit ec130f0

Please sign in to comment.