Revert "chore: move fix EthErc4337Method -> EthMethod to a differ…

…ent PR" This reverts commit e5453e7.
MetaMask · May 22, 2024 · 0979eb6 · 0979eb6
1 parent e63451a
commit 0979eb6
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 25 deletions.
diff --git a/src/eth/types.test-d.ts b/src/eth/types.test-d.ts
@@ -5,7 +5,7 @@ import { EthAccountType } from '../api';
 import type { Extends } from '../utils';
 import { expectTrue } from '../utils';
 import type { EthEoaAccount, EthErc4337Account } from './types';
-import { EthMethod, EthErc4337Method } from './types';
+import { EthMethod } from './types';
 
 const id = '606a7759-b0fb-48e4-9874-bab62ff8e7eb';
 const address = '0x000';
@@ -42,9 +42,9 @@ expectNotAssignable<EthEoaAccount>({
   address,
   options: {},
   methods: [
-    `${EthErc4337Method.PrepareUserOperation}`,
-    `${EthErc4337Method.PatchUserOperation}`,
-    `${EthErc4337Method.SignUserOperation}`,
+    `${EthMethod.PrepareUserOperation}`,
+    `${EthMethod.PatchUserOperation}`,
+    `${EthMethod.SignUserOperation}`,
   ],
 });
 
@@ -55,9 +55,9 @@ expectNotAssignable<EthEoaAccount>({
   address,
   options: {},
   methods: [
-    `${EthErc4337Method.PrepareUserOperation}`,
-    `${EthErc4337Method.PatchUserOperation}`,
-    `${EthErc4337Method.SignUserOperation}`,
+    `${EthMethod.PrepareUserOperation}`,
+    `${EthMethod.PatchUserOperation}`,
+    `${EthMethod.SignUserOperation}`,
   ],
 });
 
@@ -82,9 +82,9 @@ expectAssignable<EthErc4337Account>({
     `${EthMethod.SignTypedDataV1}`,
     `${EthMethod.SignTypedDataV3}`,
     `${EthMethod.SignTypedDataV4}`,
-    `${EthErc4337Method.PrepareUserOperation}`,
-    `${EthErc4337Method.PatchUserOperation}`,
-    `${EthErc4337Method.SignUserOperation}`,
+    `${EthMethod.PrepareUserOperation}`,
+    `${EthMethod.PatchUserOperation}`,
+    `${EthMethod.SignUserOperation}`,
   ],
 });
 
@@ -95,9 +95,9 @@ expectNotAssignable<EthErc4337Account>({
   address,
   options: {},
   methods: [
-    `${EthErc4337Method.PrepareUserOperation}`,
-    `${EthErc4337Method.PatchUserOperation}`,
-    `${EthErc4337Method.SignUserOperation}`,
+    `${EthMethod.PrepareUserOperation}`,
+    `${EthMethod.PatchUserOperation}`,
+    `${EthMethod.SignUserOperation}`,
   ],
 });
 
@@ -108,9 +108,9 @@ expectNotAssignable<EthErc4337Account>({
   address,
   options: {},
   methods: [
-    `${EthErc4337Method.PrepareUserOperation}`,
-    `${EthErc4337Method.PatchUserOperation}`,
-    `${EthErc4337Method.SignUserOperation}`,
+    `${EthMethod.PrepareUserOperation}`,
+    `${EthMethod.PatchUserOperation}`,
+    `${EthMethod.SignUserOperation}`,
   ],
 });
 

diff --git a/src/eth/types.ts b/src/eth/types.ts
@@ -27,12 +27,6 @@ export enum EthMethod {
   SignTypedDataV1 = 'eth_signTypedData_v1',
   SignTypedDataV3 = 'eth_signTypedData_v3',
   SignTypedDataV4 = 'eth_signTypedData_v4',
-}
-
-/**
- * Supported Ethereum methods for ERC-4337 (Account Abstraction) accounts.
- */
-export enum EthErc4337Method {
   // ERC-4337 methods
   PrepareUserOperation = 'eth_prepareUserOperation',
   PatchUserOperation = 'eth_patchUserOperation',
@@ -93,9 +87,9 @@ export const EthErc4337AccountStruct = assign(
         `${EthMethod.SignTypedDataV1}`,
         `${EthMethod.SignTypedDataV3}`,
         `${EthMethod.SignTypedDataV4}`,
-        `${EthErc4337Method.PrepareUserOperation}`,
-        `${EthErc4337Method.PatchUserOperation}`,
-        `${EthErc4337Method.SignUserOperation}`,
+        `${EthMethod.PrepareUserOperation}`,
+        `${EthMethod.PatchUserOperation}`,
+        `${EthMethod.SignUserOperation}`,
       ]),
     ),
   }),