Skip to content

Commit c421ded

Browse files
FrederikBoldingFrederikBolding
committed
Start migrating simulation code
1 parent a0e9e5f commit c421ded

File tree

12 files changed

+100
-116
lines changed

12 files changed

+100
-116
lines changed

‎packages/snaps-controllers/src/cronjob/CronjobController.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { Messenger } from '@metamask/messenger';
21
import type {
32
ControllerGetStateAction,
43
ControllerStateChangeEvent,
54
} from '@metamask/base-controller/next';
65
import { BaseController } from '@metamask/base-controller/next';
6+
import type { Messenger } from '@metamask/messenger';
77
import type { GetPermissions } from '@metamask/permission-controller';
88
import {
99
getCronjobCaveatJobs,
@@ -214,9 +214,8 @@ export class CronjobController extends BaseController<
214214
this.#handleSnapUpdatedEvent,
215215
);
216216

217-
this.messenger.registerActionHandler(
218-
`${controllerName}:init`,
219-
(...args) => this.init(...args),
217+
this.messenger.registerActionHandler(`${controllerName}:init`, (...args) =>
218+
this.init(...args),
220219
);
221220

222221
this.messenger.registerActionHandler(
@@ -229,9 +228,8 @@ export class CronjobController extends BaseController<
229228
(...args) => this.cancel(...args),
230229
);
231230

232-
this.messenger.registerActionHandler(
233-
`${controllerName}:get`,
234-
(...args) => this.get(...args),
231+
this.messenger.registerActionHandler(`${controllerName}:get`, (...args) =>
232+
this.get(...args),
235233
);
236234
}
237235

‎packages/snaps-controllers/src/insights/SnapInsightsController.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
import type { Messenger } from '@metamask/messenger';
21
import type {
32
ControllerGetStateAction,
43
ControllerStateChangeEvent,
54
} from '@metamask/base-controller/next';
65
import { BaseController } from '@metamask/base-controller/next';
6+
import type { Messenger } from '@metamask/messenger';
77
import type {
88
Caveat,
99
GetPermissions,

‎packages/snaps-controllers/src/interface/SnapInterfaceController.test.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1617,7 +1617,7 @@ describe('SnapInterfaceController', () => {
16171617

16181618
// TODO: Either fix this lint violation or explain why it's necessary to
16191619
// ignore.
1620-
// eslint-disable-next-line @typescript-eslint/no-floating-promises
1620+
16211621
rootMessenger.call(
16221622
'SnapInterfaceController:resolveInterface',
16231623
MOCK_SNAP_ID,

‎packages/snaps-controllers/src/interface/SnapInterfaceController.ts‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ import type {
22
AcceptRequest,
33
HasApprovalRequest,
44
} from '@metamask/approval-controller';
5-
import type { Messenger } from '@metamask/messenger';
65
import type {
76
ControllerGetStateAction,
87
ControllerStateChangeEvent,
98
} from '@metamask/base-controller/next';
109
import { BaseController } from '@metamask/base-controller/next';
10+
import type { Messenger } from '@metamask/messenger';
1111
import type { TestOrigin } from '@metamask/phishing-controller';
1212
import type {
1313
InterfaceState,
@@ -437,8 +437,7 @@ export class SnapInterfaceController extends BaseController<
437437
* @returns True if the origin is on the phishing list, otherwise false.
438438
*/
439439
#checkPhishingList(origin: string) {
440-
return this.messenger.call('PhishingController:testOrigin', origin)
441-
.result;
440+
return this.messenger.call('PhishingController:testOrigin', origin).result;
442441
}
443442

444443
/**
@@ -461,11 +460,7 @@ export class SnapInterfaceController extends BaseController<
461460
* @param value - The value to resolve the promise with.
462461
*/
463462
async #acceptApprovalRequest(id: string, value: Json) {
464-
await this.messenger.call(
465-
'ApprovalController:acceptRequest',
466-
id,
467-
value,
468-
);
463+
await this.messenger.call('ApprovalController:acceptRequest', id, value);
469464
}
470465

471466
/**

‎packages/snaps-controllers/src/services/ExecutionService.ts‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -98,7 +98,5 @@ export type ExecutionServiceActions =
9898
export type ExecutionServiceMessenger = Messenger<
9999
'ExecutionService',
100100
ExecutionServiceActions,
101-
ExecutionServiceEvents,
102-
ExecutionServiceActions['type'],
103-
ExecutionServiceEvents['type']
101+
ExecutionServiceEvents
104102
>;

‎packages/snaps-controllers/src/snaps/SnapController.test.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11487,7 +11487,7 @@ describe('SnapController', () => {
1148711487

1148811488
// TODO: Either fix this lint violation or explain why it's necessary to
1148911489
// ignore.
11490-
// eslint-disable-next-line @typescript-eslint/await-thenable
11490+
1149111491
await messenger.call('SnapController:clearSnapState', MOCK_SNAP_ID, true);
1149211492

1149311493
jest.advanceTimersByTime(STATE_DEBOUNCE_TIMEOUT);
@@ -11614,7 +11614,7 @@ describe('SnapController', () => {
1161411614

1161511615
// TODO: Either fix this lint violation or explain why it's necessary to
1161611616
// ignore.
11617-
// eslint-disable-next-line @typescript-eslint/await-thenable
11617+
1161811618
const result = await messenger.call(
1161911619
'SnapController:getPermitted',
1162011620
mockSnap.origin,

‎packages/snaps-controllers/src/snaps/SnapController.ts‎

Lines changed: 18 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ import type {
22
AddApprovalRequest,
33
UpdateRequestState,
44
} from '@metamask/approval-controller';
5-
import type { Messenger } from '@metamask/messenger';
65
import type {
76
ControllerGetStateAction,
87
ControllerStateChangeEvent,
98
} from '@metamask/base-controller/next';
109
import { BaseController } from '@metamask/base-controller/next';
1110
import type { CryptographicFunctions } from '@metamask/key-tree';
11+
import type { Messenger } from '@metamask/messenger';
1212
import type {
1313
Caveat,
1414
GetEndowments,
@@ -1186,19 +1186,17 @@ export class SnapController extends BaseController<
11861186
* actions.
11871187
*/
11881188
#registerMessageHandlers(): void {
1189-
this.messenger.registerActionHandler(
1190-
`${controllerName}:init`,
1191-
(...args) => this.init(...args),
1189+
this.messenger.registerActionHandler(`${controllerName}:init`, (...args) =>
1190+
this.init(...args),
11921191
);
11931192

11941193
this.messenger.registerActionHandler(
11951194
`${controllerName}:clearSnapState`,
11961195
(...args) => this.clearSnapState(...args),
11971196
);
11981197

1199-
this.messenger.registerActionHandler(
1200-
`${controllerName}:get`,
1201-
(...args) => this.get(...args),
1198+
this.messenger.registerActionHandler(`${controllerName}:get`, (...args) =>
1199+
this.get(...args),
12021200
);
12031201

12041202
this.messenger.registerActionHandler(
@@ -1211,9 +1209,8 @@ export class SnapController extends BaseController<
12111209
async (...args) => this.handleRequest(...args),
12121210
);
12131211

1214-
this.messenger.registerActionHandler(
1215-
`${controllerName}:has`,
1216-
(...args) => this.has(...args),
1212+
this.messenger.registerActionHandler(`${controllerName}:has`, (...args) =>
1213+
this.has(...args),
12171214
);
12181215

12191216
this.messenger.registerActionHandler(
@@ -2331,10 +2328,7 @@ export class SnapController extends BaseController<
23312328

23322329
// If the snap has been fully installed before, also emit snapUninstalled.
23332330
if (snap.status !== SnapStatus.Installing) {
2334-
this.messenger.publish(
2335-
`SnapController:snapUninstalled`,
2336-
truncated,
2337-
);
2331+
this.messenger.publish(`SnapController:snapUninstalled`, truncated);
23382332
}
23392333
}),
23402334
);
@@ -2499,13 +2493,8 @@ export class SnapController extends BaseController<
24992493
* @param snapId - The snap ID.
25002494
*/
25012495
#revokeAllSnapPermissions(snapId: string) {
2502-
if (
2503-
this.messenger.call('PermissionController:hasPermissions', snapId)
2504-
) {
2505-
this.messenger.call(
2506-
'PermissionController:revokeAllPermissions',
2507-
snapId,
2508-
);
2496+
if (this.messenger.call('PermissionController:hasPermissions', snapId)) {
2497+
this.messenger.call('PermissionController:revokeAllPermissions', snapId);
25092498
}
25102499
}
25112500

@@ -2559,10 +2548,7 @@ export class SnapController extends BaseController<
25592548
*/
25602549
getPermittedSnaps(origin: string): RequestSnapsResult {
25612550
const permissions =
2562-
this.messenger.call(
2563-
'PermissionController:getPermissions',
2564-
origin,
2565-
) ?? {};
2551+
this.messenger.call('PermissionController:getPermissions', origin) ?? {};
25662552
const snaps =
25672553
permissions[WALLET_SNAP_PERMISSION_KEY]?.caveats?.find(
25682554
(caveat) => caveat.type === SnapCaveatType.SnapIds,
@@ -3144,13 +3130,10 @@ export class SnapController extends BaseController<
31443130

31453131
try {
31463132
const runtime = this.#getRuntimeExpect(snapId);
3147-
const result = await this.messenger.call(
3148-
'ExecutionService:executeSnap',
3149-
{
3150-
...snapData,
3151-
endowments: await this.#getEndowments(snapId),
3152-
},
3153-
);
3133+
const result = await this.messenger.call('ExecutionService:executeSnap', {
3134+
...snapData,
3135+
endowments: await this.#getEndowments(snapId),
3136+
});
31543137

31553138
this.#transition(snapId, SnapStatusEvents.Start);
31563139
// We treat the initialization of the snap as the first request, for idle timing purposes.
@@ -3489,9 +3472,7 @@ export class SnapController extends BaseController<
34893472
this._onOutboundResponse,
34903473
);
34913474

3492-
this.messenger.clearEventSubscriptions(
3493-
'SnapController:snapInstalled',
3494-
);
3475+
this.messenger.clearEventSubscriptions('SnapController:snapInstalled');
34953476

34963477
this.messenger.clearEventSubscriptions('SnapController:snapUpdated');
34973478
/* eslint-enable @typescript-eslint/unbound-method */
@@ -3750,11 +3731,7 @@ export class SnapController extends BaseController<
37503731
#assertInterfaceExists(snapId: SnapId, id: string) {
37513732
// This will throw if the interface isn't accessible, but we assert nevertheless.
37523733
assert(
3753-
this.messenger.call(
3754-
'SnapInterfaceController:getInterface',
3755-
snapId,
3756-
id,
3757-
),
3734+
this.messenger.call('SnapInterfaceController:getInterface', snapId, id),
37583735
);
37593736
}
37603737

@@ -4242,10 +4219,7 @@ export class SnapController extends BaseController<
42424219
>;
42434220
} {
42444221
const oldPermissions =
4245-
this.messenger.call(
4246-
'PermissionController:getPermissions',
4247-
snapId,
4248-
) ?? {};
4222+
this.messenger.call('PermissionController:getPermissions', snapId) ?? {};
42494223

42504224
const newPermissions = permissionsDiff(
42514225
desiredPermissionsSet,

‎packages/snaps-controllers/src/snaps/registry/json.ts‎

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ import type {
22
ControllerGetStateAction,
33
ControllerStateChangeEvent,
44
} from '@metamask/base-controller/next';
5-
import type { Messenger } from '@metamask/messenger';
65
import { BaseController } from '@metamask/base-controller/next';
6+
import type { Messenger } from '@metamask/messenger';
77
import type { SnapsRegistryDatabase } from '@metamask/snaps-registry';
88
import { verify } from '@metamask/snaps-registry';
99
import { getTargetVersion } from '@metamask/snaps-utils';
@@ -157,9 +157,8 @@ export class JsonSnapsRegistry extends BaseController<
157157
this.#refetchOnAllowlistMiss = refetchOnAllowlistMiss;
158158
this.#currentUpdate = null;
159159

160-
this.messenger.registerActionHandler(
161-
'SnapsRegistry:get',
162-
async (...args) => this.#get(...args),
160+
this.messenger.registerActionHandler('SnapsRegistry:get', async (...args) =>
161+
this.#get(...args),
163162
);
164163

165164
this.messenger.registerActionHandler(
@@ -172,9 +171,8 @@ export class JsonSnapsRegistry extends BaseController<
172171
async (...args) => this.#resolveVersion(...args),
173172
);
174173

175-
this.messenger.registerActionHandler(
176-
'SnapsRegistry:update',
177-
async () => this.#triggerUpdate(),
174+
this.messenger.registerActionHandler('SnapsRegistry:update', async () =>
175+
this.#triggerUpdate(),
178176
);
179177
}
180178

‎packages/snaps-controllers/src/test-utils/controller.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
import type { ApprovalRequest } from '@metamask/approval-controller';
2-
import type { Messenger } from '@metamask/messenger';
32
import {
43
encryptWithKey,
54
decryptWithKey,
@@ -9,6 +8,7 @@ import {
98
generateSalt,
109
isVaultUpdated,
1110
} from '@metamask/browser-passworder';
11+
import type { Messenger } from '@metamask/messenger';
1212
import type {
1313
PermissionConstraint,
1414
SubjectPermissions,

0 commit comments

Comments
 (0)