fix: clean up leftover ERC-4337 test/lint/changelog issues

- Remove obsolete SnapKeyring tests for prepareUserOperation,
  patchUserOperation, and signUserOperation, which no longer exist on
  the class and referenced the removed EthUserOperation type.
- Fix prettier formatting left over in eth-keyring-v1-adapter files.
- Reorder keyring-sdk changelog's Removed/Changed sections to match
  the Keep a Changelog category order enforced by auto-changelog.

Author: danroc

packages/keyring-sdk/CHANGELOG.md

@@ -12,16 +12,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add keyring state migration framework ([#505](https://github.com/MetaMask/accounts/pull/505))
   - Use `createMigrations().add(...)` to build a chain of versioned migration steps, and `.apply(state)` to migrate the internal state of keyrings
 
+### Changed
+
+- Bump `@metamask/keyring-api` from `^23.2.0` to `^23.5.0` ([#569](https://github.com/MetaMask/accounts/pull/569), [#583](https://github.com/MetaMask/accounts/pull/583), [#587](https://github.com/MetaMask/accounts/pull/587))
+
 ### Removed
 
 - **BREAKING:** Removed ERC-4337 (account abstraction) support ([#588](https://github.com/MetaMask/accounts/pull/588))
   - Removed `Eth4337Keyring` type from exports.
   - Removed `prepareUserOperation`, `patchUserOperation`, and `signUserOperation` methods from `EthKeyringV1Adapter` and the `BaseEthKeyring` type.
 
-### Changed
-
-- Bump `@metamask/keyring-api` from `^23.2.0` to `^23.5.0` ([#569](https://github.com/MetaMask/accounts/pull/569), [#583](https://github.com/MetaMask/accounts/pull/583), [#587](https://github.com/MetaMask/accounts/pull/587))
-
 ## [2.2.0]
 
 ### Added

packages/keyring-sdk/src/v2/eth/eth-keyring-v1-adapter.test.ts

@@ -2,10 +2,7 @@ import type { TypedTransaction, TypedTxData } from '@ethereumjs/tx';
 import { TransactionFactory } from '@ethereumjs/tx';
 import { SignTypedDataVersion } from '@metamask/eth-sig-util';
 import { EthAccountType, EthMethod, EthScope } from '@metamask/keyring-api';
-import type {
-  KeyringAccount,
-  KeyringRequest,
-} from '@metamask/keyring-api';
+import type { KeyringAccount, KeyringRequest } from '@metamask/keyring-api';
 import {
   AccountExportType,
   KeyringType,
@@ -556,5 +553,4 @@ describe('EthKeyringV1Adapter', () => {
       adapter.signMessage(ACCOUNT_ADDRESS as Hex, '0xdeadbeef'),
     ).rejects.toThrow('Expected a value of type');
   });
-
 });

packages/keyring-sdk/src/v2/eth/eth-keyring-v1-adapter.ts

@@ -7,10 +7,7 @@ import {
   EthBytesStruct,
   EthMethod,
 } from '@metamask/keyring-api';
-import type {
-  KeyringAccount,
-  KeyringRequest,
-} from '@metamask/keyring-api';
+import type { KeyringAccount, KeyringRequest } from '@metamask/keyring-api';
 import type { Keyring as KeyringV2 } from '@metamask/keyring-api/v2';
 import {
   AccountExportType,

packages/keyring-snap-bridge/src/SnapKeyring.test.ts

@@ -3478,40 +3478,5 @@ describe('SnapKeyring', () => {
       ).rejects.toThrow(`Snap '${v2SnapId}' does not support v1 signing`);
     });
 
-    it('prepareUserOperation throws for a v2 snap', async () => {
-      await expect(
-        v2Keyring.prepareUserOperation(
-          ethEoaAccount1.address,
-          [],
-          executionContext,
-        ),
-      ).rejects.toThrow(
-        `Snap '${v2SnapId}' does not support v1 prepareUserOperation`,
-      );
-    });
-
-    it('patchUserOperation throws for a v2 snap', async () => {
-      await expect(
-        v2Keyring.patchUserOperation(
-          ethEoaAccount1.address,
-          {} as EthUserOperation,
-          executionContext,
-        ),
-      ).rejects.toThrow(
-        `Snap '${v2SnapId}' does not support v1 patchUserOperation`,
-      );
-    });
-
-    it('signUserOperation throws for a v2 snap', async () => {
-      await expect(
-        v2Keyring.signUserOperation(
-          ethEoaAccount1.address,
-          {} as EthUserOperation,
-          executionContext,
-        ),
-      ).rejects.toThrow(
-        `Snap '${v2SnapId}' does not support v1 signUserOperation`,
-      );
-    });
   });
 });