fixup! feat(request-manager): support external Tor

trezor · Dec 10, 2024 · d5dea91 · d5dea91
1 parent b60c7e9
commit d5dea91
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/packages/request-manager/src/controller.ts b/packages/request-manager/src/controller.ts
@@ -1,6 +1,7 @@
 import { EventEmitter } from 'events';
 import path from 'path';
 
+import { ScheduleActionParams, ScheduledAction, scheduleAction } from '@trezor/utils';
 import { checkFileExists } from '@trezor/node-utils';
 
 import { TorControlPort } from './torControlPort';
@@ -11,8 +12,6 @@ import {
     TOR_CONTROLLER_STATUS,
 } from './types';
 import { bootstrapParser, BOOTSTRAP_EVENT_PROGRESS } from './events/bootstrap';
-import { waitUntil } from './utils';
-import { ScheduleActionParams, ScheduledAction, scheduleAction } from '@trezor/utils';
 
 const WAITING_TIME = 1000;
 const MAX_TRIES_WAITING = 200;

diff --git a/packages/request-manager/src/controllerExternal.ts b/packages/request-manager/src/controllerExternal.ts
@@ -1,9 +1,9 @@
 import { EventEmitter } from 'events';
 
+import { ScheduleActionParams, ScheduledAction, scheduleAction } from '@trezor/utils';
 import { checkSocks5Proxy } from '@trezor/node-utils';
 
 import { TOR_CONTROLLER_STATUS, TorControllerStatus, TorExternalConnectionOptions } from './types';
-import { ScheduleActionParams, ScheduledAction, scheduleAction } from '@trezor/utils';
 
 const WAITING_TIME = 1_000;
 const MAX_TRIES_WAITING = 200;
@@ -55,8 +55,10 @@ export class TorControllerExternal extends EventEmitter {
             const isRunning = await this.getIsExternalTorRunning();
             if (isRunning) {
                 this.successfullyBootstrapped();
+
                 return true;
             }
+
             throw new Error('Tor external not alive');
         };
 
@@ -68,8 +70,10 @@ export class TorControllerExternal extends EventEmitter {
             attemptFailureHandler: () => {
                 if (this.getIsStopped()) {
                     abortController.abort();
+
                     return new Error('Operation stopped.');
                 }
+
                 return undefined;
             },
         };