From b83e5dd8dc0109db746995f0cc6f2620b41bcd61 Mon Sep 17 00:00:00 2001 From: David Dias Date: Tue, 15 Mar 2016 09:57:06 +0000 Subject: [PATCH] complete --- package.json | 4 ++-- src/index.js | 3 ++- tests/swarm-test.js | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 69116f1d..e9ccf2fa 100644 --- a/package.json +++ b/package.json @@ -33,9 +33,9 @@ "chai": "^3.5.0", "istanbul": "^0.4.2", "libp2p-spdy": "^0.2.3", - "libp2p-tcp": "^0.3.0", + "libp2p-tcp": "^0.4.0", "mocha": "^2.4.5", - "multiaddr": "^1.1.1", + "multiaddr": "^1.3.0", "peer-id": "^0.6.0", "peer-info": "^0.6.0", "pre-commit": "^1.1.2", diff --git a/src/index.js b/src/index.js index c454b823..d7566093 100644 --- a/src/index.js +++ b/src/index.js @@ -41,7 +41,8 @@ function Swarm (peerInfo) { multiaddrs = [multiaddrs] } - // TODO a) filter the multiaddrs that are actually valid for this transport (use a func from the transport itself) (maybe even make the transport do that) + // a) filter the multiaddrs that are actually valid for this transport (use a func from the transport itself) (maybe even make the transport do that) + multiaddrs = t.filter(multiaddrs) // b) if multiaddrs.length = 1, return the conn from the // transport, otherwise, create a passthrough diff --git a/tests/swarm-test.js b/tests/swarm-test.js index 18b2e7ca..1d5107e6 100644 --- a/tests/swarm-test.js +++ b/tests/swarm-test.js @@ -77,6 +77,7 @@ describe('transport - tcp', function () { it('dial to set of multiaddr, only one is available', (done) => { const conn = swarmA.transport.dial('tcp', [ + multiaddr('/ip4/127.0.0.1/tcp/9910/websockets'), // not valid on purpose multiaddr('/ip4/127.0.0.1/tcp/9910'), multiaddr('/ip4/127.0.0.1/tcp/9999'), multiaddr('/ip4/127.0.0.1/tcp/9309')