From 73bc1ba22acc85526d8de5fbdd32396fba0e94a9 Mon Sep 17 00:00:00 2001 From: willclarktech Date: Tue, 6 Oct 2020 16:50:38 +0200 Subject: [PATCH] launchpad-ledger: Finish aligning Ledger transport names --- .../launchpad-ledger/src/ledgersigner.spec.ts | 16 ++++++++-------- packages/launchpad-ledger/src/ledgersigner.ts | 4 ++-- .../launchpad-ledger/types/ledgersigner.d.ts | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/launchpad-ledger/src/ledgersigner.spec.ts b/packages/launchpad-ledger/src/ledgersigner.spec.ts index 3ce47eea..a1e3a995 100644 --- a/packages/launchpad-ledger/src/ledgersigner.spec.ts +++ b/packages/launchpad-ledger/src/ledgersigner.spec.ts @@ -12,14 +12,14 @@ import { StdFee, } from "@cosmjs/launchpad"; import { assert, sleep } from "@cosmjs/utils"; -import LedgerTransport from "@ledgerhq/hw-transport"; +import Transport from "@ledgerhq/hw-transport"; import { LedgerSigner } from "./ledgersigner"; import { pendingWithoutLedger, pendingWithoutWasmd, wasmd } from "./testutils.spec"; const interactiveTimeout = 120_000; -async function createLedgerTransport(): Promise { +async function createTransport(): Promise { let platform: string; try { platform = navigator.platform; @@ -45,20 +45,20 @@ describe("LedgerSigner", () => { const defaultSequence = "0"; const defaultAccountNumber = "42"; const defaultRecipient = "cosmos1p6xs63q4g7np99ttv5nd3yzkt8n4qxa47w8aea"; - let ledgerTransport: LedgerTransport; + let transport: Transport; beforeEach(async () => { - ledgerTransport = await createLedgerTransport(); + transport = await createTransport(); }); afterEach(async () => { - await ledgerTransport.close(); + await transport.close(); }); describe("getAccount", () => { it("works", async () => { pendingWithoutLedger(); - const signer = new LedgerSigner(ledgerTransport, { + const signer = new LedgerSigner(transport, { testModeAllowed: true, hdPaths: [makeCosmoshubPath(0), makeCosmoshubPath(1), makeCosmoshubPath(10)], }); @@ -95,7 +95,7 @@ describe("LedgerSigner", () => { "returns valid signature", async () => { pendingWithoutLedger(); - const signer = new LedgerSigner(ledgerTransport, { + const signer = new LedgerSigner(transport, { testModeAllowed: true, hdPaths: [makeCosmoshubPath(0), makeCosmoshubPath(1), makeCosmoshubPath(10)], }); @@ -137,7 +137,7 @@ describe("LedgerSigner", () => { async () => { pendingWithoutLedger(); pendingWithoutWasmd(); - const signer = new LedgerSigner(ledgerTransport, { + const signer = new LedgerSigner(transport, { testModeAllowed: true, hdPaths: [makeCosmoshubPath(0), makeCosmoshubPath(1), makeCosmoshubPath(10)], }); diff --git a/packages/launchpad-ledger/src/ledgersigner.ts b/packages/launchpad-ledger/src/ledgersigner.ts index 7f74b9c0..f8ba9f32 100644 --- a/packages/launchpad-ledger/src/ledgersigner.ts +++ b/packages/launchpad-ledger/src/ledgersigner.ts @@ -7,7 +7,7 @@ import { StdSignDoc, } from "@cosmjs/launchpad"; import { serializeSignDoc, SignResponse } from "@cosmjs/launchpad"; -import LedgerTransport from "@ledgerhq/hw-transport"; +import Transport from "@ledgerhq/hw-transport"; import { LaunchpadLedger, LaunchpadLedgerOptions } from "./launchpadledger"; @@ -16,7 +16,7 @@ export class LedgerSigner implements OfflineSigner { private readonly hdPaths: readonly HdPath[]; private accounts?: readonly AccountData[]; - public constructor(transport: LedgerTransport, options: LaunchpadLedgerOptions = {}) { + public constructor(transport: Transport, options: LaunchpadLedgerOptions = {}) { this.hdPaths = options.hdPaths || [makeCosmoshubPath(0)]; this.ledger = new LaunchpadLedger(transport, options); } diff --git a/packages/launchpad-ledger/types/ledgersigner.d.ts b/packages/launchpad-ledger/types/ledgersigner.d.ts index 22f1302f..9c2c6c5d 100644 --- a/packages/launchpad-ledger/types/ledgersigner.d.ts +++ b/packages/launchpad-ledger/types/ledgersigner.d.ts @@ -1,13 +1,13 @@ /// import { AccountData, OfflineSigner, StdSignDoc } from "@cosmjs/launchpad"; import { SignResponse } from "@cosmjs/launchpad"; -import LedgerTransport from "@ledgerhq/hw-transport"; +import Transport from "@ledgerhq/hw-transport"; import { LaunchpadLedgerOptions } from "./launchpadledger"; export declare class LedgerSigner implements OfflineSigner { private readonly ledger; private readonly hdPaths; private accounts?; - constructor(transport: LedgerTransport, options?: LaunchpadLedgerOptions); + constructor(transport: Transport, options?: LaunchpadLedgerOptions); getAccounts(): Promise; sign(signerAddress: string, signDoc: StdSignDoc): Promise; }