fix: content routing

libp2p · Mar 29, 2019 · 2fb1ab1 · 2fb1ab1
1 parent c81692d
commit 2fb1ab1
Show file tree

Hide file tree

Showing 9 changed files with 7 additions and 17 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,7 @@
     "dirty-chai": "^2.0.1",
     "go-libp2p-dep": "^6.0.30",
     "libp2p-daemon": "~0.2.0",
-    "libp2p-daemon-client": "~0.1.1",
+    "libp2p-daemon-client": "~0.1.2",
     "multiaddr": "^6.0.6",
     "rimraf": "^2.6.3"
   },

diff --git a/test/dht/content-routing/go2go.js b/test/dht/content-routing/go2go.js
@@ -36,8 +36,6 @@ describe('dht.contentRouting', () => {
   })
 
   it('go peer to go peer', async function () {
-    this.timeout(30 * 1000)
-
     const cid = new CID('QmVzw6MPsF96TyXBSRs1ptLoVMWRv5FCYJZZGJSVB2Hp39')
 
     await daemons[0].client.dht.provide(cid)

diff --git a/test/dht/content-routing/go2js.js b/test/dht/content-routing/go2js.js
@@ -36,8 +36,6 @@ describe('dht.contentRouting', () => {
   })
 
   it('go peer to js peer', async function () {
-    this.timeout(30 * 1000)
-
     const cid = new CID('QmVzw6MPsF96TyXBSRs1ptLoVMWRv5FCYJZZGJSVB2Hp39')
 
     await daemons[0].client.dht.provide(cid)

diff --git a/test/dht/content-routing/js2go.js b/test/dht/content-routing/js2go.js
@@ -36,8 +36,6 @@ describe('dht.contentRouting', () => {
   })
 
   it('go peer to js peer', async function () {
-    this.timeout(30 * 1000)
-
     const cid = new CID('QmVzw6MPsF96TyXBSRs1ptLoVMWRv5FCYJZZGJSVB2Hp39')
 
     await daemons[0].client.dht.provide(cid)

diff --git a/test/dht/content-routing/js2js.js b/test/dht/content-routing/js2js.js
@@ -36,8 +36,6 @@ describe('dht.contentRouting', () => {
   })
 
   it('js peer to js peer', async function () {
-    this.timeout(30 * 1000)
-
     const cid = new CID('QmVzw6MPsF96TyXBSRs1ptLoVMWRv5FCYJZZGJSVB2Hp39')
 
     await daemons[0].client.dht.provide(cid)

diff --git a/test/dht/peer-routing/go2go.js b/test/dht/peer-routing/go2go.js
@@ -26,8 +26,6 @@ describe('dht.peerRouting', () => {
   })
 
   it('go peer to go peer', async function () {
-    this.timeout(10 * 1000)
-
     const identify1 = await daemons[1].client.identify()
     const identify2 = await daemons[2].client.identify()
 

diff --git a/test/dht/peer-routing/go2js.js b/test/dht/peer-routing/go2js.js
@@ -26,8 +26,6 @@ describe('dht.peerRouting', () => {
   })
 
   it('go peer to js peer', async function () {
-    this.timeout(10 * 1000)
-
     const identify1 = await daemons[1].client.identify()
     const identify2 = await daemons[2].client.identify()
 

diff --git a/test/dht/peer-routing/js2go.js b/test/dht/peer-routing/js2go.js
@@ -26,8 +26,6 @@ describe('dht.peerRouting', () => {
   })
 
   it('js peer to go peer', async function () {
-    this.timeout(10 * 1000)
-
     const identify1 = await daemons[1].client.identify()
     const identify2 = await daemons[2].client.identify()
 
@@ -38,6 +36,9 @@ describe('dht.peerRouting', () => {
     // connect 0 => 2
     await daemons[0].client.connect(identify2.peerId, identify2.addrs)
 
+    // daemons[0] will take some time to have the peers in the routing table
+    await new Promise(resolve => setTimeout(resolve, 1000))
+
     // peer 1 find peer 2
     const peerInfo = await daemons[1].client.dht.findPeer(identify2.peerId)
 

diff --git a/test/dht/peer-routing/js2js.js b/test/dht/peer-routing/js2js.js
@@ -26,8 +26,6 @@ describe('dht.peerRouting', () => {
   })
 
   it('js peer to js peer', async function () {
-    this.timeout(10 * 1000)
-
     const identify1 = await daemons[1].client.identify()
     const identify2 = await daemons[2].client.identify()
 
@@ -38,6 +36,9 @@ describe('dht.peerRouting', () => {
     // connect 0 => 2
     await daemons[0].client.connect(identify2.peerId, identify2.addrs)
 
+    // daemons[0] will take some time to have the peers in the routing table
+    await new Promise(resolve => setTimeout(resolve, 1000))
+
     // peer 1 find peer 2
     const peerInfo = await daemons[1].client.dht.findPeer(identify2.peerId)