fix: remove node globals and uses ipld-block (#220)

* fix: remove node globals and uses ipld-block

This PR removes node globals based on the 0.27.1 released.

This should be released as 0.27.2 so we can moved foward with ipld-block changes upstream without waiting on the >0.28

* fix: add ipfs utils dep

Author: hugomrdias

package.json

@@ -43,13 +43,15 @@
   "homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme",
   "devDependencies": {
     "@nodeutils/defaults-deep": "^1.1.0",
-    "aegir": "^20.3.1",
+    "aegir": "^21.9.2",
     "async-iterator-all": "^1.0.0",
     "benchmark": "^2.1.4",
     "chai": "^4.2.0",
     "delay": "^4.3.0",
     "dirty-chai": "^2.0.1",
-    "ipfs-repo": "^0.28.2",
+    "ipfs-repo": "^2.1.0",
+    "ipfs-utils": "^2.2.1",
+    "iso-random-stream": "^1.1.1",
     "libp2p": "^0.27.0",
     "libp2p-kad-dht": "^0.18.3",
     "libp2p-mplex": "^0.9.2",
@@ -68,24 +70,24 @@
     "peer-info": "^0.17.0",
     "promisify-es6": "^1.0.3",
     "rimraf": "^3.0.0",
-    "safe-buffer": "^5.1.2",
     "stats-lite": "^2.2.0",
     "uuid": "^3.3.2"
   },
   "dependencies": {
     "bignumber.js": "^9.0.0",
-    "cids": "~0.7.0",
+    "buffer": "^5.6.0",
+    "cids": "~0.8.0",
     "debug": "^4.1.0",
-    "ipfs-block": "~0.8.0",
+    "ipld-block": "^0.9.1",
     "it-length-prefixed": "^3.0.0",
     "it-pipe": "^1.1.0",
     "just-debounce-it": "^1.1.0",
     "moving-average": "^1.0.0",
     "multicodec": "^1.0.0",
     "multihashing-async": "^0.8.0",
-    "protons": "^1.0.1",
+    "protons": "^1.2.0",
     "streaming-iterables": "^4.1.1",
-    "varint-decoder": "~0.1.1"
+    "varint-decoder": "~0.4.0"
   },
   "pre-push": [
     "lint",

src/types/message/index.js

@@ -1,6 +1,6 @@
 'use strict'
 
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const CID = require('cids')
 const { getName } = require('multicodec')
 const vd = require('varint-decoder')

test/decision-engine/decision-engine.js

@@ -8,10 +8,10 @@ const PeerId = require('peer-id')
 const range = require('lodash.range')
 const difference = require('lodash.difference')
 const flatten = require('lodash.flatten')
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const CID = require('cids')
 const multihashing = require('multihashing-async')
-const Buffer = require('safe-buffer').Buffer
+const Buffer = require('buffer').Buffer
 
 const Message = require('../../src/types/message')
 const DecisionEngine = require('../../src/decision-engine')

test/network/gen-bitswap-network.node.js

@@ -5,8 +5,8 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-const Block = require('ipfs-block')
-const Buffer = require('safe-buffer').Buffer
+const Block = require('ipld-block')
+const Buffer = require('buffer').Buffer
 const crypto = require('crypto')
 const CID = require('cids')
 const multihashing = require('multihashing-async')

test/notifications.spec.js

@@ -6,7 +6,7 @@ chai.use(require('dirty-chai'))
 
 const expect = chai.expect
 const CID = require('cids')
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 
 const Notifications = require('../src/notifications')
 

test/types/message.spec.js

@@ -5,7 +5,7 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
 const CID = require('cids')
-const Buffer = require('safe-buffer').Buffer
+const Buffer = require('buffer').Buffer
 const loadFixture = require('aegir/fixtures')
 const testDataPath = 'test/fixtures/serialized-from-go'
 const rawMessageFullWantlist = loadFixture(testDataPath + '/bitswap110-message-full-wantlist')

test/utils.spec.js

@@ -2,7 +2,7 @@
 'use strict'
 const chai = require('chai')
 const CID = require('cids')
-const Block = require('ipfs-block')
+const Block = require('ipld-block')
 const { Buffer } = require('buffer')
 const multihashing = require('multihashing-async')
 const BitswapMessageEntry = require('../src/types/message/entry')

test/utils/make-block.js

@@ -2,16 +2,16 @@
 
 const multihashing = require('multihashing-async')
 const CID = require('cids')
-const Block = require('ipfs-block')
-const crypto = require('crypto')
+const Block = require('ipld-block')
+const randomBytes = require('iso-random-stream/src/random')
 const range = require('lodash.range')
-const Buffer = require('safe-buffer').Buffer
+const Buffer = require('buffer').Buffer
 const uuid = require('uuid/v4')
 
 module.exports = async (count, size) => {
   const blocks = await Promise.all(
     range(count || 1).map(async () => {
-      const data = size ? crypto.randomBytes(size) : Buffer.from(`hello world ${uuid()}`)
+      const data = size ? randomBytes(size) : Buffer.from(`hello world ${uuid()}`)
       const hash = await multihashing(data, 'sha2-256')
       return new Block(data, new CID(hash))
     })

test/utils/mocks.js

@@ -5,7 +5,7 @@ const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
 const PeerStore = require('libp2p/src/peer-store')
 const Node = require('./create-libp2p-node').bundle
-const os = require('os')
+const tmpdir = require('ipfs-utils/src/temp-dir')
 const Repo = require('ipfs-repo')
 const EventEmitter = require('events')
 
@@ -56,14 +56,14 @@ exports.mockNetwork = (calls, done) => {
 
   return {
     connectTo (p) {
-      setImmediate(() => {
+      setTimeout(() => {
         connects.push(p)
       })
     },
     sendMessage (p, msg) {
       messages.push([p, msg])
 
-      setImmediate(() => {
+      setTimeout(() => {
         finish()
       })
 
@@ -176,7 +176,7 @@ exports.genBitswapNetwork = async (n, enableDHT = false) => {
   })
 
   // create the repos
-  const tmpDir = os.tmpdir()
+  const tmpDir = tmpdir()
   netArray.forEach((net, i) => {
     const repoPath = tmpDir + '/' + net.peerInfo.id.toB58String()
     net.repo = new Repo(repoPath)

test/wantmanager/msg-queue.spec.js

@@ -7,7 +7,7 @@ const expect = chai.expect
 const PeerId = require('peer-id')
 const CID = require('cids')
 const multihashing = require('multihashing-async')
-const Buffer = require('safe-buffer').Buffer
+const Buffer = require('buffer').Buffer
 const Message = require('../../src/types/message')
 const MsgQueue = require('../../src/want-manager/msg-queue')