From cb1435a5c66ede12c7361e559ea08f458fe85271 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Fri, 17 Apr 2020 12:05:13 +0300 Subject: [PATCH 1/2] refactor: replace ipfs.add with unixfs construct this is similar to other similar changes, we didn't start by implementing `ipfs.add` in `rust-ipfs`. --- packages/interface-ipfs-core/src/dag/get.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/interface-ipfs-core/src/dag/get.js b/packages/interface-ipfs-core/src/dag/get.js index 3c817f332f..7629c37b7b 100644 --- a/packages/interface-ipfs-core/src/dag/get.js +++ b/packages/interface-ipfs-core/src/dag/get.js @@ -154,9 +154,11 @@ module.exports = (common, options) => { it('should get a node added as CIDv1 with a CIDv0', async () => { const input = Buffer.from(`TEST${Math.random()}`) - const res = await all(ipfs.add(input, { cidVersion: 1, rawLeaves: false })) + const inner = new Unixfs({ type: 'file', data: input }) + const serialized = new DAGNode(inner.marshal()).serialize() + const res = await ipfs.block.put(serialized, { version: 1 }) - const cidv1 = res[0].cid + const cidv1 = res.cid expect(cidv1.version).to.equal(1) const cidv0 = cidv1.toV0() From a7658901d1ed9dc2e97dd507345c5d94377c8a64 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Fri, 17 Apr 2020 12:16:40 +0300 Subject: [PATCH 2/2] refactor: remove unused it-all from dag.get tests --- packages/interface-ipfs-core/src/dag/get.js | 1 - 1 file changed, 1 deletion(-) diff --git a/packages/interface-ipfs-core/src/dag/get.js b/packages/interface-ipfs-core/src/dag/get.js index 7629c37b7b..e42880ab34 100644 --- a/packages/interface-ipfs-core/src/dag/get.js +++ b/packages/interface-ipfs-core/src/dag/get.js @@ -5,7 +5,6 @@ const dagPB = require('ipld-dag-pb') const DAGNode = dagPB.DAGNode const dagCBOR = require('ipld-dag-cbor') const Unixfs = require('ipfs-unixfs') -const all = require('it-all') const { getDescribe, getIt, expect } = require('../utils/mocha') /** @typedef { import("ipfsd-ctl/src/factory") } Factory */