From bc1c84999ab56f1be3276eefc82131be8b4c72b0 Mon Sep 17 00:00:00 2001
From: Hugo Dias <hugomrdias@gmail.com>
Date: Mon, 27 Apr 2020 10:25:34 +0100
Subject: [PATCH] fix: add buffer

---
 package.json                            | 1 +
 src/message/index.js                    | 2 +-
 src/providers.js                        | 2 +-
 src/rpc/handlers/find-node.js           | 1 +
 src/utils.js                            | 1 +
 test/kad-dht.spec.js                    | 2 +-
 test/kad-utils.spec.js                  | 1 +
 test/message.spec.js                    | 2 +-
 test/multiple-nodes.spec.js             | 2 +-
 test/network.spec.js                    | 2 +-
 test/peer-distance-list.spec.js         | 2 +-
 test/peer-queue.spec.js                 | 2 +-
 test/providers.spec.js                  | 2 +-
 test/query.spec.js                      | 2 +-
 test/query/index.spec.js                | 2 +-
 test/rpc/handlers/add-provider.spec.js  | 2 +-
 test/rpc/handlers/find-node.spec.js     | 2 +-
 test/rpc/handlers/get-providers.spec.js | 2 +-
 test/rpc/handlers/get-value.spec.js     | 2 +-
 test/rpc/handlers/ping.spec.js          | 2 +-
 test/rpc/handlers/put-value.spec.js     | 2 +-
 test/rpc/index.spec.js                  | 2 +-
 test/simulation/index.js                | 2 +-
 test/utils/to-buffer.js                 | 2 ++
 24 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/package.json b/package.json
index 80fa8236..6691f587 100644
--- a/package.json
+++ b/package.json
@@ -40,6 +40,7 @@
     "abort-controller": "^3.0.0",
     "async": "^2.6.2",
     "base32.js": "~0.1.0",
+    "buffer": "^5.6.0",
     "cids": "~0.8.0",
     "debug": "^4.1.1",
     "err-code": "^2.0.0",
diff --git a/src/message/index.js b/src/message/index.js
index df8d5353..01916c07 100644
--- a/src/message/index.js
+++ b/src/message/index.js
@@ -4,7 +4,7 @@ const PeerId = require('peer-id')
 const multiaddr = require('multiaddr')
 const protons = require('protons')
 const { Record } = require('libp2p-record')
-
+const { Buffer } = require('buffer')
 const pbm = protons(require('./dht.proto'))
 
 const MESSAGE_TYPE = pbm.Message.MessageType
diff --git a/src/providers.js b/src/providers.js
index ab69bce4..26f308e2 100644
--- a/src/providers.js
+++ b/src/providers.js
@@ -5,7 +5,7 @@ const varint = require('varint')
 const PeerId = require('peer-id')
 const { Key } = require('interface-datastore')
 const { default: Queue } = require('p-queue')
-
+const { Buffer } = require('buffer')
 const c = require('./constants')
 const utils = require('./utils')
 
diff --git a/src/rpc/handlers/find-node.js b/src/rpc/handlers/find-node.js
index 6fee380a..9b992c87 100644
--- a/src/rpc/handlers/find-node.js
+++ b/src/rpc/handlers/find-node.js
@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const Message = require('../../message')
 const utils = require('../../utils')
 
diff --git a/src/utils.js b/src/utils.js
index 53d1477c..44c9deb4 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -10,6 +10,7 @@ const pMap = require('p-map')
 const { Record } = require('libp2p-record')
 const PeerId = require('peer-id')
 const errcode = require('err-code')
