Skip to content

Commit a739b12

Browse files
committed
refactor(keyring-eth-ledger-bridge): fix new eslint errors
1 parent 0eca08d commit a739b12

9 files changed

+91
-81
lines changed
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
export * from './ledger-keyring';
22
export * from './ledger-iframe-bridge';
33
export * from './ledger-mobile-bridge';
4-
export * from './ledger-bridge';
4+
export type * from './ledger-bridge';
55
export * from './ledger-transport-middleware';
6-
export * from './type';
6+
export type * from './type';
77
export * from './ledger-hw-app';

packages/keyring-eth-ledger-bridge/src/ledger-hw-app.ts

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,8 @@
11
import LedgerHwAppEth from '@ledgerhq/hw-app-eth';
2-
// eslint-disable-next-line import/no-nodejs-modules
32
import { Buffer } from 'buffer';
43

54
import { GetAppNameAndVersionResponse } from './type';
65

7-
// eslint-disable-next-line @typescript-eslint/consistent-type-definitions
8-
export interface MetaMaskLedgerHwAppEth extends LedgerHwAppEth {
9-
openEthApp(): void;
10-
closeApps(): void;
11-
getAppNameAndVersion(): Promise<GetAppNameAndVersionResponse>;
12-
}
13-
146
export class MetaMaskLedgerHwAppEth
157
extends LedgerHwAppEth
168
implements MetaMaskLedgerHwAppEth

packages/keyring-eth-ledger-bridge/src/ledger-iframe-bridge.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ describe('LedgerIframeBridge', function () {
5151
function stubKeyringIFramePostMessage(
5252
bridgeInstance: LedgerIframeBridge,
5353
fn: (message: IFrameMessageResponse) => void,
54-
) {
54+
): void {
5555
if (!isIFrameValid(bridgeInstance.iframe)) {
5656
throw new Error('the iframe is not valid');
5757
}

packages/keyring-eth-ledger-bridge/src/ledger-iframe-bridge.ts

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export class LedgerIframeBridge
9696

9797
iframeLoaded = false;
9898

99-
#opts: LedgerIframeBridgeOptions;
99+
readonly #opts: LedgerIframeBridgeOptions;
100100

101101
eventListener?: (eventMessage: {
102102
origin: string;
@@ -121,15 +121,15 @@ export class LedgerIframeBridge
121121
};
122122
}
123123

124-
async init() {
124+
async init(): Promise<void> {
125125
await this.#setupIframe(this.#opts.bridgeUrl);
126126

127127
this.eventListener = this.#eventListener.bind(this, this.#opts.bridgeUrl);
128128

129129
window.addEventListener('message', this.eventListener);
130130
}
131131

132-
async destroy() {
132+
async destroy(): Promise<void> {
133133
if (this.eventListener) {
134134
window.removeEventListener('message', this.eventListener);
135135
}
@@ -158,7 +158,8 @@ export class LedgerIframeBridge
158158
if ('success' in response && response.success) {
159159
resolve(true);
160160
} else if ('error' in response) {
161-
reject(response.error);
161+
// Assuming this is using an `Error` type:
162+
reject(response.error as Error);
162163
} else {
163164
reject(new Error('Unknown error occurred'));
164165
}
@@ -249,7 +250,12 @@ export class LedgerIframeBridge
249250
| [IFrameMessageAction.LedgerSignTransaction, LedgerSignTransactionParams]
250251
| [IFrameMessageAction.LedgerSignPersonalMessage, LedgerSignMessageParams]
251252
| [IFrameMessageAction.LedgerSignTypedData, LedgerSignTypedDataParams]
252-
) {
253+
): Promise<
254+
| GetPublicKeyResponse
255+
| LedgerSignTransactionResponse
256+
| LedgerSignMessageResponse
257+
| LedgerSignTypedDataResponse
258+
> {
253259
return new Promise((resolve, reject) => {
254260
this.#sendMessage(
255261
{
@@ -276,15 +282,15 @@ export class LedgerIframeBridge
276282
this.iframe = document.createElement('iframe');
277283
this.iframe.src = bridgeUrl;
278284
this.iframe.allow = `hid 'src'`;
279-
this.iframe.onload = async () => {
285+
this.iframe.onload = async (): Promise<void> => {
280286
this.iframeLoaded = true;
281287
resolve();
282288
};
283289
document.head.appendChild(this.iframe);
284290
});
285291
}
286292

287-
#getOrigin(bridgeUrl: string) {
293+
#getOrigin(bridgeUrl: string): string {
288294
const tmp = bridgeUrl.split('/');
289295
tmp.splice(-1, 1);
290296
return tmp.join('/');
@@ -296,7 +302,7 @@ export class LedgerIframeBridge
296302
origin: string;
297303
data: IFrameMessageResponse;
298304
},
299-
) {
305+
): void {
300306
if (eventMessage.origin !== this.#getOrigin(bridgeUrl)) {
301307
return;
302308
}
@@ -317,7 +323,7 @@ export class LedgerIframeBridge
317323
#sendMessage<TAction extends IFrameMessageAction>(
318324
message: IFrameMessage<TAction>,
319325
callback: (response: IFrameMessageResponse) => void,
320-
) {
326+
): void {
321327
this.currentMessageId += 1;
322328

323329
const postMsg: IFramePostMessage<TAction> = {
@@ -328,7 +334,7 @@ export class LedgerIframeBridge
328334

329335
this.messageCallbacks[this.currentMessageId] = callback;
330336

331-
if (!this.iframeLoaded || !this.iframe || !this.iframe.contentWindow) {
337+
if (!this.iframeLoaded || !this.iframe?.contentWindow) {
332338
throw new Error('The iframe is not loaded yet');
333339
}
334340

packages/keyring-eth-ledger-bridge/src/ledger-keyring.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ describe('LedgerKeyring', function () {
9393
* @param accountIndex - The index of the account to unlock.
9494
* @returns Returns a promise that resolves when the keyring is unlocked.
9595
*/
96-
async function basicSetupToUnlockOneAccount(accountIndex = 0) {
96+
async function basicSetupToUnlockOneAccount(accountIndex = 0): Promise<void> {
9797
keyring.setAccountToUnlock(accountIndex);
9898
await keyring.addAccounts();
9999
jest

0 commit comments

Comments
 (0)