From 5c5459b7e24792cb01f5348a124b6138fc990dca Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Tue, 7 Apr 2020 12:43:01 +0300 Subject: [PATCH 1/3] refactor: s/block.put/object.put/ in refs test --- packages/interface-ipfs-core/src/refs.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/interface-ipfs-core/src/refs.js b/packages/interface-ipfs-core/src/refs.js index eaa24670d5..65054336a9 100644 --- a/packages/interface-ipfs-core/src/refs.js +++ b/packages/interface-ipfs-core/src/refs.js @@ -6,6 +6,10 @@ const loadFixture = require('aegir/fixtures') const CID = require('cids') const all = require('it-all') +const dagPB = require('ipld-dag-pb') +const DAGNode = dagPB.DAGNode +const DAGLink = dagPB.DAGLink + /** @typedef { import("ipfsd-ctl/src/factory") } Factory */ /** * @param {Factory} common @@ -307,12 +311,16 @@ function getRefsTests () { function loadPbContent (ipfs, node) { const store = { - putData: (data) => ipfs.object.put({ Data: data, Links: [] }), - putLinks: (links) => - ipfs.object.put({ - Data: '', - Links: links.map(({ name, cid }) => ({ Name: name, Hash: cid, Size: 8 })) - }) + putData: async (data) => { + const res = await ipfs.block.put(new DAGNode(data).serialize()); + return res.cid; + }, + putLinks: async (links) => { + const res = await ipfs.block.put(new DAGNode('', links.map(({ name, cid }) => { + return new DAGLink(name, 8, cid); + })).serialize()); + return res.cid; + } } return loadContent(ipfs, store, node) } From dd090009cbff8de6eede515fa15bc174b4228957 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Tue, 7 Apr 2020 12:43:52 +0300 Subject: [PATCH 2/3] refactor: s/add/block.put/ in refs test --- packages/interface-ipfs-core/src/refs.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/interface-ipfs-core/src/refs.js b/packages/interface-ipfs-core/src/refs.js index 65054336a9..7b2b37a7c5 100644 --- a/packages/interface-ipfs-core/src/refs.js +++ b/packages/interface-ipfs-core/src/refs.js @@ -10,6 +10,8 @@ const dagPB = require('ipld-dag-pb') const DAGNode = dagPB.DAGNode const DAGLink = dagPB.DAGLink +const UnixFS = require('ipfs-unixfs') + /** @typedef { import("ipfsd-ctl/src/factory") } Factory */ /** * @param {Factory} common @@ -328,8 +330,10 @@ function loadPbContent (ipfs, node) { function loadDagContent (ipfs, node) { const store = { putData: async (data) => { - const res = await all(ipfs.add(data)) - return res[0].cid + const inner = new UnixFS({ type: 'file', data: data }); + const serialized = new DAGNode(inner.marshal()).serialize(); + const res = await ipfs.block.put(serialized); + return res.cid; }, putLinks: (links) => { const obj = {} From 3f75d2c63dc4edc4ab2e6fae626ed7b5947c3219 Mon Sep 17 00:00:00 2001 From: Joonas Koivunen Date: Tue, 7 Apr 2020 20:35:05 +0300 Subject: [PATCH 3/3] refactor: remove semicolons --- packages/interface-ipfs-core/src/refs.js | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/interface-ipfs-core/src/refs.js b/packages/interface-ipfs-core/src/refs.js index 7b2b37a7c5..1645937a09 100644 --- a/packages/interface-ipfs-core/src/refs.js +++ b/packages/interface-ipfs-core/src/refs.js @@ -314,14 +314,14 @@ function getRefsTests () { function loadPbContent (ipfs, node) { const store = { putData: async (data) => { - const res = await ipfs.block.put(new DAGNode(data).serialize()); - return res.cid; + const res = await ipfs.block.put(new DAGNode(data).serialize()) + return res.cid }, putLinks: async (links) => { const res = await ipfs.block.put(new DAGNode('', links.map(({ name, cid }) => { - return new DAGLink(name, 8, cid); - })).serialize()); - return res.cid; + return new DAGLink(name, 8, cid) + })).serialize()) + return res.cid } } return loadContent(ipfs, store, node) @@ -330,10 +330,10 @@ function loadPbContent (ipfs, node) { function loadDagContent (ipfs, node) { const store = { putData: async (data) => { - const inner = new UnixFS({ type: 'file', data: data }); - const serialized = new DAGNode(inner.marshal()).serialize(); - const res = await ipfs.block.put(serialized); - return res.cid; + const inner = new UnixFS({ type: 'file', data: data }) + const serialized = new DAGNode(inner.marshal()).serialize() + const res = await ipfs.block.put(serialized) + return res.cid }, putLinks: (links) => { const obj = {}