better types

MetaMask · May 4, 2023 · 6dfe796 · 6dfe796
1 parent 6f29029
commit 6dfe796
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 23 deletions.
diff --git a/src/ledger-iframe-bridge.test.ts b/src/ledger-iframe-bridge.test.ts
@@ -1,6 +1,9 @@
 import { hasProperty } from '@metamask/utils';
 
-import { LedgerIframeBridge } from './ledger-iframe-bridge';
+import {
+  IFrameMessageAction,
+  LedgerIframeBridge,
+} from './ledger-iframe-bridge';
 import documentShim from '../test/document.shim';
 import windowShim from '../test/window.shim';
 
@@ -113,14 +116,16 @@ describe('LedgerIframeBridge', function () {
     it('sends and processes a successful ledger-make-app message', async function () {
       stubKeyringIFramePostMessage(bridge, (message) => {
         expect(message).toStrictEqual({
-          action: 'ledger-make-app',
+          action: IFrameMessageAction.LedgerMakeApp,
           messageId: 1,
           target: 'LEDGER-IFRAME',
         });
 
         bridge.messageCallbacks[message.messageId]?.({
+          action: IFrameMessageAction.LedgerMakeApp,
+          messageId: 1,
           success: true,
-        } as any);
+        });
       });
 
       const result = await bridge.attemptMakeApp();
@@ -136,15 +141,17 @@ describe('LedgerIframeBridge', function () {
 
       stubKeyringIFramePostMessage(bridge, (message) => {
         expect(message).toStrictEqual({
-          action: 'ledger-make-app',
+          action: IFrameMessageAction.LedgerMakeApp,
           messageId: 1,
           target: 'LEDGER-IFRAME',
         });
 
         bridge.messageCallbacks[message.messageId]?.({
+          action: IFrameMessageAction.LedgerMakeApp,
+          messageId: 1,
           error: new Error(errorMessage),
           success: false,
-        } as any);
+        });
       });
 
       await expect(bridge.attemptMakeApp()).rejects.toThrow(errorMessage);
@@ -162,15 +169,17 @@ describe('LedgerIframeBridge', function () {
 
       stubKeyringIFramePostMessage(bridge, (message) => {
         expect(message).toStrictEqual({
-          action: 'ledger-update-transport',
+          action: IFrameMessageAction.LedgerUpdateTransport,
           params: { transportType },
           messageId: 1,
           target: 'LEDGER-IFRAME',
         });
 
         bridge.messageCallbacks[message.messageId]?.({
+          action: IFrameMessageAction.LedgerUpdateTransport,
+          messageId: 1,
           success: true,
-        } as any);
+        });
       });
 
       const result = await bridge.updateTransportMethod(transportType);
@@ -195,8 +204,10 @@ describe('LedgerIframeBridge', function () {
         });
 
         bridge.messageCallbacks[message.messageId]?.({
+          action: IFrameMessageAction.LedgerUpdateTransport,
+          messageId: 1,
           success: false,
-        } as any);
+        });
       });
 
       await expect(bridge.updateTransportMethod(transportType)).rejects.toThrow(

diff --git a/src/ledger-iframe-bridge.ts b/src/ledger-iframe-bridge.ts
@@ -15,7 +15,7 @@ import {
 
 const LEDGER_IFRAME_ID = 'LEDGER-IFRAME';
 
-enum IFrameMessageAction {
+export enum IFrameMessageAction {
   LedgerConnectionChange = 'ledger-connection-change',
   LedgerUnlock = 'ledger-unlock',
   LedgerMakeApp = 'ledger-make-app',
@@ -62,7 +62,7 @@ type IFrameMessageResponse = {
   success: boolean;
   action: IFrameMessageAction;
   messageId: number;
-  payload: IFrameMessageResponsePayload;
+  payload?: IFrameMessageResponsePayload;
   error?: unknown;
 };
 
@@ -250,6 +250,7 @@ export class LedgerIframeBridge implements LedgerBridge {
         messageCallback(params.data);
       } else if (
         params.data.action === IFrameMessageAction.LedgerConnectionChange &&
+        params.data.payload &&
         isConnectionChangedResponse(params.data.payload)
       ) {
         this.isDeviceConnected = params.data.payload.connected;

diff --git a/src/ledger-keyring.test.ts b/src/ledger-keyring.test.ts
@@ -93,19 +93,7 @@ describe('LedgerKeyring', function () {
   }
 
   beforeEach(async function () {
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
-    const noop = () => {};
-    bridge = {
-      init: noop,
-      destroy: noop,
-      attemptMakeApp: noop,
-      updateTransportMethod: noop,
-      getPublicKey: noop,
-      deviceSignTransaction: noop,
-      deviceSignMessage: noop,
-      deviceSignTypedData: noop,
-    } as any;
-
+    bridge = new LedgerIframeBridge();
     keyring = new LedgerKeyring({ bridge });
     keyring.hdk = fakeHdKey;
     await keyring.deserialize();