Skip to content
This repository was archived by the owner on Apr 29, 2020. It is now read-only.

Fix/tests #135

Merged
merged 2 commits into from
Jan 11, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"async": "^2.1.4",
"chai": "^3.5.0",
"gulp": "^3.9.1",
"libp2p-ipfs-nodejs": "^0.17.1",
"libp2p-ipfs-nodejs": "^0.17.2",
"peer-id": "^0.8.1",
"pre-commit": "^1.2.2",
"pull-goodbye": "0.0.1",
Expand All @@ -53,7 +53,7 @@
"multiaddr": "^2.1.1",
"peer-book": "^0.3.0",
"peer-id": "^0.8.1",
"peer-info": "^0.8.1"
"peer-info": "^0.8.2"
},
"contributors": [
"David Dias <[email protected]>",
Expand Down
30 changes: 14 additions & 16 deletions test/webrtc-star-only.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,7 @@ const pull = require('pull-stream')

const Node = require('../src')

describe('libp2p-ipfs-browser (webrtc only)', function () {
this.timeout(15 * 1000)

describe('libp2p-ipfs-browser (webrtc only)', () => {
let peer1
let peer2
let node1
Expand Down Expand Up @@ -104,28 +102,28 @@ describe('libp2p-ipfs-browser (webrtc only)', function () {
})

it('create a third node and check that discovery works', (done) => {
let counter = 0

function check () {
if (++counter === 3) {
expect(Object.keys(node1.swarm.muxedConns).length).to.equal(1)
expect(Object.keys(node2.swarm.muxedConns).length).to.equal(1)
done()
}
}

PeerId.create((err, id3) => {
expect(err).to.not.exist

const peer3 = new PeerInfo(id3)
const mh3 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + id3.toB58String())
peer3.multiaddr.add(mh3)

node1.discovery.on('peer', (peerInfo) => {
node1.dialByPeerInfo(peerInfo, () => {})
})
node2.discovery.on('peer', (peerInfo) => {
node2.dialByPeerInfo(peerInfo, () => {})
})
node1.discovery.on('peer', (peerInfo) => node1.dialByPeerInfo(peerInfo, check))
node2.discovery.on('peer', (peerInfo) => node2.dialByPeerInfo(peerInfo, check))

const node3 = new Node(peer3)
node3.start(() => {
setTimeout(() => {
expect(Object.keys(node1.swarm.muxedConns).length).to.equal(1)
expect(Object.keys(node2.swarm.muxedConns).length).to.equal(1)
done()
}, 2000)
})
node3.start(check)
})
})
})