feat: add peerId param to bitswap.wantlist

Author: wraithgar

js/src/bitswap.js

@@ -2,14 +2,17 @@
 
 const chai = require('chai')
 const dirtyChai = require('dirty-chai')
+const series = require('async/series')
 const expect = chai.expect
 const statsTests = require('./utils/stats')
 chai.use(dirtyChai)
 const CID = require('cids')
 
 module.exports = (common) => {
   describe('.bitswap online', () => {
-    let ipfs
+    let ipfsA
+    let ipfsB
+    let ipfsBId
     const key = 'QmUBdnXXPyoDFXj3Hj39dNJ5VkN3QFRskXxcGaYFBB8CNR'
 
     before(function (done) {
@@ -19,38 +22,64 @@ module.exports = (common) => {
 
       common.setup((err, factory) => {
         expect(err).to.not.exist()
-        factory.spawnNode((err, node) => {
-          expect(err).to.not.exist()
-          ipfs = node
-          ipfs.block.get(new CID(key))
-            .then(() => {})
-            .catch(() => {})
-          setTimeout(done, 250)
-        })
+        series([
+          (cb) => factory.spawnNode((err, node) => {
+            expect(err).to.not.exist()
+            ipfsA = node
+            cb()
+          }),
+          (cb) => factory.spawnNode((err, node) => {
+            expect(err).to.not.exist()
+            ipfsB = node
+            cb()
+          }),
+          (cb) => {
+            ipfsB.id((err, id) => {
+              expect(err).to.not.exist()
+              const ipfsBAddr = id.addresses[0]
+              ipfsBId = id.id
+              ipfsA.swarm.connect(ipfsBAddr, cb)
+            })
+          },
+          (cb) => {
+            ipfsB.block.get(new CID(key))
+              .then(() => {})
+              .catch(() => {})
+            setTimeout(cb, 500)
+          }
+        ], done)
       })
     })
 
     after((done) => common.teardown(done))
 
     it('.stat', (done) => {
 
-      ipfs.bitswap.stat((err, stats) => {
+      ipfsA.bitswap.stat((err, stats) => {
         statsTests.expectIsBitswap(err, stats)
         done()
       })
     })
 
     it('.wantlist', (done) => {
-      ipfs.bitswap.wantlist((err, list) => {
+      ipfsB.bitswap.wantlist((err, list) => {
+        expect(err).to.not.exist()
+        expect(list[0].cid.toBaseEncodedString()).to.equal(key)
+        done()
+      })
+    })
+
+    it('.wantlist peerid', (done) => {
+      ipfsA.bitswap.wantlist(ipfsBId, (err, list) => {
         expect(err).to.not.exist()
         expect(list[0].cid.toBaseEncodedString()).to.equal(key)
         done()
       })
     })
 
     it('.unwant', (done) => {
-      ipfs.bitswap.unwant(new CID(key), (err) => {
-        ipfs.bitswap.wantlist((err, list) => {
+      ipfsA.bitswap.unwant(new CID(key), (err) => {
+        ipfsA.bitswap.wantlist((err, list) => {
           expect(list).to.be.empty()
           done()
         })