From 888bc7df5c8707737ce83543df9e99686b7be459 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Mon, 26 Sep 2016 18:52:05 +0200 Subject: [PATCH 1/8] fix: update for new crypto --- .aegir.js | 19 ------------------- gulpfile.js | 32 ++++++++++++++++++-------------- package.json | 12 ++++++------ test/websockets-only.js | 15 ++++++++++----- 4 files changed, 34 insertions(+), 44 deletions(-) delete mode 100644 .aegir.js diff --git a/.aegir.js b/.aegir.js deleted file mode 100644 index a10cdff..0000000 --- a/.aegir.js +++ /dev/null @@ -1,19 +0,0 @@ -'use strict' - -const path = require('path') - -module.exports = { - webpack: { - resolve: { - alias: { - 'node-forge': path.resolve( - path.dirname(require.resolve('libp2p-crypto')), - '../vendor/forge.bundle.js' - ) - } - }, - externals: { - 'simple-websocket-server': '{}' - } - } -} diff --git a/gulpfile.js b/gulpfile.js index d327df7..778240f 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -12,25 +12,29 @@ let sigS let node const rawPeer = require('./test/peer.json') -const id = Id.createFromPrivKey(rawPeer.privKey) - gulp.task('libnode:start', (done) => { const mh = multiaddr('/ip4/127.0.0.1/tcp/9200/ws') - const peer = new Peer(id) - peer.multiaddr.add(mh) - - node = new Node(peer) - node.start(() => { - node.handle('/echo/1.0.0', (conn) => { - pull(conn, conn) + Id.createFromPrivKey(rawPeer.privKey, (err, id) => { + if (err) { + return done(err) + } + + const peer = new Peer(id) + peer.multiaddr.add(mh) + + node = new Node(peer) + node.start(() => { + node.handle('/echo/1.0.0', (conn) => { + pull(conn, conn) + }) + ready() }) - ready() - }) - let count = 0 - const ready = () => ++count === 2 ? done() : null + let count = 0 + const ready = () => ++count === 2 ? done() : null - sigS = sigServer.start(15555, ready) + sigS = sigServer.start(15555, ready) + }) }) gulp.task('libnode:stop', (done) => { diff --git a/package.json b/package.json index bb5b411..dc148d7 100644 --- a/package.json +++ b/package.json @@ -9,14 +9,14 @@ "test" ], "scripts": { - "test": "gulp test", "lint": "aegir-lint", + "test": "PHANTOM=off gulp test", "test:node": "gulp test:node", - "test:browser": "gulp test:browser", + "test:browser": "PHANTOM=off gulp test:browser", "build": "gulp build", - "release": "gulp release", - "release-minor": "gulp release --type minor", - "release-major": "gulp release --type major", + "release": "PHANTOM=off gulp release", + "release-minor": "PHANTOM=off gulp release --type minor", + "release-major": "PHANTOM=off gulp release --type major", "coverage": "gulp coverage", "coverage-publish": "aegir-coverage publish" }, @@ -62,4 +62,4 @@ "Richard Littauer ", "greenkeeperio-bot " ] -} \ No newline at end of file +} diff --git a/test/websockets-only.js b/test/websockets-only.js index 20417bb..e77a695 100644 --- a/test/websockets-only.js +++ b/test/websockets-only.js @@ -12,17 +12,22 @@ const serializer = require('pull-serializer') const libp2p = require('../src') const rawPeer = require('./peer.json') -const id = PeerId.createFromPrivKey(rawPeer.privKey) -describe('libp2p-ipfs-browser (websockets only)', function () { +describe('libp2p-ipfs-browser (websockets only)', () => { let peerB let nodeA before((done) => { const mh = multiaddr('/ip4/127.0.0.1/tcp/9200/ws/ipfs/' + rawPeer.id) - peerB = new PeerInfo(id) - peerB.multiaddr.add(mh) - done() + PeerId.createFromPrivKey(rawPeer.privKey, (err, id) => { + if (err) { + return done(err) + } + + peerB = new PeerInfo(id) + peerB.multiaddr.add(mh) + done() + }) }) after((done) => { From 5b6cdb9cba6c2025812e1bbbd62b05df5fbab227 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Wed, 2 Nov 2016 13:17:22 +0100 Subject: [PATCH 2/8] ready --- .gitignore | 1 - .travis.yml | 24 +++++++++++---- README.md | 4 +++ package.json | 18 +++++------ src/index.js | 3 +- test/webrtc-star-only.js | 66 ++++++++++++++++++++++------------------ test/websockets-only.js | 9 ++++-- 7 files changed, 75 insertions(+), 50 deletions(-) diff --git a/.gitignore b/.gitignore index db2ff1a..c2ba637 100644 --- a/.gitignore +++ b/.gitignore @@ -32,5 +32,4 @@ node_modules # Optional REPL history .node_repl_history -lib dist diff --git a/.travis.yml b/.travis.yml index 0c44ec8..4fe6550 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,8 +1,15 @@ sudo: false language: node_js -node_js: - - 4 - - stable +matrix: + include: + - node_js: 4 + env: CXX=g++-4.8 + - node_js: 6 + env: + - SAUCE=true + - CXX=g++-4.8 + - node_js: stable + env: CXX=g++-4.8 # Make sure we have new NPM. before_install: @@ -13,12 +20,17 @@ script: - npm test - npm run coverage -addons: - firefox: 'latest' - before_script: - export DISPLAY=:99.0 - sh -e /etc/init.d/xvfb start after_success: - npm run coverage-publish + +addons: + firefox: 'latest' + apt: + sources: + - ubuntu-toolchain-r-test + packages: + - g++-4.8 \ No newline at end of file diff --git a/README.md b/README.md index b7d5f4e..01d1baa 100644 --- a/README.md +++ b/README.md @@ -9,6 +9,10 @@ [![Travis CI](https://travis-ci.org/ipfs/js-libp2p-ipfs-browser.svg?branch=master)](https://travis-ci.org/ipfs/js-libp2p-ipfs-browser) [![Circle CI](https://circleci.com/gh/ipfs/js-libp2p-ipfs-browser.svg?style=svg)](https://circleci.com/gh/ipfs/js-libp2p-ipfs-browser) [![Dependency Status](https://david-dm.org/ipfs/js-libp2p-ipfs-browser.svg?style=flat-square)](https://david-dm.org/ipfs/js-libp2p-ipfs-browser) [![js-standard-style](https://img.shields.io/badge/code%20style-standard-brightgreen.svg?style=flat-square)](https://github.com/feross/standard) +![](https://img.shields.io/badge/npm-%3E%3D3.0.0-orange.svg?style=flat-square) +![](https://img.shields.io/badge/Node.js-%3E%3D4.0.0-orange.svg?style=flat-square) + +[![Sauce Test Status](https://saucelabs.com/browser-matrix/libp2p-ipfs-browser.svg)](https://saucelabs.com/u/libp2p-ipfs-browser) > libp2p build (module) used in js-ipfs when running it on the browser. diff --git a/package.json b/package.json index dc148d7..97e16e8 100644 --- a/package.json +++ b/package.json @@ -2,21 +2,20 @@ "name": "libp2p-ipfs-browser", "version": "0.15.1", "description": "libp2p build (module) used in js-ipfs when running it on the browser", - "main": "lib/index.js", - "jsnext:main": "src/index.js", + "main": "src/index.js", "pre-commit": [ "lint", "test" ], "scripts": { "lint": "aegir-lint", - "test": "PHANTOM=off gulp test", + "test": "gulp test", "test:node": "gulp test:node", - "test:browser": "PHANTOM=off gulp test:browser", + "test:browser": "gulp test:browser", "build": "gulp build", - "release": "PHANTOM=off gulp release", - "release-minor": "PHANTOM=off gulp release --type minor", - "release-major": "PHANTOM=off gulp release --type major", + "release": "gulp release", + "release-minor": "gulp release --type minor", + "release-major": "gulp release --type major", "coverage": "gulp coverage", "coverage-publish": "aegir-coverage publish" }, @@ -31,7 +30,8 @@ }, "homepage": "https://github.com/ipfs/js-libp2p-ipfs-browser#readme", "devDependencies": { - "aegir": "^8.0.1", + "aegir": "^9.0.0", + "async": "^2.1.2", "chai": "^3.5.0", "gulp": "^3.9.1", "libp2p-ipfs": "^0.14.1", @@ -40,11 +40,9 @@ "pull-goodbye": "0.0.1", "pull-serializer": "^0.3.2", "pull-stream": "^3.4.5", - "run-parallel": "^1.1.6", "webrtcsupport": "^2.2.0" }, "dependencies": { - "babel-runtime": "^6.11.6", "libp2p-secio": "^0.5.0", "libp2p-spdy": "^0.9.0", "libp2p-swarm": "^0.23.0", diff --git a/src/index.js b/src/index.js index 514c328..2bb3799 100644 --- a/src/index.js +++ b/src/index.js @@ -23,8 +23,7 @@ exports.Node = function Node (pInfo, pBook) { } if (!pInfo) { - pInfo = new PeerInfo() - pInfo.multiaddr.add(multiaddr('/ip4/0.0.0.0/tcp/0')) + throw new Error('missing peer info') } if (!pBook) { diff --git a/test/webrtc-star-only.js b/test/webrtc-star-only.js index f3e86f7..682a8da 100644 --- a/test/webrtc-star-only.js +++ b/test/webrtc-star-only.js @@ -4,8 +4,8 @@ const expect = require('chai').expect const multiaddr = require('multiaddr') const PeerInfo = require('peer-info') -const peerId = require('peer-id') -const parallel = require('run-parallel') +const PeerId = require('peer-id') +const parallel = require('async/parallel') const pull = require('pull-stream') const libp2p = require('../src') @@ -19,17 +19,22 @@ describe('libp2p-ipfs-browser (webrtc only)', function () { let node2 it('create two peerInfo with webrtc-star addrs', (done) => { - const id1 = peerId.create() - peer1 = new PeerInfo(id1) - const mh1 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + id1.toB58String()) - peer1.multiaddr.add(mh1) + parallel([ + (cb) => PeerId.create(cb), + (cb) => PeerId.create(cb) + ], (err, ids) => { + expect(err).to.not.exist - const id2 = peerId.create() - peer2 = new PeerInfo(id2) - const mh2 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + id2.toB58String()) - peer2.multiaddr.add(mh2) + peer1 = new PeerInfo(ids[0]) + const mh1 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + ids[0].toB58String()) + peer1.multiaddr.add(mh1) - done() + peer2 = new PeerInfo(ids[1]) + const mh2 = multiaddr('/libp2p-webrtc-star/ip4/127.0.0.1/tcp/15555/ws/ipfs/' + ids[1].toB58String()) + peer2.multiaddr.add(mh2) + + done() + }) }) it('create two libp2p nodes with those peers', (done) => { @@ -95,25 +100,28 @@ describe('libp2p-ipfs-browser (webrtc only)', function () { }) it('create a third node and check that discovery works', (done) => { - const id3 = peerId.create() - 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, () => {}) - }) + PeerId.create((err, id3) => { + expect(err).to.not.exist - const node3 = new libp2p.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) + 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, () => {}) + }) + + const node3 = new libp2p.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) + }) }) }) }) diff --git a/test/websockets-only.js b/test/websockets-only.js index e77a695..4f725d8 100644 --- a/test/websockets-only.js +++ b/test/websockets-only.js @@ -34,8 +34,13 @@ describe('libp2p-ipfs-browser (websockets only)', () => { nodeA.stop(done) }) - it('create libp2pNode', () => { - nodeA = new libp2p.Node() + it('create libp2pNode', (done) => { + PeerInfo.create((err, info) => { + expect(err).to.not.exist + info.multiaddr.add(multiaddr('/ip4/0.0.0.0/tcp/0')) + nodeA = new libp2p.Node(info) + done() + }) }) it('start libp2pNode', (done) => { From 374deb401caee81ac83ac6cff7def516c0610af9 Mon Sep 17 00:00:00 2001 From: David Dias Date: Thu, 3 Nov 2016 12:10:29 +0000 Subject: [PATCH 3/8] chore: update deps and handle API --- gulpfile.js | 2 +- package.json | 24 ++++++++++++------------ src/index.js | 4 ++-- test/webrtc-star-only.js | 2 +- 4 files changed, 16 insertions(+), 16 deletions(-) diff --git a/gulpfile.js b/gulpfile.js index 778240f..c353eed 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -24,7 +24,7 @@ gulp.task('libnode:start', (done) => { node = new Node(peer) node.start(() => { - node.handle('/echo/1.0.0', (conn) => { + node.handle('/echo/1.0.0', (protocol, conn) => { pull(conn, conn) }) ready() diff --git a/package.json b/package.json index 97e16e8..02014ab 100644 --- a/package.json +++ b/package.json @@ -30,29 +30,29 @@ }, "homepage": "https://github.com/ipfs/js-libp2p-ipfs-browser#readme", "devDependencies": { - "aegir": "^9.0.0", + "aegir": "^9.0.1", "async": "^2.1.2", "chai": "^3.5.0", "gulp": "^3.9.1", - "libp2p-ipfs": "^0.14.1", - "peer-id": "^0.7.0", + "libp2p-ipfs": "^0.15.0", + "peer-id": "^0.8.0", "pre-commit": "^1.1.3", "pull-goodbye": "0.0.1", "pull-serializer": "^0.3.2", - "pull-stream": "^3.4.5", + "pull-stream": "^3.5.0", "webrtcsupport": "^2.2.0" }, "dependencies": { - "libp2p-secio": "^0.5.0", - "libp2p-spdy": "^0.9.0", - "libp2p-swarm": "^0.23.0", - "libp2p-webrtc-star": "^0.4.3", - "libp2p-websockets": "^0.8.1", + "libp2p-secio": "^0.6.2", + "libp2p-spdy": "^0.10.0", + "libp2p-swarm": "^0.26.0", + "libp2p-webrtc-star": "^0.5.0", + "libp2p-websockets": "^0.9.0", "mafmt": "^2.1.2", - "multiaddr": "^2.0.2", + "multiaddr": "^2.0.3", "peer-book": "^0.3.0", - "peer-id": "^0.7.0", - "peer-info": "^0.7.0" + "peer-id": "^0.8.0", + "peer-info": "^0.8.0" }, "contributors": [ "David Dias ", diff --git a/src/index.js b/src/index.js index 2bb3799..4617a11 100644 --- a/src/index.js +++ b/src/index.js @@ -191,8 +191,8 @@ exports.Node = function Node (pInfo, pBook) { this.swarm.hangUp(peer, callback) } - this.handle = (protocol, handler) => { - return this.swarm.handle(protocol, handler) + this.handle = (protocol, handlerFunc, matchFunc) => { + return this.swarm.handle(protocol, handlerFunc, matchFunc) } this.unhandle = (protocol) => { diff --git a/test/webrtc-star-only.js b/test/webrtc-star-only.js index 682a8da..e886821 100644 --- a/test/webrtc-star-only.js +++ b/test/webrtc-star-only.js @@ -51,7 +51,7 @@ describe('libp2p-ipfs-browser (webrtc only)', function () { }) it('handle a protocol on the first node', (done) => { - node2.handle('/echo/1.0.0', (conn) => { + node2.handle('/echo/1.0.0', (protocol, conn) => { pull(conn, conn) }) done() From 661fe73ad18a4faf24a42e8279652c2dee8b89cf Mon Sep 17 00:00:00 2001 From: David Dias Date: Tue, 8 Nov 2016 15:12:03 +0000 Subject: [PATCH 4/8] chore: update deps --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 02014ab..e65b132 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ }, "homepage": "https://github.com/ipfs/js-libp2p-ipfs-browser#readme", "devDependencies": { - "aegir": "^9.0.1", + "aegir": "^9.1.1", "async": "^2.1.2", "chai": "^3.5.0", "gulp": "^3.9.1", From e6344b18a01a7f5e4c11ef8bd176d3e488cfdbc2 Mon Sep 17 00:00:00 2001 From: David Dias Date: Tue, 8 Nov 2016 15:43:32 +0000 Subject: [PATCH 5/8] wip: get websockets to work in the browser --- gulpfile.js | 27 +++++++++++++++------------ src/index.js | 1 + test/browser.js | 3 +-- test/webrtc-star-and-websockets.js | 0 test/websockets-only.js | 1 + 5 files changed, 18 insertions(+), 14 deletions(-) delete mode 100644 test/webrtc-star-and-websockets.js diff --git a/gulpfile.js b/gulpfile.js index c353eed..5475230 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -3,8 +3,8 @@ const gulp = require('gulp') const multiaddr = require('multiaddr') const Node = require('libp2p-ipfs').Node -const Peer = require('peer-info') -const Id = require('peer-id') +const PeerInfo = require('peer-info') +const PeerId = require('peer-id') const pull = require('pull-stream') const sigServer = require('libp2p-webrtc-star/src/signalling-server') @@ -12,15 +12,23 @@ let sigS let node const rawPeer = require('./test/peer.json') + gulp.task('libnode:start', (done) => { - const mh = multiaddr('/ip4/127.0.0.1/tcp/9200/ws') - Id.createFromPrivKey(rawPeer.privKey, (err, id) => { + let count = 0 + const ready = () => ++count === 2 ? done() : null + + sigS = sigServer.start(15555, ready) + + PeerId.createFromJSON(rawPeer, gotId) + + function gotId (err, pid) { if (err) { return done(err) } + const peer = new PeerInfo(pid) - const peer = new Peer(id) - peer.multiaddr.add(mh) + const ma = multiaddr('/ip4/127.0.0.1/tcp/9200/ws') + peer.multiaddr.add(ma) node = new Node(peer) node.start(() => { @@ -29,12 +37,7 @@ gulp.task('libnode:start', (done) => { }) ready() }) - - let count = 0 - const ready = () => ++count === 2 ? done() : null - - sigS = sigServer.start(15555, ready) - }) + } }) gulp.task('libnode:stop', (done) => { diff --git a/src/index.js b/src/index.js index 4617a11..8b9c5c3 100644 --- a/src/index.js +++ b/src/index.js @@ -53,6 +53,7 @@ exports.Node = function Node (pInfo, pBook) { // if we have `webrtc-star` addrs, then add // the WebRTCStar transport const wstar = new WebRTCStar() + if (wstar.filter(this.peerInfo.multiaddrs).length > 0) { this.swarm.transport.add('wstar', wstar) wstar.discovery.on('peer', (peerInfo) => { diff --git a/test/browser.js b/test/browser.js index a1cc21f..8f87d64 100644 --- a/test/browser.js +++ b/test/browser.js @@ -2,9 +2,8 @@ const w = require('webrtcsupport') -require('./websockets-only') +// require('./websockets-only') if (w.support) { require('./webrtc-star-only') - require('./webrtc-star-and-websockets') } diff --git a/test/webrtc-star-and-websockets.js b/test/webrtc-star-and-websockets.js deleted file mode 100644 index e69de29..0000000 diff --git a/test/websockets-only.js b/test/websockets-only.js index 4f725d8..77a53c1 100644 --- a/test/websockets-only.js +++ b/test/websockets-only.js @@ -19,6 +19,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { before((done) => { const mh = multiaddr('/ip4/127.0.0.1/tcp/9200/ws/ipfs/' + rawPeer.id) + PeerId.createFromPrivKey(rawPeer.privKey, (err, id) => { if (err) { return done(err) From b9eeb16565de789655dbcb3300119ab4437cb6a3 Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 10 Nov 2016 17:50:39 +0100 Subject: [PATCH 6/8] bring back all the tests --- test/browser.js | 2 +- test/websockets-only.js | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/test/browser.js b/test/browser.js index 8f87d64..eb81af1 100644 --- a/test/browser.js +++ b/test/browser.js @@ -2,7 +2,7 @@ const w = require('webrtcsupport') -// require('./websockets-only') +require('./websockets-only') if (w.support) { require('./webrtc-star-only') diff --git a/test/websockets-only.js b/test/websockets-only.js index 77a53c1..7809251 100644 --- a/test/websockets-only.js +++ b/test/websockets-only.js @@ -66,7 +66,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it('libp2p.dialByMultiaddr on Protocol nodeA to nodeB', (done) => { + it.skip('libp2p.dialByMultiaddr on Protocol nodeA to nodeB', (done) => { nodeA.dialByMultiaddr(peerB.multiaddrs[0], '/echo/1.0.0', (err, conn) => { expect(err).to.not.exist const peers = nodeA.peerBook.getAll() @@ -85,7 +85,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it('libp2p.hangupByMultiaddr nodeA to nodeB', (done) => { + it.skip('libp2p.hangupByMultiaddr nodeA to nodeB', (done) => { nodeA.hangUpByMultiaddr(peerB.multiaddrs[0], (err) => { expect(err).to.not.exist setTimeout(check, 500) @@ -100,7 +100,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it('libp2p.dialByPeerInfo nodeA to nodeB', (done) => { + it.skip('libp2p.dialByPeerInfo nodeA to nodeB', (done) => { nodeA.dialByPeerInfo(peerB, (err) => { expect(err).to.not.exist // Some time for Identify to finish @@ -116,7 +116,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it('libp2p.dialByPeerInfo on Protocol nodeA to nodeB', (done) => { + it.skip('libp2p.dialByPeerInfo on Protocol nodeA to nodeB', (done) => { nodeA.dialByPeerInfo(peerB, '/echo/1.0.0', (err, conn) => { expect(err).to.not.exist const peers = nodeA.peerBook.getAll() @@ -135,7 +135,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it('libp2p.hangupByPeerInfo nodeA to nodeB', (done) => { + it.skip('libp2p.hangupByPeerInfo nodeA to nodeB', (done) => { nodeA.hangUpByPeerInfo(peerB, (err) => { expect(err).to.not.exist setTimeout(check, 500) @@ -156,7 +156,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { it.skip('libp2p.dialById on Protocol nodeA to nodeB', (done) => {}) it.skip('libp2p.hangupById nodeA to nodeB', (done) => {}) - describe('stress', () => { + describe.skip('stress', () => { it('one big write', (done) => { nodeA.dialByPeerInfo(peerB, '/echo/1.0.0', (err, conn) => { expect(err).to.not.exist From 6811496cb5d8aba41b530926a5559d8f61e5300a Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Thu, 10 Nov 2016 17:54:38 +0100 Subject: [PATCH 7/8] undo test skips --- test/websockets-only.js | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/test/websockets-only.js b/test/websockets-only.js index 7809251..77a53c1 100644 --- a/test/websockets-only.js +++ b/test/websockets-only.js @@ -66,7 +66,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it.skip('libp2p.dialByMultiaddr on Protocol nodeA to nodeB', (done) => { + it('libp2p.dialByMultiaddr on Protocol nodeA to nodeB', (done) => { nodeA.dialByMultiaddr(peerB.multiaddrs[0], '/echo/1.0.0', (err, conn) => { expect(err).to.not.exist const peers = nodeA.peerBook.getAll() @@ -85,7 +85,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it.skip('libp2p.hangupByMultiaddr nodeA to nodeB', (done) => { + it('libp2p.hangupByMultiaddr nodeA to nodeB', (done) => { nodeA.hangUpByMultiaddr(peerB.multiaddrs[0], (err) => { expect(err).to.not.exist setTimeout(check, 500) @@ -100,7 +100,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it.skip('libp2p.dialByPeerInfo nodeA to nodeB', (done) => { + it('libp2p.dialByPeerInfo nodeA to nodeB', (done) => { nodeA.dialByPeerInfo(peerB, (err) => { expect(err).to.not.exist // Some time for Identify to finish @@ -116,7 +116,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it.skip('libp2p.dialByPeerInfo on Protocol nodeA to nodeB', (done) => { + it('libp2p.dialByPeerInfo on Protocol nodeA to nodeB', (done) => { nodeA.dialByPeerInfo(peerB, '/echo/1.0.0', (err, conn) => { expect(err).to.not.exist const peers = nodeA.peerBook.getAll() @@ -135,7 +135,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { }) }) - it.skip('libp2p.hangupByPeerInfo nodeA to nodeB', (done) => { + it('libp2p.hangupByPeerInfo nodeA to nodeB', (done) => { nodeA.hangUpByPeerInfo(peerB, (err) => { expect(err).to.not.exist setTimeout(check, 500) @@ -156,7 +156,7 @@ describe('libp2p-ipfs-browser (websockets only)', () => { it.skip('libp2p.dialById on Protocol nodeA to nodeB', (done) => {}) it.skip('libp2p.hangupById nodeA to nodeB', (done) => {}) - describe.skip('stress', () => { + describe('stress', () => { it('one big write', (done) => { nodeA.dialByPeerInfo(peerB, '/echo/1.0.0', (err, conn) => { expect(err).to.not.exist From 81bdc38f9e2fdb2690a4ba2642362ef8e0160ad5 Mon Sep 17 00:00:00 2001 From: David Dias Date: Fri, 11 Nov 2016 09:00:16 +0000 Subject: [PATCH 8/8] chore: update deps --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index e65b132..b9a1492 100644 --- a/package.json +++ b/package.json @@ -43,11 +43,11 @@ "webrtcsupport": "^2.2.0" }, "dependencies": { - "libp2p-secio": "^0.6.2", + "libp2p-secio": "^0.6.3", "libp2p-spdy": "^0.10.0", - "libp2p-swarm": "^0.26.0", + "libp2p-swarm": "^0.26.1", "libp2p-webrtc-star": "^0.5.0", - "libp2p-websockets": "^0.9.0", + "libp2p-websockets": "^0.9.1", "mafmt": "^2.1.2", "multiaddr": "^2.0.3", "peer-book": "^0.3.0",