From a28118853c09c8596d24ac773c16d5e24411979f Mon Sep 17 00:00:00 2001
From: Vasco Santos <vasco.santos@moxy.studio>
Date: Mon, 6 Apr 2020 17:19:39 +0200
Subject: [PATCH] chore: peer-discovery not using peer-info

BREAKING CHANGE: peer event emits with id and multiaddrs properties instead of peer-info
---
 src/index.js                     | 9 +++++----
 test/compliance.spec.js          | 8 ++++++++
 test/transport/discovery.js      | 4 ++--
 test/transport/reconnect.node.js | 8 ++++----
 4 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/src/index.js b/src/index.js
index 73dc63ea..87761698 100644
--- a/src/index.js
+++ b/src/index.js
@@ -15,7 +15,6 @@ const webrtcSupport = require('webrtcsupport')
 const multiaddr = require('multiaddr')
 const mafmt = require('mafmt')
 const PeerId = require('peer-id')
-const PeerInfo = require('peer-info')
 
 const { CODE_CIRCUIT } = require('./constants')
 const createListener = require('./listener')
@@ -233,9 +232,11 @@ class WebRTCStar {
 
     const ma = multiaddr(maStr)
     const peerId = PeerId.createFromB58String(ma.getPeerId())
-    const peerInfo = new PeerInfo(peerId)
-    peerInfo.multiaddrs.add(ma)
-    this.discovery.emit('peer', peerInfo)
+
+    this.discovery.emit('peer', {
+      id: peerId,
+      multiaddrs: [ma]
+    })
   }
 }
 
diff --git a/test/compliance.spec.js b/test/compliance.spec.js
index b18b1693..9f67eee2 100644
--- a/test/compliance.spec.js
+++ b/test/compliance.spec.js
@@ -40,6 +40,8 @@ describe('interface-transport compliance', function () {
 })
 
 describe('interface-discovery compliance', () => {
+  let intervalId
+
   testsDiscovery({
     setup () {
       const mockUpgrader = {
@@ -47,8 +49,14 @@ describe('interface-discovery compliance', () => {
         upgradeOutbound: maConn => maConn
       }
       const ws = new WStar({ upgrader: mockUpgrader, wrtc: wrtc })
+      const maStr = '/ip4/127.0.0.1/tcp/15555/ws/p2p-webrtc-star/p2p/QmcgpsyWgH8Y8ajJz1Cu72KnS5uo2Aa2LpzU7kinSooo2d'
+
+      intervalId = setInterval(() => ws._peerDiscovered(maStr), 1000)
 
       return ws.discovery
+    },
+    teardown () {
+      clearInterval(intervalId)
     }
   })
 })
diff --git a/test/transport/discovery.js b/test/transport/discovery.js
index e13a200d..cb069e1e 100644
--- a/test/transport/discovery.js
+++ b/test/transport/discovery.js
@@ -31,8 +31,8 @@ module.exports = (create) => {
       ws2.discovery.start()
 
       const p = new Promise((resolve) => {
-        ws1.discovery.once('peer', (peerInfo) => {
-          expect(peerInfo.multiaddrs.has(ws2._signallingAddr)).to.equal(true)
+        ws1.discovery.once('peer', ({ multiaddrs }) => {
+          expect(multiaddrs.some((m) => m.equals(ws2._signallingAddr))).to.equal(true)
           resolve()
         })
       })
diff --git a/test/transport/reconnect.node.js b/test/transport/reconnect.node.js
index b419235b..c8e6c5ad 100644
--- a/test/transport/reconnect.node.js
+++ b/test/transport/reconnect.node.js
@@ -40,8 +40,8 @@ module.exports = (create) => {
       ws2 = await create()
 
       const p = new Promise((resolve) => {
-        ws1.discovery.once('peer', (peerInfo) => {
-          expect(peerInfo.multiaddrs.has(ws2._signallingAddr)).to.equal(true)
+        ws1.discovery.once('peer', ({ multiaddrs }) => {
+          expect(multiaddrs.some((m) => m.equals(ws2._signallingAddr))).to.equal(true)
           resolve()
         })
       })
@@ -71,8 +71,8 @@ module.exports = (create) => {
       await listener.listen(signallerAddr)
 
       await new Promise((resolve) => {
-        ws1.discovery.once('peer', (peerInfo) => {
-          expect(peerInfo.multiaddrs.has(ws3._signallingAddr)).to.equal(true)
+        ws1.discovery.once('peer', ({ multiaddrs }) => {
+          expect(multiaddrs.some((m) => m.equals(ws3._signallingAddr))).to.equal(true)
           resolve()
         })
       })