Skip to content

Commit 6b4dc32

Browse files
authored
fix: use ipld-block and remove node globals (#218)
- add buffer to the deps - swaps ipfs-block with ipld-block - removes safe-buffer - updates deps BREAKING CHANGE: swaps ipfs-block with ipld-block related to ipfs/js-ipfs#2924
1 parent 3ae81cb commit 6b4dc32

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

package.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,13 @@
4343
"homepage": "https://github.com/ipfs/js-ipfs-bitswap#readme",
4444
"devDependencies": {
4545
"@nodeutils/defaults-deep": "^1.1.0",
46-
"aegir": "^20.3.1",
46+
"aegir": "^21.9.0",
4747
"async-iterator-all": "^1.0.0",
4848
"benchmark": "^2.1.4",
4949
"chai": "^4.2.0",
5050
"delay": "^4.3.0",
5151
"dirty-chai": "^2.0.1",
52-
"ipfs-repo": "^0.28.2",
52+
"ipfs-repo": "^2.0.0",
5353
"libp2p": "^0.27.0",
5454
"libp2p-kad-dht": "^0.18.3",
5555
"libp2p-mplex": "^0.9.2",
@@ -68,15 +68,15 @@
6868
"peer-info": "^0.17.0",
6969
"promisify-es6": "^1.0.3",
7070
"rimraf": "^3.0.0",
71-
"safe-buffer": "^5.1.2",
71+
"buffer": "^5.6.0",
7272
"stats-lite": "^2.2.0",
7373
"uuid": "^3.3.2"
7474
},
7575
"dependencies": {
7676
"bignumber.js": "^9.0.0",
77-
"cids": "~0.7.0",
77+
"cids": "~0.8.0",
7878
"debug": "^4.1.0",
79-
"ipfs-block": "~0.8.0",
79+
"ipld-block": "^0.9.1",
8080
"it-length-prefixed": "^3.0.0",
8181
"it-pipe": "^1.1.0",
8282
"just-debounce-it": "^1.1.0",

src/types/message/index.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
'use strict'
22

3-
const Block = require('ipfs-block')
3+
const Block = require('ipld-block')
44
const CID = require('cids')
55
const { getName } = require('multicodec')
66
const vd = require('varint-decoder')

test/decision-engine/decision-engine.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@ const PeerId = require('peer-id')
88
const range = require('lodash.range')
99
const difference = require('lodash.difference')
1010
const flatten = require('lodash.flatten')
11-
const Block = require('ipfs-block')
11+
const Block = require('ipld-block')
1212
const CID = require('cids')
1313
const multihashing = require('multihashing-async')
14-
const Buffer = require('safe-buffer').Buffer
14+
const { Buffer } = require('buffer')
1515

1616
const Message = require('../../src/types/message')
1717
const DecisionEngine = require('../../src/decision-engine')

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
const chai = require('chai')
66
chai.use(require('dirty-chai'))
77
const expect = chai.expect
8-
const Block = require('ipfs-block')
9-
const Buffer = require('safe-buffer').Buffer
8+
const Block = require('ipld-block')
9+
const { Buffer } = require('buffer')
1010
const crypto = require('crypto')
1111
const CID = require('cids')
1212
const multihashing = require('multihashing-async')

test/notifications.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ chai.use(require('dirty-chai'))
66

77
const expect = chai.expect
88
const CID = require('cids')
9-
const Block = require('ipfs-block')
9+
const Block = require('ipld-block')
1010

1111
const Notifications = require('../src/notifications')
1212

test/types/message.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const chai = require('chai')
55
chai.use(require('dirty-chai'))
66
const expect = chai.expect
77
const CID = require('cids')
8-
const Buffer = require('safe-buffer').Buffer
8+
const { Buffer } = require('buffer')
99
const loadFixture = require('aegir/fixtures')
1010
const testDataPath = 'test/fixtures/serialized-from-go'
1111
const rawMessageFullWantlist = loadFixture(testDataPath + '/bitswap110-message-full-wantlist')

test/utils.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
'use strict'
33
const chai = require('chai')
44
const CID = require('cids')
5-
const Block = require('ipfs-block')
5+
const Block = require('ipld-block')
66
const { Buffer } = require('buffer')
77
const multihashing = require('multihashing-async')
88
const BitswapMessageEntry = require('../src/types/message/entry')

test/utils/make-block.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22

33
const multihashing = require('multihashing-async')
44
const CID = require('cids')
5-
const Block = require('ipfs-block')
5+
const Block = require('ipld-block')
66
const crypto = require('crypto')
77
const range = require('lodash.range')
8-
const Buffer = require('safe-buffer').Buffer
8+
const { Buffer } = require('buffer')
99
const uuid = require('uuid/v4')
1010

1111
module.exports = async (count, size) => {

test/wantmanager/msg-queue.spec.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ const expect = chai.expect
77
const PeerId = require('peer-id')
88
const CID = require('cids')
99
const multihashing = require('multihashing-async')
10-
const Buffer = require('safe-buffer').Buffer
10+
const { Buffer } = require('buffer')
1111
const Message = require('../../src/types/message')
1212
const MsgQueue = require('../../src/want-manager/msg-queue')
1313

0 commit comments

Comments
 (0)