Skip to content

Commit 22b97bc

Browse files
achingbrainachingbrain
authored
Merge pull request ipfs#532 from ipfs/update-dag-pb
chore: upgrade dag-pb to the new, new api
2 parents 1a08a28 + 00b577e commit 22b97bc

File tree

11 files changed

+76
-84
lines changed

11 files changed

+76
-84
lines changed

‎package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
"async": "^2.6.2",
4040
"bl": "^3.0.0",
4141
"bs58": "^4.0.1",
42+
"callbackify": "^1.1.0",
4243
"chai": "^4.2.0",
4344
"cids": "~0.7.1",
4445
"concat-stream": "^2.0.0",
@@ -50,7 +51,7 @@
5051
"ipfs-unixfs": "~0.1.16",
5152
"ipfs-utils": "~0.1.0",
5253
"ipld-dag-cbor": "~0.15.0",
53-
"ipld-dag-pb": "~0.17.3",
54+
"ipld-dag-pb": "^0.18.1",
5455
"is-ipfs": "~0.6.1",
5556
"is-plain-object": "^3.0.0",
5657
"it-pushable": "^1.2.1",

‎src/dag/get.js

+5-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ module.exports = (createCommon, options) => {
4949
const someData = Buffer.from('some other data')
5050

5151
try {
52-
pbNode = DAGNode.create(someData)
52+
pbNode = new DAGNode(someData)
5353
} catch (err) {
5454
return cb(err)
5555
}
@@ -62,15 +62,15 @@ module.exports = (createCommon, options) => {
6262
},
6363
(cb) => {
6464
try {
65-
nodePb = DAGNode.create(Buffer.from('I am inside a Protobuf'))
65+
nodePb = new DAGNode(Buffer.from('I am inside a Protobuf'))
6666
} catch (err) {
6767
return cb(err)
6868
}
6969

7070
cb()
7171
},
7272
(cb) => {
73-
dagPB.util.cid(dagPB.util.serialize(nodePb))
73+
dagPB.util.cid(nodePb.serialize())
7474
.then(cid => {
7575
cidPb = cid
7676
cb()
@@ -139,7 +139,7 @@ module.exports = (createCommon, options) => {
139139

140140
const node = result.value
141141

142-
dagPB.util.cid(dagPB.util.serialize(node))
142+
dagPB.util.cid(node.serialize())
143143
.then(cid => {
144144
expect(cid).to.eql(cidPb)
145145
done()
@@ -232,7 +232,7 @@ module.exports = (createCommon, options) => {
232232
it('should get a node added as CIDv0 with a CIDv1', done => {
233233
const input = Buffer.from(`TEST${Date.now()}`)
234234

235-
const node = dagPB.DAGNode.create(input)
235+
const node = new DAGNode(input)
236236

237237
ipfs.dag.put(node, { format: 'dag-pb', hashAlg: 'sha2-256' }, (err, cid) => {
238238
expect(err).to.not.exist()

‎src/dag/put.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ module.exports = (createCommon, options) => {
4242
const someData = Buffer.from('some data')
4343

4444
try {
45-
pbNode = DAGNode.create(someData)
45+
pbNode = new DAGNode(someData)
4646
} catch (err) {
4747
return done(err)
4848
}

‎src/dag/tree.js

+3-2
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@
44
const series = require('async/series')
55
const eachSeries = require('async/eachSeries')
66
const dagPB = require('ipld-dag-pb')
7+
const DAGNode = dagPB.DAGNode
78
const dagCBOR = require('ipld-dag-cbor')
89
const { spawnNodeWithId } = require('../utils/spawn')
910
const { getDescribe, getIt, expect } = require('../utils/mocha')
@@ -43,15 +44,15 @@ module.exports = (createCommon, options) => {
4344
series([
4445
(cb) => {
4546
try {
46-
nodePb = dagPB.DAGNode.create(Buffer.from('I am inside a Protobuf'))
47+
nodePb = new DAGNode(Buffer.from('I am inside a Protobuf'))
4748
} catch (err) {
4849
return cb(err)
4950
}
5051

5152
cb()
5253
},
5354
(cb) => {
54-
dagPB.util.cid(dagPB.util.serialize(nodePb))
55+
dagPB.util.cid(nodePb.serialize())
5556
.then(cid => {
5657
cidPb = cid
5758
cb()

‎src/object/get.js

+15-15
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ module.exports = (createCommon, options) => {
6767
// because js-ipfs-api can't infer if the
6868
// returned Data is Buffer or String
6969
if (typeof node.Data === 'string') {
70-
node = DAGNode.create(Buffer.from(node.Data), node.Links, node.size)
70+
node = new DAGNode(Buffer.from(node.Data), node.Links, node.size)
7171
}
7272

7373
node2 = node
@@ -96,7 +96,7 @@ module.exports = (createCommon, options) => {
9696
// because js-ipfs-api can't infer if the
9797
// returned Data is Buffer or String
9898
if (typeof node2.Data === 'string') {
99-
node2 = DAGNode.create(Buffer.from(node2.Data), node2.Links, node2.size)
99+
node2 = new DAGNode(Buffer.from(node2.Data), node2.Links, node2.size)
100100
}
101101

102102
expect(node1.Data).to.deep.equal(node2.Data)
@@ -133,7 +133,7 @@ module.exports = (createCommon, options) => {
133133
// because js-ipfs-api can't infer if the
134134
// returned Data is Buffer or String
135135
if (typeof node.Data === 'string') {
136-
node = DAGNode.create(Buffer.from(node.Data), node.Links, node.size)
136+
node = new DAGNode(Buffer.from(node.Data), node.Links, node.size)
137137
}
138138

139139
node2 = node
@@ -161,7 +161,7 @@ module.exports = (createCommon, options) => {
161161
// because js-ipfs-api can't infer if the
162162
// returned Data is Buffer or String
163163
if (typeof node2.Data === 'string') {
164-
node2 = DAGNode.create(Buffer.from(node2.Data), node2.Links, node2.size)
164+
node2 = new DAGNode(Buffer.from(node2.Data), node2.Links, node2.size)
165165
}
166166

167167
expect(node1.Data).to.deep.equal(node2.Data)
@@ -178,7 +178,7 @@ module.exports = (createCommon, options) => {
178178
series([
179179
(cb) => {
180180
try {
181-
node1a = DAGNode.create(Buffer.from('Some data 1'))
181+
node1a = new DAGNode(Buffer.from('Some data 1'))
182182
} catch (err) {
183183
return cb(err)
184184
}
@@ -187,7 +187,7 @@ module.exports = (createCommon, options) => {
187187
},
188188
(cb) => {
189189
try {
190-
node2 = DAGNode.create(Buffer.from('Some data 2'))
190+
node2 = new DAGNode(Buffer.from('Some data 2'))
191191
} catch (err) {
192192
return cb(err)
193193
}
@@ -196,13 +196,13 @@ module.exports = (createCommon, options) => {
196196
},
197197
(cb) => {
198198
asDAGLink(node2, 'some-link', (err, link) => {
199-
expect(err).to.not.exist()
199+
if (err) {
200+
return cb(err)
201+
}
200202

201-
DAGNode.addLink(node1a, link)
202-
.then(node => {
203-
node1b = node
204-
cb()
205-
}, cb)
203+
node1b = new DAGNode(node1a.Data, node1a.Links.concat(link))
204+
205+
cb()
206206
})
207207
},
208208
(cb) => {
@@ -219,7 +219,7 @@ module.exports = (createCommon, options) => {
219219
// because js-ipfs-api can't infer if the
220220
// returned Data is Buffer or String
221221
if (typeof node.Data === 'string') {
222-
node = DAGNode.create(Buffer.from(node.Data), node.Links, node.size)
222+
node = new DAGNode(Buffer.from(node.Data), node.Links, node.size)
223223
}
224224

225225
node1c = node
@@ -262,7 +262,7 @@ module.exports = (createCommon, options) => {
262262
// because js-ipfs-api can't infer if the
263263
// returned Data is Buffer or String
264264
if (typeof node.Data === 'string') {
265-
node = DAGNode.create(Buffer.from(node.Data), node.Links, node.size)
265+
node = new DAGNode(Buffer.from(node.Data), node.Links, node.size)
266266
}
267267
node1b = node
268268
cb()
@@ -305,7 +305,7 @@ module.exports = (createCommon, options) => {
305305
// because js-ipfs-api can't infer if the
306306
// returned Data is Buffer or String
307307
if (typeof node.Data === 'string') {
308-
node = DAGNode.create(Buffer.from(node.Data), node.Links, node.size)
308+
node = new DAGNode(Buffer.from(node.Data), node.Links, node.size)
309309
}
310310
node1b = node
311311
cb()

‎src/object/links.js

+11-14
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ module.exports = (createCommon, options) => {
8080
series([
8181
(cb) => {
8282
try {
83-
node1a = DAGNode.create(Buffer.from('Some data 1'))
83+
node1a = new DAGNode(Buffer.from('Some data 1'))
8484
} catch (err) {
8585
return cb(err)
8686
}
@@ -89,7 +89,7 @@ module.exports = (createCommon, options) => {
8989
},
9090
(cb) => {
9191
try {
92-
node2 = DAGNode.create(Buffer.from('Some data 2'))
92+
node2 = new DAGNode(Buffer.from('Some data 2'))
9393
} catch (err) {
9494
return cb(err)
9595
}
@@ -100,22 +100,19 @@ module.exports = (createCommon, options) => {
100100
asDAGLink(node2, 'some-link', (err, link) => {
101101
expect(err).to.not.exist()
102102

103-
DAGNode.addLink(node1a, link)
104-
.then(node => {
105-
node1b = node
103+
node1b = new DAGNode(node1a.Data, node1a.Links.concat(link))
106104

107-
return dagPB.util.cid(dagPB.util.serialize(node1b))
108-
})
109-
.then(cid => {
110-
node1bCid = cid
111-
112-
cb()
113-
})
114-
.catch(cb)
105+
cb()
115106
})
116107
},
117108
(cb) => {
118-
ipfs.object.put(node1b, cb)
109+
ipfs.object.put(node1b, (err, cid) => {
110+
expect(err).to.not.exist()
111+
112+
node1bCid = cid
113+
114+
cb()
115+
})
119116
},
120117
(cb) => {
121118
ipfs.object.links(node1bCid, (err, links) => {

‎src/object/patch/add-link.js

+20-22
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@ const { getDescribe, getIt, expect } = require('../../utils/mocha')
88
const {
99
calculateCid,
1010
createDAGNode,
11-
addLinkToDAGNode
11+
addLinkToDAGNode,
12+
asDAGLink
1213
} = require('../utils')
1314

1415
module.exports = (createCommon, options) => {
@@ -44,7 +45,6 @@ module.exports = (createCommon, options) => {
4445
let node1a
4546
let node1b
4647
let node2
47-
let node2Cid
4848

4949
const obj = {
5050
Data: Buffer.from('patch test object'),
@@ -61,7 +61,7 @@ module.exports = (createCommon, options) => {
6161
},
6262
(cb) => {
6363
try {
64-
node1a = DAGNode.create(obj.Data, obj.Links)
64+
node1a = new DAGNode(obj.Data, obj.Links)
6565
} catch (err) {
6666
return cb(err)
6767
}
@@ -70,7 +70,7 @@ module.exports = (createCommon, options) => {
7070
},
7171
(cb) => {
7272
try {
73-
node2 = DAGNode.create(Buffer.from('some other node'))
73+
node2 = new DAGNode(Buffer.from('some other node'))
7474
} catch (err) {
7575
return cb(err)
7676
}
@@ -82,29 +82,27 @@ module.exports = (createCommon, options) => {
8282
// timeout. Reason: it needs the node to get its size
8383
ipfs.object.put(node2, (err, cid) => {
8484
expect(err).to.not.exist()
85-
node2Cid = cid
85+
86+
cb()
87+
})
88+
},
89+
(cb) => {
90+
asDAGLink(node2, 'link-to-node', (err, link) => {
91+
expect(err).to.not.exist()
92+
93+
node1b = new DAGNode(node1a.Data, node1a.Links.concat(link))
94+
8695
cb()
8796
})
8897
},
8998
(cb) => {
90-
DAGNode.addLink(node1a, {
91-
name: 'link-to-node',
92-
size: node2.toJSON().size,
93-
cid: node2Cid
99+
ipfs.object.put(node1b, (err, cid) => {
100+
expect(err).to.not.exist()
101+
102+
node1bCid = cid
103+
104+
cb()
94105
})
95-
.then(node => {
96-
node1b = node
97-
98-
return dagPB.util.cid(dagPB.util.serialize(node), {
99-
cidVersion: 0
100-
})
101-
})
102-
.then(cid => {
103-
node1bCid = cid
104-
105-
cb()
106-
})
107-
.catch(cb)
108106
},
109107
(cb) => {
110108
ipfs.object.patch.addLink(testNodeCid, node1b.Links[0], (err, cid) => {

‎src/object/put.js

+8-10
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ module.exports = (createCommon, options) => {
100100
series([
101101
(cb) => {
102102
try {
103-
node = DAGNode.create(Buffer.from(hat()))
103+
node = new DAGNode(Buffer.from(hat()))
104104
} catch (err) {
105105
return cb(err)
106106
}
@@ -109,7 +109,7 @@ module.exports = (createCommon, options) => {
109109
},
110110
(cb) => {
111111
try {
112-
serialized = dagPB.util.serialize(node)
112+
serialized = node.serialize()
113113
} catch (err) {
114114
return cb(err)
115115
}
@@ -146,7 +146,7 @@ module.exports = (createCommon, options) => {
146146
})
147147

148148
it('should put a Protobuf DAGNode', (done) => {
149-
const dNode = DAGNode.create(Buffer.from(hat()))
149+
const dNode = new DAGNode(Buffer.from(hat()))
150150

151151
ipfs.object.put(dNode, (err, cid) => {
152152
expect(err).to.not.exist()
@@ -175,7 +175,7 @@ module.exports = (createCommon, options) => {
175175
series([
176176
(cb) => {
177177
try {
178-
node1a = DAGNode.create(Buffer.from(hat()))
178+
node1a = new DAGNode(Buffer.from(hat()))
179179
} catch (err) {
180180
return cb(err)
181181
}
@@ -184,7 +184,7 @@ module.exports = (createCommon, options) => {
184184
},
185185
(cb) => {
186186
try {
187-
node2 = DAGNode.create(Buffer.from(hat()))
187+
node2 = new DAGNode(Buffer.from(hat()))
188188
} catch (err) {
189189
return cb(err)
190190
}
@@ -195,11 +195,9 @@ module.exports = (createCommon, options) => {
195195
asDAGLink(node2, 'some-link', (err, link) => {
196196
expect(err).to.not.exist()
197197

198-
DAGNode.addLink(node1a, link)
199-
.then(node => {
200-
node1b = node
201-
cb()
202-
}, cb)
198+
node1b = new DAGNode(node1a.Data, node1a.Links.concat(link))
199+
200+
cb()
203201
})
204202
},
205203
(cb) => {

0 commit comments

Comments
 (0)