fix: Cleanup some todos - fix: #28

libp2p · Oct 28, 2017 · aebb3c5 · aebb3c5
1 parent f29ef52
commit aebb3c5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 7 deletions.
diff --git a/src/index.js b/src/index.js
@@ -11,6 +11,7 @@ const setImmediate = require('async/setImmediate')
 const utils = require('./utils')
 const Listener = require('./listener')
 const cleanUrlSIO = utils.cleanUrlSIO
+const mafmt = require('mafmt')
 
 class WebsocketStar {
   /**
@@ -101,10 +102,7 @@ class WebsocketStar {
       multiaddrs = [multiaddrs]
     }
 
-    return multiaddrs.filter((ma) => {
-      // TODO this should be using mafmt
-      return ma.toString().indexOf('p2p-websocket-star') > 0
-    })
+    return multiaddrs.filter((ma) => mafmt.WebSocketStar.matches(ma))
   }
 
   /**

diff --git a/test/discovery.spec.js b/test/discovery.spec.js
@@ -11,7 +11,6 @@ const each = require('async/each')
 
 const WebSocketStar = require('../src')
 
-// TODO Peer Discovery is broken
 describe('peer discovery', () => {
   let listeners = []
   let ws1

diff --git a/test/filter.spec.js b/test/filter.spec.js
@@ -11,7 +11,7 @@ const multiaddr = require('multiaddr')
 const WebSocketStar = require('../src')
 
 describe('filter', () => {
-  it('filters non valid webrtc-star multiaddrs', () => {
+  it('filters non valid websocket-star multiaddrs', () => {
     const ws = new WebSocketStar()
 
     const maArr = [
@@ -30,7 +30,7 @@ describe('filter', () => {
 
     const filtered = ws.filter(maArr)
     expect(filtered.length).to.not.equal(maArr.length)
-    expect(filtered.length).to.equal(10)
+    expect(filtered.length).to.equal(8)
   })
 
   it('filter a single addr for this transport', () => {