From b13e9077538be45059289f39b2c4f772ea19c3f6 Mon Sep 17 00:00:00 2001 From: William Grant Date: Mon, 20 May 2024 16:20:09 +1000 Subject: [PATCH] fix: resolve cyclic imports in avatarplaceholder bt moving types from data module identitykey, guardnode, snode, swarmnode to a separate file --- .../dialog/OnionStatusPathDialog.tsx | 2 +- ts/data/data.ts | 24 +------------------ ts/data/types.ts | 22 +++++++++++++++++ ts/session/apis/seed_node_api/SeedNodeAPI.ts | 14 +++++------ ts/session/apis/snode_api/SNodeAPI.ts | 2 +- ts/session/apis/snode_api/batchRequest.ts | 2 +- ts/session/apis/snode_api/expireRequest.ts | 2 +- .../apis/snode_api/getExpiriesRequest.ts | 2 +- ts/session/apis/snode_api/getNetworkTime.ts | 4 ++-- .../apis/snode_api/getServiceNodesList.ts | 4 ++-- ts/session/apis/snode_api/getSwarmFor.ts | 4 ++-- ts/session/apis/snode_api/onions.ts | 2 +- ts/session/apis/snode_api/retrieveRequest.ts | 2 +- ts/session/apis/snode_api/sessionRpc.ts | 6 ++--- ts/session/apis/snode_api/snodePool.ts | 9 +++---- ts/session/apis/snode_api/storeMessage.ts | 6 ++--- ts/session/apis/snode_api/swarmPolling.ts | 3 ++- ts/session/onions/onionPath.ts | 13 +++++----- ts/session/onions/onionSend.ts | 2 +- ts/session/utils/Promise.ts | 3 ++- ts/test/session/unit/onion/GuardNodes_test.ts | 10 ++++---- .../session/unit/onion/OnionErrors_test.ts | 18 +++++++------- ts/test/session/unit/onion/OnionPaths_test.ts | 14 +++++------ .../session/unit/onion/SeedNodeAPI_test.ts | 10 ++++---- .../unit/onion/SnodePoolUpdate_test.ts | 10 ++++---- ts/test/test-utils/utils/pubkey.ts | 2 +- 26 files changed, 98 insertions(+), 94 deletions(-) create mode 100644 ts/data/types.ts diff --git a/ts/components/dialog/OnionStatusPathDialog.tsx b/ts/components/dialog/OnionStatusPathDialog.tsx index c44183776..d9dcaa706 100644 --- a/ts/components/dialog/OnionStatusPathDialog.tsx +++ b/ts/components/dialog/OnionStatusPathDialog.tsx @@ -8,7 +8,6 @@ import styled from 'styled-components'; import { isEmpty, isTypedArray } from 'lodash'; import { CityResponse, Reader } from 'maxmind'; import useMount from 'react-use/lib/useMount'; -import { Snode } from '../../data/data'; import { onionPathModal } from '../../state/ducks/modalDialog'; import { useFirstOnionPath, @@ -18,6 +17,7 @@ import { } from '../../state/selectors/onions'; import { Flex } from '../basic/Flex'; +import { Snode } from '../../data/types'; import { SessionWrapperModal } from '../SessionWrapperModal'; import { SessionIcon, SessionIconButton } from '../icon'; import { SessionSpinner } from '../loading'; diff --git a/ts/data/data.ts b/ts/data/data.ts index 524a8348b..db8a00f6e 100644 --- a/ts/data/data.ts +++ b/ts/data/data.ts @@ -25,34 +25,12 @@ import { channels } from './channels'; import * as dataInit from './dataInit'; import { cleanData } from './dataUtils'; import { SNODE_POOL_ITEM_ID } from './settings-key'; +import { GuardNode, Snode } from './types'; const ERASE_SQL_KEY = 'erase-sql-key'; const ERASE_ATTACHMENTS_KEY = 'erase-attachments'; const CLEANUP_ORPHANED_ATTACHMENTS_KEY = 'cleanup-orphaned-attachments'; -export type IdentityKey = { - id: string; - publicKey: ArrayBuffer; - firstUse: boolean; - nonblockingApproval: boolean; - secretKey?: string; // found in medium groups -}; - -export type GuardNode = { - ed25519PubKey: string; -}; - -export interface Snode { - ip: string; - port: number; - pubkey_x25519: string; - pubkey_ed25519: string; -} - -export type SwarmNode = Snode & { - address: string; -}; - // Basic async function shutdown(): Promise { // Stop accepting new SQL jobs, flush outstanding queue diff --git a/ts/data/types.ts b/ts/data/types.ts new file mode 100644 index 000000000..c4c3fbc65 --- /dev/null +++ b/ts/data/types.ts @@ -0,0 +1,22 @@ +export type IdentityKey = { + id: string; + publicKey: ArrayBuffer; + firstUse: boolean; + nonblockingApproval: boolean; + secretKey?: string; // found in medium groups +}; + +export type GuardNode = { + ed25519PubKey: string; +}; + +export interface Snode { + ip: string; + port: number; + pubkey_x25519: string; + pubkey_ed25519: string; +} + +export type SwarmNode = Snode & { + address: string; +}; diff --git a/ts/session/apis/seed_node_api/SeedNodeAPI.ts b/ts/session/apis/seed_node_api/SeedNodeAPI.ts index 899b26f4d..2b15c4df0 100644 --- a/ts/session/apis/seed_node_api/SeedNodeAPI.ts +++ b/ts/session/apis/seed_node_api/SeedNodeAPI.ts @@ -1,17 +1,17 @@ -import tls from 'tls'; import https from 'https'; +import _ from 'lodash'; +import tls from 'tls'; // eslint-disable-next-line import/no-named-default import { default as insecureNodeFetch } from 'node-fetch'; -import _ from 'lodash'; import pRetry from 'p-retry'; -import { sha256 } from '../../crypto'; -import { Constants } from '../..'; import { SeedNodeAPI } from '.'; -import { allowOnlyOneAtATime } from '../../utils/Promise'; -import { APPLICATION_JSON } from '../../../types/MIME'; +import { Constants } from '../..'; import { isLinux } from '../../../OS'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; +import { APPLICATION_JSON } from '../../../types/MIME'; +import { sha256 } from '../../crypto'; +import { allowOnlyOneAtATime } from '../../utils/Promise'; import { GetServicesNodesFromSeedRequest } from '../snode_api/SnodeRequestTypes'; /** diff --git a/ts/session/apis/snode_api/SNodeAPI.ts b/ts/session/apis/snode_api/SNodeAPI.ts index 91f214e7c..64b15d356 100644 --- a/ts/session/apis/snode_api/SNodeAPI.ts +++ b/ts/session/apis/snode_api/SNodeAPI.ts @@ -2,7 +2,7 @@ /* eslint-disable no-restricted-syntax */ import { compact, sample } from 'lodash'; import pRetry from 'p-retry'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; import { getSodiumRenderer } from '../../crypto'; import { StringUtils, UserUtils } from '../../utils'; import { ed25519Str, fromBase64ToArray, fromHexToArray } from '../../utils/String'; diff --git a/ts/session/apis/snode_api/batchRequest.ts b/ts/session/apis/snode_api/batchRequest.ts index 671f6da6f..a11e714b2 100644 --- a/ts/session/apis/snode_api/batchRequest.ts +++ b/ts/session/apis/snode_api/batchRequest.ts @@ -1,5 +1,5 @@ import { isArray } from 'lodash'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; import { SnodeResponseError } from '../../utils/errors'; import { processOnionRequestErrorAtDestination, SnodeResponse } from './onions'; import { snodeRpc } from './sessionRpc'; diff --git a/ts/session/apis/snode_api/expireRequest.ts b/ts/session/apis/snode_api/expireRequest.ts index 67418073d..2309ff100 100644 --- a/ts/session/apis/snode_api/expireRequest.ts +++ b/ts/session/apis/snode_api/expireRequest.ts @@ -11,7 +11,7 @@ import { uniqBy, } from 'lodash'; import pRetry from 'p-retry'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; import { getSodiumRenderer } from '../../crypto'; import { StringUtils, UserUtils } from '../../utils'; import { fromBase64ToArray, fromHexToArray } from '../../utils/String'; diff --git a/ts/session/apis/snode_api/getExpiriesRequest.ts b/ts/session/apis/snode_api/getExpiriesRequest.ts index 1b6cee6c8..0dda806ff 100644 --- a/ts/session/apis/snode_api/getExpiriesRequest.ts +++ b/ts/session/apis/snode_api/getExpiriesRequest.ts @@ -1,7 +1,7 @@ /* eslint-disable no-restricted-syntax */ import { isFinite, isNil, isNumber, sample } from 'lodash'; import pRetry from 'p-retry'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; import { UserUtils } from '../../utils'; import { EmptySwarmError } from '../../utils/errors'; import { SeedNodeAPI } from '../seed_node_api'; diff --git a/ts/session/apis/snode_api/getNetworkTime.ts b/ts/session/apis/snode_api/getNetworkTime.ts index 086d849b6..99f7c659b 100644 --- a/ts/session/apis/snode_api/getNetworkTime.ts +++ b/ts/session/apis/snode_api/getNetworkTime.ts @@ -5,9 +5,9 @@ */ import { isNumber } from 'lodash'; -import { Snode } from '../../../data/data'; -import { doSnodeBatchRequest } from './batchRequest'; +import { Snode } from '../../../data/types'; import { NetworkTimeSubRequest } from './SnodeRequestTypes'; +import { doSnodeBatchRequest } from './batchRequest'; function getNetworkTimeSubRequests(): Array { const request: NetworkTimeSubRequest = { method: 'info', params: {} }; diff --git a/ts/session/apis/snode_api/getServiceNodesList.ts b/ts/session/apis/snode_api/getServiceNodesList.ts index 8f35d8288..b2c4eeed5 100644 --- a/ts/session/apis/snode_api/getServiceNodesList.ts +++ b/ts/session/apis/snode_api/getServiceNodesList.ts @@ -1,10 +1,10 @@ import _, { intersectionWith, sampleSize } from 'lodash'; import { SnodePool } from '.'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; +import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { minSnodePoolCount, requiredSnodesForAgreement } from './snodePool'; -import { GetServiceNodesSubRequest } from './SnodeRequestTypes'; function buildSnodeListRequests(): Array { const request: GetServiceNodesSubRequest = { diff --git a/ts/session/apis/snode_api/getSwarmFor.ts b/ts/session/apis/snode_api/getSwarmFor.ts index 3b881e5e7..ae9453098 100644 --- a/ts/session/apis/snode_api/getSwarmFor.ts +++ b/ts/session/apis/snode_api/getSwarmFor.ts @@ -1,10 +1,10 @@ import { isArray } from 'lodash'; import pRetry from 'p-retry'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; +import { SwarmForSubRequest } from './SnodeRequestTypes'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; import { getRandomSnode } from './snodePool'; -import { SwarmForSubRequest } from './SnodeRequestTypes'; function buildSwarmForSubRequests(pubkey: string): Array { return [{ method: 'get_swarm', params: { pubkey } }]; diff --git a/ts/session/apis/snode_api/onions.ts b/ts/session/apis/snode_api/onions.ts index 68aacd51d..2b90217a5 100644 --- a/ts/session/apis/snode_api/onions.ts +++ b/ts/session/apis/snode_api/onions.ts @@ -14,7 +14,7 @@ import { OnionPaths } from '../../onions'; import { incrementBadPathCountOrDrop } from '../../onions/onionPath'; import { ed25519Str, toHex } from '../../utils/String'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; import { callUtilsWorker } from '../../../webworker/workers/browser/util_worker_interface'; import { encodeV4Request } from '../../onions/onionv4'; import { SnodeResponseError } from '../../utils/errors'; diff --git a/ts/session/apis/snode_api/retrieveRequest.ts b/ts/session/apis/snode_api/retrieveRequest.ts index f2f8569b0..ef4d7a0fc 100644 --- a/ts/session/apis/snode_api/retrieveRequest.ts +++ b/ts/session/apis/snode_api/retrieveRequest.ts @@ -1,5 +1,5 @@ import { isArray, omit } from 'lodash'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; import { updateIsOnline } from '../../../state/ducks/onion'; import { doSnodeBatchRequest } from './batchRequest'; import { GetNetworkTime } from './getNetworkTime'; diff --git a/ts/session/apis/snode_api/sessionRpc.ts b/ts/session/apis/snode_api/sessionRpc.ts index d4e986394..bd79521a6 100644 --- a/ts/session/apis/snode_api/sessionRpc.ts +++ b/ts/session/apis/snode_api/sessionRpc.ts @@ -1,14 +1,14 @@ import https from 'https'; +import { clone } from 'lodash'; // eslint-disable-next-line import/no-named-default import { default as insecureNodeFetch } from 'node-fetch'; -import { clone } from 'lodash'; import pRetry from 'p-retry'; +import { Snode } from '../../../data/types'; import { HTTPError, NotFoundError } from '../../utils/errors'; -import { Snode } from '../../../data/data'; -import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions'; import { APPLICATION_JSON } from '../../../types/MIME'; +import { ERROR_421_HANDLED_RETRY_REQUEST, Onions, snodeHttpsAgent, SnodeResponse } from './onions'; export interface LokiFetchOptions { method: 'GET' | 'POST'; diff --git a/ts/session/apis/snode_api/snodePool.ts b/ts/session/apis/snode_api/snodePool.ts index 20a029d2e..788b280e8 100644 --- a/ts/session/apis/snode_api/snodePool.ts +++ b/ts/session/apis/snode_api/snodePool.ts @@ -1,14 +1,15 @@ import _, { shuffle } from 'lodash'; import pRetry from 'p-retry'; -import { Data, Snode } from '../../../data/data'; +import { Data } from '../../../data/data'; +import { Snode } from '../../../data/types'; -import { OnionPaths } from '../../onions'; import { Onions, SnodePool } from '.'; +import { OnionPaths } from '../../onions'; +import { ed25519Str } from '../../utils/String'; import { SeedNodeAPI } from '../seed_node_api'; -import { requestSnodesForPubkeyFromNetwork } from './getSwarmFor'; import { ServiceNodesList } from './getServiceNodesList'; -import { ed25519Str } from '../../utils/String'; +import { requestSnodesForPubkeyFromNetwork } from './getSwarmFor'; /** * If we get less than this snode in a swarm, we fetch new snodes for this pubkey diff --git a/ts/session/apis/snode_api/storeMessage.ts b/ts/session/apis/snode_api/storeMessage.ts index 7517335f9..1328b8cb0 100644 --- a/ts/session/apis/snode_api/storeMessage.ts +++ b/ts/session/apis/snode_api/storeMessage.ts @@ -1,7 +1,5 @@ import { isEmpty } from 'lodash'; -import { Snode } from '../../../data/data'; -import { doSnodeBatchRequest } from './batchRequest'; -import { GetNetworkTime } from './getNetworkTime'; +import { Snode } from '../../../data/types'; import { DeleteByHashesFromNodeParams, DeleteFromNodeSubRequest, @@ -9,6 +7,8 @@ import { StoreOnNodeParams, StoreOnNodeSubRequest, } from './SnodeRequestTypes'; +import { doSnodeBatchRequest } from './batchRequest'; +import { GetNetworkTime } from './getNetworkTime'; function justStores(params: Array) { return params.map(p => { diff --git a/ts/session/apis/snode_api/swarmPolling.ts b/ts/session/apis/snode_api/swarmPolling.ts index c38fa5461..58de4af3e 100644 --- a/ts/session/apis/snode_api/swarmPolling.ts +++ b/ts/session/apis/snode_api/swarmPolling.ts @@ -2,7 +2,8 @@ /* eslint-disable more/no-then */ /* eslint-disable @typescript-eslint/no-misused-promises */ import { compact, concat, flatten, isEmpty, last, sample, toNumber, uniqBy } from 'lodash'; -import { Data, Snode } from '../../../data/data'; +import { Data } from '../../../data/data'; +import { Snode } from '../../../data/types'; import { SignalService } from '../../../protobuf'; import * as Receiver from '../../../receiver/receiver'; import { PubKey } from '../../types'; diff --git a/ts/session/onions/onionPath.ts b/ts/session/onions/onionPath.ts index 84b9d14a1..136d21bb2 100644 --- a/ts/session/onions/onionPath.ts +++ b/ts/session/onions/onionPath.ts @@ -5,15 +5,16 @@ import pRetry from 'p-retry'; // eslint-disable-next-line import/no-named-default import { default as insecureNodeFetch } from 'node-fetch'; -import { Data, Snode } from '../../data/data'; +import { OnionPaths } from '.'; +import { Data } from '../../data/data'; +import { Snode } from '../../data/types'; +import { updateOnionPaths } from '../../state/ducks/onion'; +import { APPLICATION_JSON } from '../../types/MIME'; +import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI'; +import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions'; import * as SnodePool from '../apis/snode_api/snodePool'; import { UserUtils } from '../utils'; -import { Onions, snodeHttpsAgent } from '../apis/snode_api/onions'; import { allowOnlyOneAtATime } from '../utils/Promise'; -import { updateOnionPaths } from '../../state/ducks/onion'; -import { ERROR_CODE_NO_CONNECT } from '../apis/snode_api/SNodeAPI'; -import { OnionPaths } from '.'; -import { APPLICATION_JSON } from '../../types/MIME'; import { ed25519Str } from '../utils/String'; const desiredGuardCount = 3; diff --git a/ts/session/onions/onionSend.ts b/ts/session/onions/onionSend.ts index 22dbf80a5..127f37428 100644 --- a/ts/session/onions/onionSend.ts +++ b/ts/session/onions/onionSend.ts @@ -3,7 +3,7 @@ import { toNumber } from 'lodash'; import pRetry from 'p-retry'; import { OnionPaths } from '.'; -import { Snode } from '../../data/data'; +import { Snode } from '../../data/types'; import { fileServerPubKey, fileServerURL } from '../apis/file_server_api/FileServerApi'; import { OpenGroupPollingUtils } from '../apis/open_group_api/opengroupV2/OpenGroupPollingUtils'; import { invalidAuthRequiresBlinding } from '../apis/open_group_api/opengroupV2/OpenGroupServerPoller'; diff --git a/ts/session/utils/Promise.ts b/ts/session/utils/Promise.ts index 087568e2b..bbde895ab 100644 --- a/ts/session/utils/Promise.ts +++ b/ts/session/utils/Promise.ts @@ -1,7 +1,8 @@ /* eslint-disable no-promise-executor-return */ /* eslint-disable no-async-promise-executor */ /* eslint-disable @typescript-eslint/no-misused-promises */ -import { Snode } from '../../data/data'; + +import { Snode } from '../../data/types'; type SimpleFunction = (arg: T) => void; type Return = Promise | T; diff --git a/ts/test/session/unit/onion/GuardNodes_test.ts b/ts/test/session/unit/onion/GuardNodes_test.ts index 9c731074d..cc0125fdf 100644 --- a/ts/test/session/unit/onion/GuardNodes_test.ts +++ b/ts/test/session/unit/onion/GuardNodes_test.ts @@ -1,19 +1,19 @@ import chai from 'chai'; -import Sinon, * as sinon from 'sinon'; -import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; +import { describe } from 'mocha'; +import Sinon, * as sinon from 'sinon'; -import { TestUtils } from '../../../test-utils'; +import { Snode } from '../../../../data/types'; import { Onions, SnodePool } from '../../../../session/apis/snode_api'; -import { Snode } from '../../../../data/data'; +import { TestUtils } from '../../../test-utils'; +import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import * as OnionPaths from '../../../../session/onions/onionPath'; import { generateFakeSnodes, generateFakeSnodeWithEdKey, stubData, } from '../../../test-utils/utils'; -import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; chai.use(chaiAsPromised as any); chai.should(); diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts index 38fd3553b..59c70ed04 100644 --- a/ts/test/session/unit/onion/OnionErrors_test.ts +++ b/ts/test/session/unit/onion/OnionErrors_test.ts @@ -1,24 +1,24 @@ +import AbortController from 'abort-controller'; import chai from 'chai'; -import Sinon, * as sinon from 'sinon'; -import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; -import AbortController from 'abort-controller'; +import { describe } from 'mocha'; +import Sinon, * as sinon from 'sinon'; -import { TestUtils } from '../../../test-utils'; import * as SnodeAPI from '../../../../session/apis/snode_api'; +import { TestUtils } from '../../../test-utils'; -import { OnionPaths } from '../../../../session/onions'; +import { SNODE_POOL_ITEM_ID } from '../../../../data/settings-key'; +import { Snode } from '../../../../data/types'; +import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; +import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList'; import { NEXT_NODE_NOT_FOUND_PREFIX, Onions, OXEN_SERVER_ERROR, } from '../../../../session/apis/snode_api/onions'; -import { Snode } from '../../../../data/data'; +import { OnionPaths } from '../../../../session/onions'; import { pathFailureCount } from '../../../../session/onions/onionPath'; -import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import { generateFakeSnodeWithEdKey, stubData } from '../../../test-utils/utils'; -import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList'; -import { SNODE_POOL_ITEM_ID } from '../../../../data/settings-key'; chai.use(chaiAsPromised as any); chai.should(); diff --git a/ts/test/session/unit/onion/OnionPaths_test.ts b/ts/test/session/unit/onion/OnionPaths_test.ts index c30b8517e..7f2a70bf1 100644 --- a/ts/test/session/unit/onion/OnionPaths_test.ts +++ b/ts/test/session/unit/onion/OnionPaths_test.ts @@ -1,21 +1,21 @@ import chai from 'chai'; -import Sinon from 'sinon'; +import chaiAsPromised from 'chai-as-promised'; import _ from 'lodash'; import { describe } from 'mocha'; -import chaiAsPromised from 'chai-as-promised'; +import Sinon from 'sinon'; -import { TestUtils } from '../../../test-utils'; import * as SNodeAPI from '../../../../session/apis/snode_api'; +import { TestUtils } from '../../../test-utils'; +import { GuardNode, Snode } from '../../../../data/types'; +import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; +import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList'; import * as OnionPaths from '../../../../session/onions/onionPath'; -import { GuardNode, Snode } from '../../../../data/data'; import { - generateFakeSnodes, generateFakeSnodeWithEdKey, + generateFakeSnodes, stubData, } from '../../../test-utils/utils'; -import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; -import { ServiceNodesList } from '../../../../session/apis/snode_api/getServiceNodesList'; chai.use(chaiAsPromised as any); chai.should(); diff --git a/ts/test/session/unit/onion/SeedNodeAPI_test.ts b/ts/test/session/unit/onion/SeedNodeAPI_test.ts index 4d2d335c8..2a35192d0 100644 --- a/ts/test/session/unit/onion/SeedNodeAPI_test.ts +++ b/ts/test/session/unit/onion/SeedNodeAPI_test.ts @@ -1,16 +1,16 @@ import chai from 'chai'; -import Sinon from 'sinon'; import chaiAsPromised from 'chai-as-promised'; import { describe } from 'mocha'; +import Sinon from 'sinon'; -import { TestUtils } from '../../../test-utils'; import { Onions, SnodePool } from '../../../../session/apis/snode_api'; +import { TestUtils } from '../../../test-utils'; -import * as OnionPaths from '../../../../session/onions/onionPath'; -import { generateFakeSnodes, generateFakeSnodeWithEdKey } from '../../../test-utils/utils'; +import { Snode } from '../../../../data/types'; import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import { SnodeFromSeed } from '../../../../session/apis/seed_node_api/SeedNodeAPI'; -import { Snode } from '../../../../data/data'; +import * as OnionPaths from '../../../../session/onions/onionPath'; +import { generateFakeSnodes, generateFakeSnodeWithEdKey } from '../../../test-utils/utils'; chai.use(chaiAsPromised as any); chai.should(); diff --git a/ts/test/session/unit/onion/SnodePoolUpdate_test.ts b/ts/test/session/unit/onion/SnodePoolUpdate_test.ts index f3d9f950a..7f6d8cdde 100644 --- a/ts/test/session/unit/onion/SnodePoolUpdate_test.ts +++ b/ts/test/session/unit/onion/SnodePoolUpdate_test.ts @@ -1,19 +1,19 @@ import chai from 'chai'; -import Sinon, * as sinon from 'sinon'; -import { describe } from 'mocha'; import chaiAsPromised from 'chai-as-promised'; +import { describe } from 'mocha'; +import Sinon, * as sinon from 'sinon'; -import { TestUtils } from '../../../test-utils'; +import { Snode } from '../../../../data/types'; import { Onions, SnodePool } from '../../../../session/apis/snode_api'; -import { Snode } from '../../../../data/data'; +import { TestUtils } from '../../../test-utils'; +import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; import * as OnionPaths from '../../../../session/onions/onionPath'; import { generateFakeSnodes, generateFakeSnodeWithEdKey, stubData, } from '../../../test-utils/utils'; -import { SeedNodeAPI } from '../../../../session/apis/seed_node_api'; chai.use(chaiAsPromised as any); chai.should(); diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index 617473ce2..430f6a336 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -1,6 +1,6 @@ import * as crypto from 'crypto'; import _ from 'lodash'; -import { Snode } from '../../../data/data'; +import { Snode } from '../../../data/types'; import { ECKeyPair } from '../../../receiver/keypairs'; import { PubKey } from '../../../session/types';