From 1d762d03495ea681f4debf0aa35dff9174b8381f Mon Sep 17 00:00:00 2001 From: Volker Mische Date: Tue, 13 Mar 2018 13:43:59 +0100 Subject: [PATCH 1/2] WIP: Get CI green --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 397d2d310..e7f474df9 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "go-ipfs-dep": "^0.4.13", "gulp": "^3.9.1", "hapi": "^17.2.2", - "interface-ipfs-core": "~0.55.1", + "interface-ipfs-core": "https://github.com/ipfs/interface-ipfs-core#get-ci-green", "ipfs": "~0.28.0", "ipfsd-ctl": "~0.29.1", "pre-commit": "^1.2.2", From 3d4f19abf7d1db96dd4fdf65938dec8a0b642054 Mon Sep 17 00:00:00 2001 From: Volker Mische Date: Wed, 14 Mar 2018 16:08:56 +0100 Subject: [PATCH 2/2] Revert "feat: add support for ipfs files stat --with-local (#695)" This reverts commit b08f21a8dea1852064518d045cf17706bf90b821. --- src/files/stat.js | 26 ++++++-------------------- test/files.spec.js | 5 +---- 2 files changed, 7 insertions(+), 24 deletions(-) diff --git a/src/files/stat.js b/src/files/stat.js index 804865ba0..d53da0dab 100644 --- a/src/files/stat.js +++ b/src/files/stat.js @@ -1,25 +1,14 @@ 'use strict' const promisify = require('promisify-es6') -const _ = require('lodash') -const streamToValue = require('../utils/stream-to-value') const transform = function (res, callback) { - return streamToValue(res, (err, data) => { - if (err) { - return callback(err) - } - - callback(null, { - type: data[0].Type, - blocks: data[0].Blocks, - size: data[0].Size, - hash: data[0].Hash, - cumulativeSize: data[0].CumulativeSize, - withLocality: data[0].WithLocality || false, - local: data[0].Local || null, - sizeLocal: data[0].SizeLocal || null - }) + callback(null, { + type: res.Type, + blocks: res.Blocks, + size: res.Size, + hash: res.Hash, + cumulativeSize: res.CumulativeSize }) } @@ -29,9 +18,6 @@ module.exports = (send) => { callback = opts opts = {} } - - opts = _.mapKeys(opts, (v, k) => _.kebabCase(k)) - send.andTransform({ path: 'files/stat', args: args, diff --git a/test/files.spec.js b/test/files.spec.js index c05aa23a1..41c5bc1a8 100644 --- a/test/files.spec.js +++ b/test/files.spec.js @@ -282,10 +282,7 @@ describe('.files (the MFS API part)', function () { size: 12, cumulativeSize: 20, blocks: 0, - type: 'file', - withLocality: false, - local: undefined, - sizeLocal: undefined + type: 'file' }) done()