Skip to content

Commit 514f11a

Browse files
tegefaulkestegefaulkes
committed
tests: fixed up tests to use testNetworkName for the network
1 parent e346d2d commit 514f11a

15 files changed

+237
-198
lines changed

‎tests/PolykeyAgent.test.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ import config from '@/config';
1212
import { promise } from '@/utils';
1313
import * as keysUtils from '@/keys/utils';
1414
import * as keysEvents from '@/keys/events';
15+
import * as testsUtils from './utils';
1516

1617
describe('PolykeyAgent', () => {
1718
const password = 'password';
@@ -37,6 +38,7 @@ describe('PolykeyAgent', () => {
3738
password,
3839
options: {
3940
nodePath,
41+
network: testsUtils.testNetworkName,
4042
agentServiceHost: localhost,
4143
clientServiceHost: localhost,
4244
keys: {
@@ -64,6 +66,7 @@ describe('PolykeyAgent', () => {
6466
password,
6567
options: {
6668
nodePath,
69+
network: testsUtils.testNetworkName,
6770
workers: 0,
6871
agentServiceHost: localhost,
6972
clientServiceHost: localhost,
@@ -108,6 +111,7 @@ describe('PolykeyAgent', () => {
108111
password,
109112
options: {
110113
nodePath,
114+
network: testsUtils.testNetworkName,
111115
agentServiceHost: localhost,
112116
clientServiceHost: localhost,
113117
keys: {
@@ -147,6 +151,7 @@ describe('PolykeyAgent', () => {
147151
password,
148152
options: {
149153
nodePath,
154+
network: testsUtils.testNetworkName,
150155
agentServiceHost: localhost,
151156
clientServiceHost: localhost,
152157
keys: {
@@ -178,6 +183,7 @@ describe('PolykeyAgent', () => {
178183
password,
179184
options: {
180185
nodePath,
186+
network: testsUtils.testNetworkName,
181187
agentServiceHost: localhost,
182188
clientServiceHost: localhost,
183189
keys: {
@@ -203,6 +209,7 @@ describe('PolykeyAgent', () => {
203209
password,
204210
options: {
205211
nodePath,
212+
network: testsUtils.testNetworkName,
206213
agentServiceHost: localhost,
207214
clientServiceHost: localhost,
208215
keys: {
@@ -223,6 +230,7 @@ describe('PolykeyAgent', () => {
223230
password,
224231
options: {
225232
nodePath,
233+
network: testsUtils.testNetworkName,
226234
agentServiceHost: localhost,
227235
clientServiceHost: localhost,
228236
keys: {
@@ -258,6 +266,7 @@ describe('PolykeyAgent', () => {
258266
password,
259267
options: {
260268
nodePath,
269+
network: testsUtils.testNetworkName,
261270
agentServiceHost: localhost,
262271
clientServiceHost: localhost,
263272
keys: {
@@ -293,6 +302,7 @@ describe('PolykeyAgent', () => {
293302
password,
294303
options: {
295304
nodePath,
305+
network: testsUtils.testNetworkName,
296306
agentServiceHost: localhost,
297307
clientServiceHost: localhost,
298308
keys: {

‎tests/PolykeyClient.test.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import * as keysUtils from '@/keys/utils';
1919
import * as errors from '@/errors';
2020
import * as events from '@/events';
2121
import * as utils from '@/utils';
22-
import * as testUtils from './utils';
22+
import * as testsUtils from './utils';
2323

2424
describe(PolykeyClient.name, () => {
2525
const logger = new Logger(`${PolykeyClient.name} Test`, LogLevel.WARN, [
@@ -96,6 +96,7 @@ describe(PolykeyClient.name, () => {
9696
password,
9797
options: {
9898
nodePath,
99+
network: testsUtils.testNetworkName,
99100
agentServiceHost: localHost,
100101
clientServiceHost: localHost,
101102
keys: {
@@ -201,7 +202,7 @@ describe(PolykeyClient.name, () => {
201202
const callP = pkClient.rpcClient.methods.agentStatus({});
202203
// Authentication error
203204
await expect(callP).rejects.toThrow(errors.ErrorPolykeyRemote);
204-
await testUtils.expectRemoteError(callP, errors.ErrorClientAuthMissing);
205+
await testsUtils.expectRemoteError(callP, errors.ErrorClientAuthMissing);
205206
// Correct auth runs without error
206207
await pkClient.rpcClient.methods.agentStatus({
207208
metadata: {

‎tests/client/handlers/agent.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,7 @@ describe('agentStatus', () => {
150150
password,
151151
options: {
152152
nodePath,
153+
network: testsUtils.testNetworkName,
153154
keys: {
154155
passwordOpsLimit: keysUtils.passwordOpsLimits.min,
155156
passwordMemLimit: keysUtils.passwordMemLimits.min,
@@ -268,6 +269,7 @@ describe('agentStop', () => {
268269
password,
269270
options: {
270271
nodePath,
272+
network: testsUtils.testNetworkName,
271273
keys: {
272274
passwordOpsLimit: keysUtils.passwordOpsLimits.min,
273275
passwordMemLimit: keysUtils.passwordMemLimits.min,

‎tests/client/handlers/gestalts.test.ts‎

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -452,6 +452,14 @@ describe('gestaltsDiscoveryByIdentity', () => {
452452
connectionConnectTimeoutTime: 2000,
453453
connectionIdleTimeoutTimeMin: 2000,
454454
connectionIdleTimeoutTimeScale: 0,
455+
authenticateNetworkForwardCallback:
456+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
457+
testsUtils.testNetworkName,
458+
),
459+
authenticateNetworkReverseCallback:
460+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
461+
testsUtils.testNetworkName,
462+
),
455463
logger: logger.getChild('NodeConnectionManager'),
456464
});
457465
nodeManager = new NodeManager({
@@ -631,6 +639,14 @@ describe('gestaltsDiscoveryByNode', () => {
631639
connectionConnectTimeoutTime: 2000,
632640
connectionIdleTimeoutTimeMin: 2000,
633641
connectionIdleTimeoutTimeScale: 0,
642+
authenticateNetworkForwardCallback:
643+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
644+
testsUtils.testNetworkName,
645+
),
646+
authenticateNetworkReverseCallback:
647+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
648+
testsUtils.testNetworkName,
649+
),
634650
logger: logger.getChild('NodeConnectionManager'),
635651
});
636652
nodeManager = new NodeManager({
@@ -807,6 +823,14 @@ describe('gestaltsDiscoveryQueue', () => {
807823
connectionConnectTimeoutTime: 2000,
808824
connectionIdleTimeoutTimeMin: 2000,
809825
connectionIdleTimeoutTimeScale: 0,
826+
authenticateNetworkForwardCallback:
827+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
828+
testsUtils.testNetworkName,
829+
),
830+
authenticateNetworkReverseCallback:
831+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
832+
testsUtils.testNetworkName,
833+
),
810834
logger: logger.getChild('NodeConnectionManager'),
811835
});
812836
nodeManager = new NodeManager({
@@ -1433,6 +1457,14 @@ describe('gestaltsGestaltTrustByIdentity', () => {
14331457
connectionConnectTimeoutTime: 2000,
14341458
connectionIdleTimeoutTimeMin: 2000,
14351459
connectionIdleTimeoutTimeScale: 0,
1460+
authenticateNetworkForwardCallback:
1461+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
1462+
testsUtils.testNetworkName,
1463+
),
1464+
authenticateNetworkReverseCallback:
1465+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
1466+
testsUtils.testNetworkName,
1467+
),
14361468
logger: logger.getChild('NodeConnectionManager'),
14371469
});
14381470
nodeManager = new NodeManager({
@@ -1740,6 +1772,7 @@ describe('gestaltsGestaltTrustByNode', () => {
17401772
password,
17411773
options: {
17421774
nodePath,
1775+
network: testsUtils.testNetworkName,
17431776
agentServiceHost: localhost,
17441777
clientServiceHost: localhost,
17451778
keys: {
@@ -1842,6 +1875,14 @@ describe('gestaltsGestaltTrustByNode', () => {
18421875
connectionConnectTimeoutTime: 2000,
18431876
connectionIdleTimeoutTimeMin: 2000,
18441877
connectionIdleTimeoutTimeScale: 0,
1878+
authenticateNetworkForwardCallback:
1879+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
1880+
testsUtils.testNetworkName,
1881+
),
1882+
authenticateNetworkReverseCallback:
1883+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
1884+
testsUtils.testNetworkName,
1885+
),
18451886
logger: logger.getChild('NodeConnectionManager'),
18461887
});
18471888
nodeManager = new NodeManager({

‎tests/client/handlers/keys.test.ts‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ describe('keysKeyPairRenew', () => {
500500
password,
501501
options: {
502502
nodePath,
503+
network: testsUtils.testNetworkName,
503504
agentServiceHost: localhost,
504505
clientServiceHost: localhost,
505506
keys: {
@@ -628,6 +629,7 @@ describe('keysKeyPairReset', () => {
628629
password,
629630
options: {
630631
nodePath,
632+
network: testsUtils.testNetworkName,
631633
agentServiceHost: localhost,
632634
clientServiceHost: localhost,
633635
keys: {

‎tests/client/handlers/notifications.test.ts‎

Lines changed: 56 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,14 @@ describe('notificationsInboxClear', () => {
122122
connectionConnectTimeoutTime: 2000,
123123
connectionIdleTimeoutTimeMin: 2000,
124124
connectionIdleTimeoutTimeScale: 0,
125+
authenticateNetworkForwardCallback:
126+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
127+
testsUtils.testNetworkName,
128+
),
129+
authenticateNetworkReverseCallback:
130+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
131+
testsUtils.testNetworkName,
132+
),
125133
logger: logger.getChild('NodeConnectionManager'),
126134
});
127135
nodeManager = new NodeManager({
@@ -282,6 +290,14 @@ describe('notificationsInboxRead', () => {
282290
connectionConnectTimeoutTime: 2000,
283291
connectionIdleTimeoutTimeMin: 2000,
284292
connectionIdleTimeoutTimeScale: 0,
293+
authenticateNetworkForwardCallback:
294+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
295+
testsUtils.testNetworkName,
296+
),
297+
authenticateNetworkReverseCallback:
298+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
299+
testsUtils.testNetworkName,
300+
),
285301
logger: logger.getChild('NodeConnectionManager'),
286302
});
287303
nodeManager = new NodeManager({
@@ -681,6 +697,14 @@ describe('notificationsInboxRemove', () => {
681697
connectionConnectTimeoutTime: 2000,
682698
connectionIdleTimeoutTimeMin: 2000,
683699
connectionIdleTimeoutTimeScale: 0,
700+
authenticateNetworkForwardCallback:
701+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
702+
testsUtils.testNetworkName,
703+
),
704+
authenticateNetworkReverseCallback:
705+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
706+
testsUtils.testNetworkName,
707+
),
684708
logger: logger.getChild('NodeConnectionManager'),
685709
});
686710
nodeManager = new NodeManager({
@@ -844,6 +868,14 @@ describe('notificationsOutboxClear', () => {
844868
connectionConnectTimeoutTime: 2000,
845869
connectionIdleTimeoutTimeMin: 2000,
846870
connectionIdleTimeoutTimeScale: 0,
871+
authenticateNetworkForwardCallback:
872+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
873+
testsUtils.testNetworkName,
874+
),
875+
authenticateNetworkReverseCallback:
876+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
877+
testsUtils.testNetworkName,
878+
),
847879
logger: logger.getChild('NodeConnectionManager'),
848880
});
849881
nodeManager = new NodeManager({
@@ -1004,6 +1036,14 @@ describe('notificationsOutboxRead', () => {
10041036
connectionConnectTimeoutTime: 2000,
10051037
connectionIdleTimeoutTimeMin: 2000,
10061038
connectionIdleTimeoutTimeScale: 0,
1039+
authenticateNetworkForwardCallback:
1040+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
1041+
testsUtils.testNetworkName,
1042+
),
1043+
authenticateNetworkReverseCallback:
1044+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
1045+
testsUtils.testNetworkName,
1046+
),
10071047
logger: logger.getChild('NodeConnectionManager'),
10081048
});
10091049
nodeManager = new NodeManager({
@@ -1346,6 +1386,14 @@ describe('notificationsOutboxRemove', () => {
13461386
connectionConnectTimeoutTime: 2000,
13471387
connectionIdleTimeoutTimeMin: 2000,
13481388
connectionIdleTimeoutTimeScale: 0,
1389+
authenticateNetworkForwardCallback:
1390+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
1391+
testsUtils.testNetworkName,
1392+
),
1393+
authenticateNetworkReverseCallback:
1394+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
1395+
testsUtils.testNetworkName,
1396+
),
13491397
logger: logger.getChild('NodeConnectionManager'),
13501398
});
13511399
nodeManager = new NodeManager({
@@ -1506,6 +1554,14 @@ describe('notificationsSend', () => {
15061554
connectionConnectTimeoutTime: 2000,
15071555
connectionIdleTimeoutTimeMin: 2000,
15081556
connectionIdleTimeoutTimeScale: 0,
1557+
authenticateNetworkForwardCallback:
1558+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
1559+
testsUtils.testNetworkName,
1560+
),
1561+
authenticateNetworkReverseCallback:
1562+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
1563+
testsUtils.testNetworkName,
1564+
),
15091565
logger: logger.getChild('NodeConnectionManager'),
15101566
});
15111567
nodeManager = new NodeManager({

‎tests/discovery/Discovery.test.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ import * as testNodesUtils from '../nodes/utils';
3737
import TestProvider from '../identities/TestProvider';
3838
import 'ix/add/asynciterable-operators/toarray';
3939
import { createTLSConfig } from '../utils/tls';
40+
import * as testsUtils from '../utils';
4041

4142
describe('Discovery', () => {
4243
const password = 'password';
@@ -169,6 +170,14 @@ describe('Discovery', () => {
169170
connectionConnectTimeoutTime: 2000,
170171
connectionIdleTimeoutTimeMin: 2000,
171172
connectionIdleTimeoutTimeScale: 0,
173+
authenticateNetworkForwardCallback:
174+
nodesUtils.nodesAuthenticateConnectionForwardBasicPublicFactory(
175+
testsUtils.testNetworkName,
176+
),
177+
authenticateNetworkReverseCallback:
178+
nodesUtils.nodesAuthenticateConnectionReverseBasicPublicFactory(
179+
testsUtils.testNetworkName,
180+
),
172181
logger: logger.getChild('NodeConnectionManager'),
173182
});
174183
nodeManager = new NodeManager({
@@ -195,6 +204,7 @@ describe('Discovery', () => {
195204
password: password,
196205
options: {
197206
nodePath: path.join(dataDir, 'nodeA'),
207+
network: testsUtils.testNetworkName,
198208
agentServiceHost: localhost,
199209
clientServiceHost: localhost,
200210
keys: {
@@ -209,6 +219,7 @@ describe('Discovery', () => {
209219
password: password,
210220
options: {
211221
nodePath: path.join(dataDir, 'nodeB'),
222+
network: testsUtils.testNetworkName,
212223
agentServiceHost: localhost,
213224
clientServiceHost: localhost,
214225
keys: {

0 commit comments

Comments
 (0)