From a8bc46d108d196effa4048389da4863b2537a9fc Mon Sep 17 00:00:00 2001 From: Friedel Ziegelmayer Date: Fri, 13 May 2016 22:14:38 +0200 Subject: [PATCH] feat(object): object.put protobuf encoding test Closes #3 --- package.json | 5 ++--- src/object.js | 27 ++++++++++++--------------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 635b8cb0fe..34bbd27739 100644 --- a/package.json +++ b/package.json @@ -30,8 +30,7 @@ "dependencies": { "bs58": "^3.0.0", "chai": "^3.5.0", - "ipfs-merkle-dag": "^0.5.1", - "json2yaml": "^1.1.0" + "ipfs-merkle-dag": "^0.5.1" }, "devDependencies": { "aegir": "^3.0.1" @@ -40,4 +39,4 @@ "David Dias ", "dignifiedquire " ] -} \ No newline at end of file +} diff --git a/src/object.js b/src/object.js index 938aac4fb6..2dbdcdf635 100644 --- a/src/object.js +++ b/src/object.js @@ -4,7 +4,6 @@ const expect = require('chai').expect const DAGNode = require('ipfs-merkle-dag').DAGNode const bs58 = require('bs58') -const jsonToYaml = require('json2yaml') module.exports = (common) => { describe('.object', () => { @@ -79,21 +78,15 @@ module.exports = (common) => { }) }) - // TODO verify that yaml encoded buffers still work in go-ipfs - it.skip('of yaml encoded buffer', (done) => { - const obj = { - Data: new Buffer('Some data').toString(), - Links: [] - } - - const buf = new Buffer(jsonToYaml.stringify(obj)) + it('of protobuf encoded buffer', (done) => { + const dNode = new DAGNode(new Buffer('Some data')) + const buf = dNode.marshal() - ipfs.object.put(buf, { enc: 'yaml' }, (err, node) => { + ipfs.object.put(buf, { enc: 'protobuf' }, (err, node) => { expect(err).to.not.exist - const nodeJSON = node.toJSON() - expect(obj.Data).to.deep.equal(nodeJSON.Data) - expect(obj.Links).to.deep.equal(nodeJSON.Links) - expect(nodeJSON.Hash).to.equal('QmPb5f92FxKPYdT3QNBd1GKiL4tZUXUrzF4Hkpdr3Gf1gK') + expect(dNode.data).to.deep.equal(node.data) + expect(dNode.links).to.deep.equal(node.links) + expect(dNode.multihash()).to.deep.equal(node.multihash()) done() }) }) @@ -137,7 +130,11 @@ module.exports = (common) => { ipfs.object.put(dNode1, (err, node) => { expect(err).to.not.exist expect(dNode1.data).to.deep.equal(node.data) - expect(dNode1.links).to.deep.equal(node.links) + expect( + dNode1.links.map((l) => l.toJSON()) + ).to.deep.equal( + node.links.map((l) => l.toJSON()) + ) expect(dNode1.multihash()).to.deep.equal(node.multihash()) done() })