Merge branch 'main' into feat/keyring-controller-account-added

eslint-suppressions.json

@@ -108,29 +108,11 @@
       "count": 1
     }
   },
-  "packages/accounts-controller/src/AccountsController.test.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 14
-    },
-    "import-x/namespace": {
-      "count": 1
-    }
-  },
   "packages/accounts-controller/src/AccountsController.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 9
-    }
-  },
-  "packages/accounts-controller/src/tests/mocks.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 2
     }
   },
-  "packages/accounts-controller/src/utils.test.ts": {
-    "@typescript-eslint/explicit-function-return-type": {
-      "count": 3
-    }
-  },
   "packages/address-book-controller/src/AddressBookController.test.ts": {
     "@typescript-eslint/explicit-function-return-type": {
       "count": 1

packages/accounts-controller/src/AccountsController.test.ts

@@ -13,10 +13,7 @@ import {
   EthScope,
   KeyringAccountEntropyTypeOption,
 } from '@metamask/keyring-api';
-import {
-  KeyringControllerState,
-  KeyringTypes,
-} from '@metamask/keyring-controller';
+import { KeyringTypes } from '@metamask/keyring-controller';
 import type { InternalAccount } from '@metamask/keyring-internal-api';
 import { MOCK_ANY_NAMESPACE, Messenger } from '@metamask/messenger';
 import type {

packages/accounts-controller/src/AccountsController.ts

@@ -259,19 +259,6 @@ export const EMPTY_ACCOUNT = {
   },
 };
 
-/**
- * A patch representing a keyring state change.
- */
-type StatePatch = {
-  previous: Record<string, InternalAccount>;
-  added: {
-    address: string;
-    keyring: KeyringObject;
-  }[];
-  updated: InternalAccount[];
-  removed: InternalAccount[];
-};
-
 /**
  * Controller that manages internal accounts.
  * The accounts controller is responsible for creating and managing internal accounts.