Skip to content

Commit bcd98ea

Browse files
daviddiasdaviddias
committed
test: make transport tests pass with exception to webrtc-star
1 parent 01eef5a commit bcd98ea

File tree

1 file changed

+23
-24
lines changed

1 file changed

+23
-24
lines changed

‎test/transports.node.js‎

Lines changed: 23 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,15 @@ chai.use(require('dirty-chai'))
66
const expect = chai.expect
77
const parallel = require('async/parallel')
88
const series = require('async/series')
9-
const utils = require('./utils/node.js')
109
const signalling = require('libp2p-webrtc-star/src/sig-server')
1110
const rendezvous = require('libp2p-websocket-star-rendezvous')
1211
const WSStar = require('libp2p-websocket-star')
1312
const WRTCStar = require('libp2p-webrtc-star')
1413
const wrtc = require('wrtc')
15-
const tryEcho = require('./utils/try-echo')
1614

17-
const createNode = utils.createNode
18-
const echo = utils.echo
15+
const createNode = require('./utils/create-node.js')
16+
const tryEcho = require('./utils/try-echo')
17+
const echo = require('./utils/echo')
1918

2019
describe('transports', () => {
2120
describe('TCP only', () => {
@@ -90,14 +89,14 @@ describe('transports', () => {
9089
(cb) => {
9190
const peers = nodeA.peerBook.getAll()
9291
expect(Object.keys(peers)).to.have.length(1)
93-
expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(0)
92+
expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
9493
cb()
9594
},
9695
(cb) => {
9796
const peers = nodeB.peerBook.getAll()
9897
expect(Object.keys(peers)).to.have.length(1)
9998

100-
expect(Object.keys(nodeB.switch.muxedConns)).to.have.length(0)
99+
expect(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
101100
cb()
102101
}
103102
], done)
@@ -117,14 +116,14 @@ describe('transports', () => {
117116
const peers = nodeA.peerBook.getAll()
118117
expect(Object.keys(peers)).to.have.length(1)
119118

120-
expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(1)
119+
expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
121120
cb()
122121
},
123122
(cb) => {
124123
const peers = nodeB.peerBook.getAll()
125124
expect(Object.keys(peers)).to.have.length(1)
126125

127-
expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(1)
126+
expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
128127
cb()
129128
}
130129
], () => tryEcho(conn, done))
@@ -143,14 +142,14 @@ describe('transports', () => {
143142
const peers = nodeA.peerBook.getAll()
144143
expect(Object.keys(peers)).to.have.length(1)
145144

146-
expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(0)
145+
expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
147146
cb()
148147
},
149148
(cb) => {
150149
const peers = nodeB.peerBook.getAll()
151150
expect(Object.keys(peers)).to.have.length(1)
152151

153-
expect(Object.keys(nodeB.switch.muxedConns)).to.have.length(0)
152+
expect(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
154153
cb()
155154
}
156155
], done)
@@ -169,13 +168,13 @@ describe('transports', () => {
169168
(cb) => {
170169
const peers = nodeA.peerBook.getAll()
171170
expect(Object.keys(peers)).to.have.length(1)
172-
expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(1)
171+
expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
173172
cb()
174173
},
175174
(cb) => {
176175
const peers = nodeB.peerBook.getAll()
177176
expect(Object.keys(peers)).to.have.length(1)
178-
expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(1)
177+
expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(1)
179178
cb()
180179
}
181180
], () => tryEcho(conn, done))
@@ -193,13 +192,13 @@ describe('transports', () => {
193192
(cb) => {
194193
const peers = nodeA.peerBook.getAll()
195194
expect(Object.keys(peers)).to.have.length(1)
196-
expect(Object.keys(nodeA.switch.muxedConns)).to.have.length(0)
195+
expect(Object.keys(nodeA._switch.muxedConns)).to.have.length(0)
197196
cb()
198197
},
199198
(cb) => {
200199
const peers = nodeB.peerBook.getAll()
201200
expect(Object.keys(peers)).to.have.length(1)
202-
expect(Object.keys(nodeB.switch.muxedConns)).to.have.length(0)
201+
expect(Object.keys(nodeB._switch.muxedConns)).to.have.length(0)
203202
cb()
204203
}
205204
], done)
@@ -263,13 +262,13 @@ describe('transports', () => {
263262
(cb) => {
264263
const peers = nodeTCP.peerBook.getAll()
265264
expect(Object.keys(peers)).to.have.length(1)
266-
expect(Object.keys(nodeTCP.switch.muxedConns)).to.have.length(1)
265+
expect(Object.keys(nodeTCP._switch.muxedConns)).to.have.length(1)
267266
cb()
268267
},
269268
(cb) => {
270269
const peers = nodeTCPnWS.peerBook.getAll()
271270
expect(Object.keys(peers)).to.have.length(1)
272-
expect(Object.keys(nodeTCPnWS.switch.muxedConns)).to.have.length(1)
271+
expect(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(1)
273272
cb()
274273
}
275274
], done)
@@ -287,14 +286,14 @@ describe('transports', () => {
287286
(cb) => {
288287
const peers = nodeTCP.peerBook.getAll()
289288
expect(Object.keys(peers)).to.have.length(1)
290-
expect(Object.keys(nodeTCP.switch.muxedConns)).to.have.length(0)
289+
expect(Object.keys(nodeTCP._switch.muxedConns)).to.have.length(0)
291290

292291
cb()
293292
},
294293
(cb) => {
295294
const peers = nodeTCPnWS.peerBook.getAll()
296295
expect(Object.keys(peers)).to.have.length(1)
297-
expect(Object.keys(nodeTCPnWS.switch.muxedConns)).to.have.length(0)
296+
expect(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(0)
298297
cb()
299298
}
300299
], done)
@@ -314,13 +313,13 @@ describe('transports', () => {
314313
(cb) => {
315314
const peers = nodeTCPnWS.peerBook.getAll()
316315
expect(Object.keys(peers)).to.have.length(2)
317-
expect(Object.keys(nodeTCPnWS.switch.muxedConns)).to.have.length(1)
316+
expect(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(1)
318317
cb()
319318
},
320319
(cb) => {
321320
const peers = nodeWS.peerBook.getAll()
322321
expect(Object.keys(peers)).to.have.length(1)
323-
expect(Object.keys(nodeWS.switch.muxedConns)).to.have.length(1)
322+
expect(Object.keys(nodeWS._switch.muxedConns)).to.have.length(1)
324323
cb()
325324
}
326325
], done)
@@ -338,14 +337,14 @@ describe('transports', () => {
338337
(cb) => {
339338
const peers = nodeTCPnWS.peerBook.getAll()
340339
expect(Object.keys(peers)).to.have.length(2)
341-
expect(Object.keys(nodeTCPnWS.switch.muxedConns)).to.have.length(0)
340+
expect(Object.keys(nodeTCPnWS._switch.muxedConns)).to.have.length(0)
342341

343342
cb()
344343
},
345344
(cb) => {
346345
const peers = nodeWS.peerBook.getAll()
347346
expect(Object.keys(peers)).to.have.length(1)
348-
expect(Object.keys(nodeWS.switch.muxedConns)).to.have.length(0)
347+
expect(Object.keys(nodeWS._switch.muxedConns)).to.have.length(0)
349348
cb()
350349
}
351350
], done)
@@ -453,7 +452,7 @@ describe('transports', () => {
453452
let i = 1;
454453
[nodeAll, otherNode].forEach((node) => {
455454
expect(Object.keys(node.peerBook.getAll())).to.have.length(i-- ? peers : 1)
456-
expect(Object.keys(node.switch.muxedConns)).to.have.length(muxed)
455+
expect(Object.keys(node._switch.muxedConns)).to.have.length(muxed)
457456
})
458457
callback()
459458
}
@@ -596,7 +595,7 @@ describe('transports', () => {
596595
let i = 1;
597596
[nodeAll, otherNode].forEach((node) => {
598597
expect(Object.keys(node.peerBook.getAll())).to.have.length(i-- ? peers : 1)
599-
expect(Object.keys(node.switch.muxedConns)).to.have.length(muxed)
598+
expect(Object.keys(node._switch.muxedConns)).to.have.length(muxed)
600599
})
601600
done()
602601
}

0 commit comments

Comments
 (0)