From 4d72f24fd5409a6eaf7dabfc1e2cfec7228a376a Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 18 Oct 2021 17:14:14 +1100 Subject: [PATCH] make sure test ip for snodes are random --- .../session/unit/onion/OnionErrors_test.ts | 23 +++---------------- ts/test/test-utils/utils/pubkey.ts | 5 ++-- 2 files changed, 6 insertions(+), 22 deletions(-) diff --git a/ts/test/session/unit/onion/OnionErrors_test.ts b/ts/test/session/unit/onion/OnionErrors_test.ts index 30db105ed..afc8b3be5 100644 --- a/ts/test/session/unit/onion/OnionErrors_test.ts +++ b/ts/test/session/unit/onion/OnionErrors_test.ts @@ -18,6 +18,7 @@ import AbortController from 'abort-controller'; import * as Data from '../../../../../ts/data/data'; import { pathFailureCount } from '../../../../session/onions/onionPath'; import { SeedNodeAPI } from '../../../../session/seed_node_api'; +import { generateFakeSnodeWithEdKey } from '../../../test-utils/utils'; chai.use(chaiAsPromised as any); chai.should(); @@ -63,8 +64,6 @@ describe('OnionPathsErrors', () => { fakeSwarmForAssociatedWith: Array; let oldOnionPaths: Array>; - const fakeIP = '8.8.8.8'; - let fakePortCurrent = 20000; beforeEach(async () => { guardPubkeys = TestUtils.generateFakePubKeys(3).map(n => n.key); @@ -72,26 +71,10 @@ describe('OnionPathsErrors', () => { SNodeAPI.Onions.resetSnodeFailureCount(); - guardNodesArray = guardPubkeys.map(ed25519 => { - fakePortCurrent++; - return { - ip: fakeIP, - port: fakePortCurrent, - pubkey_ed25519: ed25519, - pubkey_x25519: ed25519, - }; - }); + guardNodesArray = guardPubkeys.map(generateFakeSnodeWithEdKey); guardSnode1 = guardNodesArray[0]; - otherNodesArray = otherNodesPubkeys.map(ed25519 => { - fakePortCurrent++; - return { - ip: fakeIP, - port: fakePortCurrent, - pubkey_ed25519: ed25519, - pubkey_x25519: ed25519, - }; - }); + otherNodesArray = otherNodesPubkeys.map(generateFakeSnodeWithEdKey); fakeSnodePool = [...guardNodesArray, ...otherNodesArray]; diff --git a/ts/test/test-utils/utils/pubkey.ts b/ts/test/test-utils/utils/pubkey.ts index f78a5109b..62c3c7cf1 100644 --- a/ts/test/test-utils/utils/pubkey.ts +++ b/ts/test/test-utils/utils/pubkey.ts @@ -37,7 +37,8 @@ export function generateFakePubKeys(amount: number): Array { export function generateFakeSnode(): Snode { return { - ip: '136.243.103.171', + // tslint:disable: insecure-random + ip: `136.243.${Math.random() * 255}.${Math.random() * 255}`, port: 22116, pubkey_x25519: generateFakePubKeyStr(), pubkey_ed25519: generateFakePubKeyStr(), @@ -46,7 +47,7 @@ export function generateFakeSnode(): Snode { export function generateFakeSnodeWithEdKey(ed25519Pubkey: string): Snode { return { - ip: '136.243.103.171', + ip: `136.243.${Math.random() * 255}.${Math.random() * 255}`, port: 22116, pubkey_x25519: generateFakePubKeyStr(), pubkey_ed25519: ed25519Pubkey,