Skip to content
This repository was archived by the owner on Aug 23, 2019. It is now read-only.

Commit a6b7a75

Browse files
dignifiedquiredignifiedquire
committed
test: update to async peerid
1 parent 5e713f1 commit a6b7a75

12 files changed

+295
-182
lines changed

‎package.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"node": "^4.3.0"
3838
},
3939
"devDependencies": {
40-
"aegir": "^8.0.0",
40+
"aegir": "^8.1.0",
4141
"buffer-loader": "0.0.1",
4242
"chai": "^3.5.0",
4343
"gulp": "^3.9.1",
4444
"libp2p-multiplex": "^0.2.1",
45-
"libp2p-secio": "^0.4.2",
45+
"libp2p-secio": "^0.5.0",
4646
"libp2p-spdy": "^0.9.0",
4747
"libp2p-tcp": "^0.8.1",
4848
"libp2p-webrtc-star": "^0.4.4",
@@ -60,8 +60,8 @@
6060
"ip-address": "^5.8.2",
6161
"libp2p-identify": "^0.2.0",
6262
"lodash.contains": "^2.4.3",
63-
"multiaddr": "^2.0.2",
64-
"multistream-select": "^0.11.0",
63+
"multiaddr": "^2.0.3",
64+
"multistream-select": "^0.11.1",
6565
"peer-id": "^0.7.0",
6666
"peer-info": "^0.7.1",
6767
"protocol-buffers": "^3.1.6",

‎test/01-transport-tcp.node.js

Lines changed: 30 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
/* eslint-env mocha */
2-
32
'use strict'
43

54
const expect = require('chai').expect
@@ -9,19 +8,41 @@ const Peer = require('peer-info')
98
const TCP = require('libp2p-tcp')
109
const pull = require('pull-stream')
1110

11+
const utils = require('./utils')
1212
const Swarm = require('../src')
1313

1414
describe('transport - tcp', function () {
1515
let swarmA
1616
let swarmB
17-
let peerA = new Peer()
18-
let peerB = new Peer()
19-
20-
before(() => {
21-
peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9888'))
22-
peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9999'))
23-
swarmA = new Swarm(peerA)
24-
swarmB = new Swarm(peerB)
17+
let peerA
18+
let peerB
19+
20+
before((done) => {
21+
utils.createInfos(2, (err, infos) => {
22+
if (err) {
23+
return done(err)
24+
}
25+
peerA = infos[0]
26+
peerB = infos[1]
27+
28+
peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9888'))
29+
peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9999'))
30+
swarmA = new Swarm(peerA)
31+
swarmB = new Swarm(peerB)
32+
done()
33+
})
34+
})
35+
36+
let peer
37+
beforeEach((done) => {
38+
Peer.create((err, info) => {
39+
if (err) {
40+
return done(err)
41+
}
42+
43+
peer = info
44+
done()
45+
})
2546
})
2647

2748
it('add', (done) => {
@@ -99,7 +120,6 @@ describe('transport - tcp', function () {
99120

100121
it('support port 0', (done) => {
101122
let swarm
102-
let peer = new Peer()
103123
peer.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/0'))
104124
swarm = new Swarm(peer)
105125
swarm.transport.add('tcp', new TCP())
@@ -116,7 +136,6 @@ describe('transport - tcp', function () {
116136

117137
it('support addr /ip4/0.0.0.0/tcp/9050', (done) => {
118138
let swarm
119-
let peer = new Peer()
120139
peer.multiaddr.add(multiaddr('/ip4/0.0.0.0/tcp/9050'))
121140
swarm = new Swarm(peer)
122141
swarm.transport.add('tcp', new TCP())
@@ -137,7 +156,6 @@ describe('transport - tcp', function () {
137156

138157
it('support addr /ip4/0.0.0.0/tcp/0', (done) => {
139158
let swarm
140-
let peer = new Peer()
141159
peer.multiaddr.add(multiaddr('/ip4/0.0.0.0/tcp/0'))
142160
swarm = new Swarm(peer)
143161
swarm.transport.add('tcp', new TCP())
@@ -154,7 +172,6 @@ describe('transport - tcp', function () {
154172

155173
it('listen in several addrs', (done) => {
156174
let swarm
157-
let peer = new Peer()
158175
peer.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9001'))
159176
peer.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9002'))
160177
peer.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9003'))

‎test/03-transport-websockets.node.js

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -5,24 +5,33 @@ const expect = require('chai').expect
55

66
const parallel = require('run-parallel')
77
const multiaddr = require('multiaddr')
8-
const Peer = require('peer-info')
98
const WebSockets = require('libp2p-websockets')
109
const pull = require('pull-stream')
1110
const goodbye = require('pull-goodbye')
1211

12+
const utils = require('./utils')
1313
const Swarm = require('../src')
1414

1515
describe('transport - websockets', function () {
1616
var swarmA
1717
var swarmB
18-
var peerA = new Peer()
19-
var peerB = new Peer()
18+
var peerA
19+
var peerB
2020

21-
before(() => {
22-
peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9888/ws'))
23-
peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9999/ws/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC'))
24-
swarmA = new Swarm(peerA)
25-
swarmB = new Swarm(peerB)
21+
before((done) => {
22+
utils.createInfos(2, (err, infos) => {
23+
if (err) {
24+
return done(err)
25+
}
26+
peerA = infos[0]
27+
peerB = infos[1]
28+
29+
peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9888/ws'))
30+
peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9999/ws/ipfs/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSupNKC'))
31+
swarmA = new Swarm(peerA)
32+
swarmB = new Swarm(peerB)
33+
done()
34+
})
2635
})
2736

2837
it('add', (done) => {

‎test/04-muxing-multiplex.node.js

Lines changed: 32 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@ const expect = require('chai').expect
55

66
const parallel = require('run-parallel')
77
const multiaddr = require('multiaddr')
8-
const Peer = require('peer-info')
98
const TCP = require('libp2p-tcp')
109
const multiplex = require('libp2p-spdy')
1110
const pull = require('pull-stream')
11+
const utils = require('./utils')
1212

1313
const Swarm = require('../src')
1414

@@ -24,31 +24,37 @@ describe.skip('stream muxing with multiplex (on TCP)', () => {
2424
let peerC
2525

2626
before((done) => {
27-
peerA = new Peer()
28-
peerB = new Peer()
29-
peerC = new Peer()
30-
31-
// console.log('peer A', peerA.id.toB58String())
32-
// console.log('peer B', peerB.id.toB58String())
33-
// console.log('peer C', peerC.id.toB58String())
34-
35-
peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9001'))
36-
peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9002'))
37-
peerC.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9003'))
38-
39-
swarmA = new Swarm(peerA)
40-
swarmB = new Swarm(peerB)
41-
swarmC = new Swarm(peerC)
42-
43-
swarmA.transport.add('tcp', new TCP())
44-
swarmB.transport.add('tcp', new TCP())
45-
swarmC.transport.add('tcp', new TCP())
46-
47-
parallel([
48-
(cb) => swarmA.transport.listen('tcp', {}, null, cb),
49-
(cb) => swarmB.transport.listen('tcp', {}, null, cb),
50-
(cb) => swarmC.transport.listen('tcp', {}, null, cb)
51-
], done)
27+
utils.createInfos(3, (err, infos) => {
28+
if (err) {
29+
return done(err)
30+
}
31+
32+
peerA = infos[0]
33+
peerB = infos[1]
34+
peerC = infos[2]
35+
36+
// console.log('peer A', peerA.id.toB58String())
37+
// console.log('peer B', peerB.id.toB58String())
38+
// console.log('peer C', peerC.id.toB58String())
39+
40+
peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9001'))
41+
peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9002'))
42+
peerC.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9003'))
43+
44+
swarmA = new Swarm(peerA)
45+
swarmB = new Swarm(peerB)
46+
swarmC = new Swarm(peerC)
47+
48+
swarmA.transport.add('tcp', new TCP())
49+
swarmB.transport.add('tcp', new TCP())
50+
swarmC.transport.add('tcp', new TCP())
51+
52+
parallel([
53+
(cb) => swarmA.transport.listen('tcp', {}, null, cb),
54+
(cb) => swarmB.transport.listen('tcp', {}, null, cb),
55+
(cb) => swarmC.transport.listen('tcp', {}, null, cb)
56+
], done)
57+
})
5258
})
5359

5460
after((done) => {

‎test/05-muxing-spdy.node.js

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ const expect = require('chai').expect
66
const parallel = require('run-parallel')
77
const multiaddr = require('multiaddr')
88
const Peer = require('peer-info')
9-
const Swarm = require('../src')
109
const TCP = require('libp2p-tcp')
1110
const WebSockets = require('libp2p-websockets')
1211
const pull = require('pull-stream')
13-
1412
const spdy = require('libp2p-spdy')
1513

14+
const utils = require('./utils')
15+
const Swarm = require('../src')
16+
1617
describe('stream muxing with spdy (on TCP)', () => {
1718
let swarmA
1819
let peerA
@@ -24,36 +25,42 @@ describe('stream muxing with spdy (on TCP)', () => {
2425
let peerD
2526

2627
before((done) => {
27-
peerA = new Peer()
28-
peerB = new Peer()
29-
peerC = new Peer()
30-
peerD = new Peer()
31-
32-
// console.log('peer A', peerA.id.toB58String())
33-
// console.log('peer B', peerB.id.toB58String())
34-
// console.log('peer C', peerC.id.toB58String())
35-
36-
peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9001'))
37-
peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9002'))
38-
peerC.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9003'))
39-
peerD.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9004'))
40-
41-
swarmA = new Swarm(peerA)
42-
swarmB = new Swarm(peerB)
43-
swarmC = new Swarm(peerC)
44-
swarmD = new Swarm(peerD)
45-
46-
swarmA.transport.add('tcp', new TCP())
47-
swarmB.transport.add('tcp', new TCP())
48-
swarmC.transport.add('tcp', new TCP())
49-
swarmD.transport.add('tcp', new TCP())
28+
utils.createInfos(4, (err, infos) => {
29+
if (err) {
30+
return done(err)
31+
}
32+
33+
peerA = infos[0]
34+
peerB = infos[1]
35+
peerC = infos[2]
36+
peerD = infos[3]
37+
38+
// console.log('peer A', peerA.id.toB58String())
39+
// console.log('peer B', peerB.id.toB58String())
40+
// console.log('peer C', peerC.id.toB58String())
41+
42+
peerA.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9001'))
43+
peerB.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9002'))
44+
peerC.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9003'))
45+
peerD.multiaddr.add(multiaddr('/ip4/127.0.0.1/tcp/9004'))
46+
47+
swarmA = new Swarm(peerA)
48+
swarmB = new Swarm(peerB)
49+
swarmC = new Swarm(peerC)
50+
swarmD = new Swarm(peerD)
51+
52+
swarmA.transport.add('tcp', new TCP())
53+
swarmB.transport.add('tcp', new TCP())
54+
swarmC.transport.add('tcp', new TCP())
55+
swarmD.transport.add('tcp', new TCP())
5056

51-
parallel([
52-
(cb) => swarmA.transport.listen('tcp', {}, null, cb),
53-
(cb) => swarmB.transport.listen('tcp', {}, null, cb),
54-
(cb) => swarmC.transport.listen('tcp', {}, null, cb),
55-
(cb) => swarmD.transport.listen('tcp', {}, null, cb)
56-
], done)
57+
parallel([
58+
(cb) => swarmA.transport.listen('tcp', {}, null, cb),
59+
(cb) => swarmB.transport.listen('tcp', {}, null, cb),
60+
(cb) => swarmC.transport.listen('tcp', {}, null, cb),
61+
(cb) => swarmD.transport.listen('tcp', {}, null, cb)
62+
], done)
63+
})
5764
})
5865

5966
after((done) => {

0 commit comments

Comments
 (0)