+const { Buffer } = require('buffer')
 
 /**
  * Creates a DHT ID by hashing a given buffer.
diff --git a/test/kad-dht.spec.js b/test/kad-dht.spec.js
index 59b6cfeb..c6bc1519 100644
--- a/test/kad-dht.spec.js
+++ b/test/kad-dht.spec.js
@@ -6,7 +6,7 @@ chai.use(require('dirty-chai'))
 chai.use(require('chai-checkmark'))
 const expect = chai.expect
 const sinon = require('sinon')
-
+const { Buffer } = require('buffer')
 const multiaddr = require('multiaddr')
 const { Record } = require('libp2p-record')
 const errcode = require('err-code')
diff --git a/test/kad-utils.spec.js b/test/kad-utils.spec.js
index 1eb49e81..a46d9a39 100644
--- a/test/kad-utils.spec.js
+++ b/test/kad-utils.spec.js
@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
diff --git a/test/message.spec.js b/test/message.spec.js
index 5fb6ebcb..6ff90814 100644
--- a/test/message.spec.js
+++ b/test/message.spec.js
@@ -11,7 +11,7 @@ const random = require('lodash.random')
 const { Record } = require('libp2p-record')
 const fs = require('fs')
 const path = require('path')
-
+const { Buffer } = require('buffer')
 const Message = require('../src/message')
 
 describe('Message', () => {
diff --git a/test/multiple-nodes.spec.js b/test/multiple-nodes.spec.js
index 3e006426..19733202 100644
--- a/test/multiple-nodes.spec.js
+++ b/test/multiple-nodes.spec.js
@@ -4,7 +4,7 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-
+const { Buffer } = require('buffer')
 const TestDHT = require('./utils/test-dht')
 
 describe('multiple nodes', () => {
diff --git a/test/network.spec.js b/test/network.spec.js
index 5a7bcc63..c0d9b9ba 100644
--- a/test/network.spec.js
+++ b/test/network.spec.js
@@ -4,7 +4,7 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-
+const { Buffer } = require('buffer')
 const pair = require('it-pair')
 const pipe = require('it-pipe')
 const delay = require('delay')
diff --git a/test/peer-distance-list.spec.js b/test/peer-distance-list.spec.js
index be6f02c8..34fea22f 100644
--- a/test/peer-distance-list.spec.js
+++ b/test/peer-distance-list.spec.js
@@ -5,7 +5,7 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
 const PeerId = require('peer-id')
-
+const { Buffer } = require('buffer')
 const kadUtils = require('../src/utils')
 const PeerDistanceList = require('../src/peer-list/peer-distance-list')
 
diff --git a/test/peer-queue.spec.js b/test/peer-queue.spec.js
index 9d50b870..8ac1c9fa 100644
--- a/test/peer-queue.spec.js
+++ b/test/peer-queue.spec.js
@@ -5,7 +5,7 @@ const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
 const PeerId = require('peer-id')
-
+const { Buffer } = require('buffer')
 const PeerQueue = require('../src/peer-list/peer-queue')
 
 describe('PeerQueue', () => {
diff --git a/test/providers.spec.js b/test/providers.spec.js
index 2115f478..570a4a0d 100644
--- a/test/providers.spec.js
+++ b/test/providers.spec.js
@@ -10,7 +10,7 @@ const LevelStore = require('datastore-level')
 const path = require('path')
 const os = require('os')
 const multihashing = require('multihashing-async')
-
+const { Buffer } = require('buffer')
 const Providers = require('../src/providers')
 
 const createPeerId = require('./utils/create-peer-id')
diff --git a/test/query.spec.js b/test/query.spec.js
index deca780d..c50e173c 100644
--- a/test/query.spec.js
+++ b/test/query.spec.js
@@ -6,7 +6,7 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const pDefer = require('p-defer')
 const delay = require('delay')
-
+const { Buffer } = require('buffer')
 const Query = require('../src/query')
 const kadUtils = require('../src/utils')
 
diff --git a/test/query/index.spec.js b/test/query/index.spec.js
index 917b77bf..cf69b88a 100644
--- a/test/query/index.spec.js
+++ b/test/query/index.spec.js
@@ -9,7 +9,7 @@ const expect = chai.expect
 const sinon = require('sinon')
 const delay = require('delay')
 const PeerStore = require('libp2p/src/peer-store')
-
+const { Buffer } = require('buffer')
 const Query = require('../../src/query')
 const Path = require('../../src/query/path')
 const Run = require('../../src/query/run')
diff --git a/test/rpc/handlers/add-provider.spec.js b/test/rpc/handlers/add-provider.spec.js
index 5f484ac3..075e1afe 100644
--- a/test/rpc/handlers/add-provider.spec.js
+++ b/test/rpc/handlers/add-provider.spec.js
@@ -5,7 +5,7 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-
+const { Buffer } = require('buffer')
 const multiaddr = require('multiaddr')
 
 const Message = require('../../../src/message')
diff --git a/test/rpc/handlers/find-node.spec.js b/test/rpc/handlers/find-node.spec.js
index 7538dea5..edd5cc7c 100644
--- a/test/rpc/handlers/find-node.spec.js
+++ b/test/rpc/handlers/find-node.spec.js
@@ -4,7 +4,7 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-
+const { Buffer } = require('buffer')
 const Message = require('../../../src/message')
 const handler = require('../../../src/rpc/handlers/find-node')
 
diff --git a/test/rpc/handlers/get-providers.spec.js b/test/rpc/handlers/get-providers.spec.js
index 76560f66..d8cc7ed1 100644
--- a/test/rpc/handlers/get-providers.spec.js
+++ b/test/rpc/handlers/get-providers.spec.js
@@ -4,7 +4,7 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-
+const { Buffer } = require('buffer')
 const Message = require('../../../src/message')
 const utils = require('../../../src/utils')
 const handler = require('../../../src/rpc/handlers/get-providers')
diff --git a/test/rpc/handlers/get-value.spec.js b/test/rpc/handlers/get-value.spec.js
index c3fcd9ca..0d445afa 100644
--- a/test/rpc/handlers/get-value.spec.js
+++ b/test/rpc/handlers/get-value.spec.js
@@ -4,7 +4,7 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-
+const { Buffer } = require('buffer')
 const Message = require('../../../src/message')
 const handler = require('../../../src/rpc/handlers/get-value')
 const utils = require('../../../src/utils')
diff --git a/test/rpc/handlers/ping.spec.js b/test/rpc/handlers/ping.spec.js
index 1df3b031..52e38bfc 100644
--- a/test/rpc/handlers/ping.spec.js
+++ b/test/rpc/handlers/ping.spec.js
@@ -4,7 +4,7 @@
 const chai = require('chai')
 chai.use(require('dirty-chai'))
 const expect = chai.expect
-
+const { Buffer } = require('buffer')
 const Message = require('../../../src/message')
 const handler = require('../../../src/rpc/handlers/ping')
 
diff --git a/test/rpc/handlers/put-value.spec.js b/test/rpc/handlers/put-value.spec.js
index 723d33c4..83e3e725 100644
--- a/test/rpc/handlers/put-value.spec.js
+++ b/test/rpc/handlers/put-value.spec.js
@@ -7,7 +7,7 @@ chai.use(require('dirty-chai'))
 const expect = chai.expect
 const { Record } = require('libp2p-record')
 const delay = require('delay')
-
+const { Buffer } = require('buffer')
 const Message = require('../../../src/message')
 const handler = require('../../../src/rpc/handlers/put-value')
 const utils = require('../../../src/utils')
diff --git a/test/rpc/index.spec.js b/test/rpc/index.spec.js
index 472629ac..21b81bf4 100644
--- a/test/rpc/index.spec.js
+++ b/test/rpc/index.spec.js
@@ -8,7 +8,7 @@ const pDefer = require('p-defer')
 const pipe = require('it-pipe')
 const lp = require('it-length-prefixed')
 const { collect } = require('streaming-iterables')
-
+const { Buffer } = require('buffer')
 const Message = require('../../src/message')
 const rpc = require('../../src/rpc')
 
diff --git a/test/simulation/index.js b/test/simulation/index.js
index b59392bf..79427d59 100644
--- a/test/simulation/index.js
+++ b/test/simulation/index.js
@@ -6,7 +6,7 @@
 const PeerStore = require('libp2p/src/peer-store')
 const PeerId = require('peer-id')
 const multihashes = require('multihashes')
-
+const { Buffer } = require('buffer')
 const RoutingTable = require('../../src/routing')
 const Message = require('../../src/message')
 const { convertBuffer } = require('../../src/utils')
diff --git a/test/utils/to-buffer.js b/test/utils/to-buffer.js
index 7865c0ba..aca80af2 100644
--- a/test/utils/to-buffer.js
+++ b/test/utils/to-buffer.js
@@ -1,4 +1,6 @@
 'use strict'
+const { Buffer } = require('buffer')
+
 /**
  * Converts BufferList messages to Buffers
  * @param {*} source