Use queue at top-level Ledger class API exclusively.

diff --git a/src/lib/ledger/connect.ts b/src/lib/ledger/connect.ts
index aeb463dd17542a766fbf61e80693d14d35675749..ec81e537df0d39c1ea694dba35521660819bac82 100644 (file)
--- a/src/lib/ledger/connect.ts
+++ b/src/lib/ledger/connect.ts
@@ -3,7 +3,6 @@
 
 import { LedgerStatus, LedgerTransport } from '.'
 import { _account } from './account'
-import { queue } from './queue'
 import { _version } from './version'
 
 /**
@@ -19,13 +18,13 @@ import { _version } from './version'
 export async function _connect (transport: LedgerTransport): Promise<LedgerStatus> {
        let status: LedgerStatus = 'DISCONNECTED'
        try {
-               const v = await queue(async () => _version(transport))
+               const v = await _version(transport)
                if (v.status === 'LOCKED_DEVICE') {
                        status = 'LOCKED'
                } else if (v.status !== 'OK') {
                        status = 'DISCONNECTED'
                } else if (v.name === 'Nano') {
-                       const a = await queue(async () => _account(transport))
+                       const a = await _account(transport)
                        if (a.status === 'OK') {
                                status = 'CONNECTED'
                        } else if (a.status === 'SECURITY_STATUS_NOT_SATISFIED') {

diff --git a/src/lib/ledger/index.ts b/src/lib/ledger/index.ts
index 3524adc16bc29c47c0a931a22ec0f35f61066cd0..9cffb6ff36e0d9513781712282973fc0f9ecb009 100644 (file)
--- a/src/lib/ledger/index.ts
+++ b/src/lib/ledger/index.ts
@@ -158,7 +158,7 @@ export class Ledger {
                                        : TransportUSB
                        }
                }
-               const status = await _connect(this.#transport)
+               const status = await queue(async () => _connect(this.#transport))
                this.#setStatus(status)
                if (!this.isUnsupported && !this.#isPolling) {
                        this.#isPolling = true