Skip to content
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

fix(snaps): Add missing controller names to ControllersToInitialize #30301

Merged
merged 10 commits into from
Feb 17, 2025
Merged

fix(snaps): Add missing controller names to ControllersToInitialize #30301

Changes from 2 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
3de5365
add missing controller names to `ControllersToInitialize`
GuillaumeRx Feb 13, 2025
0e6c8cb
remove comment
GuillaumeRx Feb 13, 2025
0e75c59
add all the other controllers
GuillaumeRx Feb 13, 2025
df4acd8
add all controllers
GuillaumeRx Feb 14, 2025
61e7eac
use noop functions
GuillaumeRx Feb 14, 2025
9954390
lint
GuillaumeRx Feb 14, 2025
ac81a66
fix types
GuillaumeRx Feb 14, 2025
2e9767a
re-add cast
GuillaumeRx Feb 14, 2025
cbaaa9d
revert change
GuillaumeRx Feb 14, 2025
5c677c4
update tests
GuillaumeRx Feb 14, 2025
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
14 changes: 7 additions & 7 deletions app/scripts/controller-init/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,11 @@ type ControllerMessengerCallback = (
BaseControllerMessenger: BaseControllerMessenger,
) => BaseRestrictedControllerMessenger;

type ControllersToInitialize = 'PPOMController' | 'TransactionController';
type ControllersToInitialize =
| 'PPOMController'
| 'TransactionController'
| 'RateLimitController'
| 'SnapController';
GuillaumeRx marked this conversation as resolved.
Show resolved Hide resolved

type InitFunction<Name extends ControllersToInitialize> =
ControllerInitFunction<
Expand Down Expand Up @@ -101,7 +105,6 @@ export function initControllers({
const messengerCallbacks = CONTROLLER_MESSENGERS[controllerName];

const controllerMessengerCallback =
// @ts-expect-error TODO: Resolve mismatch between base-controller versions.
messengerCallbacks?.getMessenger as ControllerMessengerCallback;

const initMessengerCallback =
Expand All @@ -120,11 +123,8 @@ export function initControllers({
initMessenger,
};

// TODO: Remove @ts-expect-error once base-controller version mismatch is resolved
// Instead of suppressing all type errors, we'll be specific about the controllerMessenger mismatch
const result = initFunction({
...finalInitRequest,
// @ts-expect-error TODO: Resolve mismatch between base-controller versions.
controllerMessenger: finalInitRequest.controllerMessenger,
});

Expand All @@ -144,8 +144,8 @@ export function initControllers({
const memStateKey =
memStateKeyRaw === null ? undefined : memStateKeyRaw ?? controllerName;

partialControllersByName[controllerName] = controller as Controller &
undefined;
// @ts-expect-error: Union too complex.
partialControllersByName[controllerName] = controller;

controllerApi = {
...controllerApi,
Expand Down
Loading