tests for with and without dht

package.json

@@ -4,7 +4,7 @@
   "description": "Node.js implementation of the Bitswap data exchange protocol used by IPFS",
   "main": "src/index.js",
   "browser": {
-    "./test/utils/libp2p-bundle": false,
+    "./test/utils/create-libp2p-node": false,
     "./test/utils/create-temp-repo-nodejs.js": "./test/utils/create-temp-repo-browser.js"
   },
   "scripts": {
@@ -40,25 +40,26 @@
   "devDependencies": {
     "aegir": "^11.0.2",
     "benchmark": "^2.1.4",
-    "chai": "^4.0.2",
-    "dirty-chai": "^2.0.0",
+    "chai": "^4.1.0",
+    "dirty-chai": "^2.0.1",
     "ipfs-repo": "~0.15.0",
-    "libp2p": "^0.9.1",
-    "libp2p-multiplex": "^0.4.3",
+    "libp2p": "^0.10.1",
+    "libp2p-kad-dht": "^0.2.1",
+    "libp2p-multiplex": "^0.4.4",
     "libp2p-secio": "^0.6.8",
     "libp2p-tcp": "^0.10.1",
     "lodash": "^4.17.4",
     "multiaddr": "^2.3.0",
     "ncp": "^2.0.0",
     "peer-book": "~0.4.0",
     "peer-id": "~0.8.7",
-    "peer-info": "~0.9.2",
+    "peer-info": "~0.9.3",
     "rimraf": "^2.6.1",
     "safe-buffer": "^5.1.1"
   },
   "dependencies": {
     "async": "^2.5.0",
-    "cids": "~0.5.0",
+    "cids": "~0.5.1",
     "debug": "^2.6.8",
     "ipfs-block": "~0.6.0",
     "lodash.debounce": "^4.0.8",

test/bitswap-mock-internals.js

@@ -0,0 +1,340 @@
+/* eslint-env mocha */
+/* eslint max-nested-callbacks: ["error", 8] */
+'use strict'
+
+const eachSeries = require('async/eachSeries')
+const waterfall = require('async/waterfall')
+const map = require('async/map')
+const parallel = require('async/parallel')
+const setImmediate = require('async/setImmediate')
+const _ = require('lodash')
+const chai = require('chai')
+chai.use(require('dirty-chai'))
+const expect = chai.expect
+const PeerId = require('peer-id')
+
+const Message = require('../src/types/message')
+const Bitswap = require('../src')
+
+const createTempRepo = require('./utils/create-temp-repo-nodejs')
+const mockNetwork = require('./utils/mocks').mockNetwork
+const applyNetwork = require('./utils/mocks').applyNetwork
+const mockLibp2pNode = require('./utils/mocks').mockLibp2pNode
+const storeHasBlocks = require('./utils/store-has-blocks')
+const makeBlock = require('./utils/make-block')
+
+describe('bitswap with mocks', () => {
+  let repo
+  let blocks
+  let ids
+
+  before((done) => {
+    parallel([
+      (cb) => createTempRepo(cb),
+      (cb) => map(_.range(15), (i, cb) => makeBlock(cb), cb),
+      (cb) => map(_.range(2), (i, cb) => PeerId.create(cb), cb)
+    ], (err, results) => {
+      if (err) {
+        return done(err)
+      }
+
+      repo = results[0]
+      blocks = results[1]
+      ids = results[2]
+
+      done()
+    })
+  })
+
+  after((done) => repo.teardown(done))
+
+  describe('receive message', () => {
+    it('simple block message', (done) => {
+      const bs = new Bitswap(mockLibp2pNode(), repo.blocks)
+      bs.start()
+
+      const other = ids[1]
+
+      const b1 = blocks[0]
+      const b2 = blocks[1]
+
+      const msg = new Message(false)
+      msg.addBlock(b1)
+      msg.addBlock(b2)
+
+      bs._receiveMessage(other, msg, (err) => {
+        expect(err).to.not.exist()
+        expect(bs.blocksRecvd).to.equal(2)
+        expect(bs.dupBlocksRecvd).to.equal(0)
+
+        map([b1.cid, b2.cid], (cid, cb) => repo.blocks.get(cid, cb), (err, blocks) => {
+          expect(err).to.not.exist()
+
+          expect(blocks[0].data).to.eql(b1.data)
+          expect(blocks[1].data).to.eql(b2.data)
+          done()
+        })
+      })
+    })
+
+    it('simple want message', (done) => {
+      const bs = new Bitswap(mockLibp2pNode(), repo.blocks)
+      bs.start()
+
+      const other = ids[1]
+      const b1 = blocks[0]
+      const b2 = blocks[1]
+
+      const msg = new Message(false)
+
+      msg.addEntry(b1.cid, 1, false)
+      msg.addEntry(b2.cid, 1, false)
+
+      bs._receiveMessage(other, msg, (err) => {
+        expect(err).to.not.exist()
+
+        expect(bs.blocksRecvd).to.be.eql(0)
+        expect(bs.dupBlocksRecvd).to.be.eql(0)
+
+        const wl = bs.wantlistForPeer(other)
+
+        expect(wl.has(b1.cid.buffer.toString())).to.eql(true)
+        expect(wl.has(b2.cid.buffer.toString())).to.eql(true)
+
+        done()
+      })
+    })
+
+    it('multi peer', (done) => {
+      const bs = new Bitswap(mockLibp2pNode(), repo.blocks)
+
+      let others
+      let blocks
+
+      bs.start()
+
+      parallel([
+        (cb) => map(_.range(5), (i, cb) => PeerId.create(cb), cb),
+        (cb) => map(_.range(10), (i, cb) => makeBlock(cb), cb)
+      ], (err, results) => {
+        if (err) {
+          return done(err)
+        }
+
+        others = results[0]
+        blocks = results[1]
+        test()
+      })
+
+      function test () {
+        map(_.range(5), (i, cb) => {
+          const msg = new Message(false)
+          msg.addBlock(blocks[i])
+          msg.addBlock(blocks[5 + 1])
+          cb(null, msg)
+        }, (err, messages) => {
+          expect(err).to.not.exist()
+          let i = 0
+          eachSeries(others, (other, cb) => {
+            const msg = messages[i]
+            i++
+            bs._receiveMessage(other, msg, (err) => {
+              expect(err).to.not.exist()
+              storeHasBlocks(msg, repo.blocks, cb)
+            })
+          }, done)
+        })
+      }
+    })
+  })
+
+  describe('get', () => {
+    it('block exists locally', (done) => {
+      const block = blocks[4]
+
+      repo.blocks.put(block, (err) => {
+        expect(err).to.not.exist()
+        const bs = new Bitswap(mockLibp2pNode(), repo.blocks)
+
+        bs.get(block.cid, (err, res) => {
+          expect(err).to.not.exist()
+          expect(res).to.eql(block)
+          done()
+        })
+      })
+    })
+
+    it('blocks exist locally', (done) => {
+      const b1 = blocks[3]
+      const b2 = blocks[14]
+      const b3 = blocks[13]
+
+      repo.blocks.putMany([b1, b2, b3], (err) => {
+        expect(err).to.not.exist()
+
+        const bs = new Bitswap(mockLibp2pNode(), repo.blocks)
+
+        bs.getMany([b1.cid, b2.cid, b3.cid], (err, res) => {
+          expect(err).to.not.exist()
+          expect(res).to.be.eql([b1, b2, b3])
+          done()
+        })
+      })
+    })
+
+    it('getMany', (done) => {
+      const b1 = blocks[5]
+      const b2 = blocks[6]
+      const b3 = blocks[7]
+
+      repo.blocks.putMany([b1, b2, b3], (err) => {
+        expect(err).to.not.exist()
+
+        const bs = new Bitswap(mockLibp2pNode(), repo.blocks)
+
+        map([b1.cid, b2.cid, b3.cid], (cid, cb) => bs.get(cid, cb), (err, res) => {
+          expect(err).to.not.exist()
+          expect(res).to.eql([b1, b2, b3])
+          done()
+        })
+      })
+    })
+
+    it('block is added locally afterwards', (done) => {
+      const block = blocks[9]
+      const bs = new Bitswap(mockLibp2pNode(), repo.blocks)
+      const net = mockNetwork()
+
+      bs.network = net
+      bs.wm.network = net
+      bs.engine.network = net
+      bs.start()
+
+      bs.get(block.cid, (err, res) => {
+        expect(err).to.not.exist()
+        expect(res).to.be.eql(block)
+        done()
+      })
+
+      setTimeout(() => bs.put(block, () => {}), 200)
+    })
+
+    it('block is sent after local add', (done) => {
+      const me = ids[0]
+      const other = ids[1]
+      const block = blocks[10]
+      let bs1
+      let bs2
+
+      const n1 = {
+        connectTo (id, cb) {
+          let err
+          if (id.toHexString() !== other.toHexString()) {
+            err = new Error('unkown peer')
+          }
+          setImmediate(() => cb(err))
+        },
+        sendMessage (id, msg, cb) {
+          if (id.toHexString() === other.toHexString()) {
+            bs2._receiveMessage(me, msg, cb)
+          } else {
+            setImmediate(() => cb(new Error('unkown peer')))
+          }
+        },
+        start () {},
+        stop () {},
+        findAndConnect (cid, maxProviders, callback) {
+          setImmediate(() => callback)
+        },
+        provide (cid, callback) {
+          setImmediate(() => callback)
+        }
+      }
+      const n2 = {
+        connectTo (id, cb) {
+          let err
+          if (id.toHexString() !== me.toHexString()) {
+            err = new Error('unkown peer')
+          }
+          setImmediate(() => cb(err))
+        },
+        sendMessage (id, msg, cb) {
+          if (id.toHexString() === me.toHexString()) {
+            bs1._receiveMessage(other, msg, cb)
+          } else {
+            setImmediate(() => cb(new Error('unkown peer')))
+          }
+        },
+        start () {},
+        stop () {},
+        findAndConnect (cid, maxProviders, callback) {
+          setImmediate(() => callback)
+        },
+        provide (cid, callback) {
+          setImmediate(() => callback)
+        }
+      }
+      bs1 = new Bitswap(mockLibp2pNode, repo.blocks)
+      applyNetwork(bs1, n1)
+      bs1.start()
+
+      let repo2
+
+      waterfall([
+        (cb) => createTempRepo(cb),
+        (repo, cb) => {
+          repo2 = repo
+          bs2 = new Bitswap(mockLibp2pNode(), repo2.blocks)
+          applyNetwork(bs2, n2)
+          bs2.start()
+          bs1._onPeerConnected(other)
+          bs2._onPeerConnected(me)
+
+          bs1.get(block.cid, (err, res) => {
+            expect(err).to.not.exist()
+            cb(null, res)
+          })
+          setTimeout(() => bs2.put(block, () => {}), 1000)
+        },
+        (res, cb) => {
+          expect(res).to.eql(block)
+          cb()
+        }
+      ], done)
+    })
+  })
+
+  describe('stat', () => {
+    it('has initial stats', () => {
+      const bs = new Bitswap(mockLibp2pNode(), {})
+
+      const stats = bs.stat()
+      expect(stats).to.have.property('wantlist')
+      expect(stats).to.have.property('blocksReceived', 0)
+      expect(stats).to.have.property('dupBlksReceived', 0)
+      expect(stats).to.have.property('dupDataReceived', 0)
+      expect(stats).to.have.property('peers')
+    })
+  })
+
+  describe('unwant', () => {
+    it('removes blocks that are wanted multiple times', (done) => {
+      const bs = new Bitswap(mockLibp2pNode(), repo.blocks)
+      bs.start()
+      const b = blocks[11]
+
+      let counter = 0
+      const check = (err, res) => {
+        expect(err).to.not.exist()
+        expect(res).to.not.exist()
+
+        if (++counter === 2) { done() }
+      }
+
+      bs.get(b.cid, check)
+      bs.get(b.cid, check)
+
+      setTimeout(() => bs.unwant(b.cid), 10)
+    })
+  })
+})