From d7c1b0eda2806b2d77aa22f55ce694e77cf39b3f Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Thu, 25 Jan 2018 10:36:08 +0000 Subject: [PATCH 1/3] fix: make repo.stat() equal stats.repo() --- src/repo/stat.js | 15 +++++++++++++-- src/stats/repo.js | 1 - test/repo.spec.js | 8 ++++---- 3 files changed, 17 insertions(+), 7 deletions(-) diff --git a/src/repo/stat.js b/src/repo/stat.js index 8ffbfe526..aca22bf11 100644 --- a/src/repo/stat.js +++ b/src/repo/stat.js @@ -2,15 +2,26 @@ const promisify = require('promisify-es6') +const transform = function (res, callback) { + callback(null, { + numObjects: res.NumObjects, + repoSize: res.RepoSize, + repoPath: res.RepoPath, + version: res.Version, + storageMax: res.StorageMax + }) +} + module.exports = (send) => { return promisify((opts, callback) => { if (typeof (opts) === 'function') { callback = opts opts = {} } - send({ + + send.andTransform({ path: 'repo/stat', qs: opts - }, callback) + }, transform, callback) }) } diff --git a/src/stats/repo.js b/src/stats/repo.js index 55a8fdd68..8e2a87a7e 100644 --- a/src/stats/repo.js +++ b/src/stats/repo.js @@ -1,4 +1,3 @@ - 'use strict' const promisify = require('promisify-es6') diff --git a/test/repo.spec.js b/test/repo.spec.js index b0b4fce9f..f3307a19c 100644 --- a/test/repo.spec.js +++ b/test/repo.spec.js @@ -41,8 +41,8 @@ describe('.repo', function () { ipfs.repo.stat((err, res) => { expect(err).to.not.exist() expect(res).to.exist() - expect(res).to.have.a.property('NumObjects') - expect(res).to.have.a.property('RepoSize') + expect(res).to.have.a.property('numObjects') + expect(res).to.have.a.property('repoSize') done() }) }) @@ -66,8 +66,8 @@ describe('.repo', function () { return ipfs.repo.stat() .then((res) => { expect(res).to.exist() - expect(res).to.have.a.property('NumObjects') - expect(res).to.have.a.property('RepoSize') + expect(res).to.have.a.property('numObjects') + expect(res).to.have.a.property('repoSize') }) }) From 10b72df86ad1a6e86c02a90733168b8e50d55cbb Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Thu, 25 Jan 2018 11:21:05 +0000 Subject: [PATCH 2/3] add links --- README.md | 7 ++++--- src/repo/version.js | 9 +++++++-- test/repo.spec.js | 2 -- 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 98dcea73c..900b5dc76 100644 --- a/README.md +++ b/README.md @@ -187,9 +187,10 @@ $ ipfs config --json API.HTTPHeaders.Access-Control-Allow-Methods "[\"PUT\", \"P - [`ipfs.block.put(block, cid, [callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/SPEC/BLOCK.md#put) - [`ipfs.block.stat(cid, [callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/SPEC/BLOCK.md#stat) -- repo - - `ipfs.repo.stat()` - - `ipfs.repo.gc()` +- [repo](https://github.com/ipfs/interface-ipfs-core/tree/master/SPEC/REPO.md) + - [`ipfs.repo.gc([options, callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/SPEC/REPO.md#gc) + - [`ipfs.repo.stat([options, callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/SPEC/REPO.md#stat) + - [`ipfs.repo.version([callback])`](https://github.com/ipfs/interface-ipfs-core/tree/master/SPEC/REPO.md#version) #### `Graph` diff --git a/src/repo/version.js b/src/repo/version.js index 0b49f78c6..84e2a0008 100644 --- a/src/repo/version.js +++ b/src/repo/version.js @@ -2,15 +2,20 @@ const promisify = require('promisify-es6') +const transform = function (res, callback) { + callback(null, res.Version) +} + module.exports = (send) => { return promisify((opts, callback) => { if (typeof (opts) === 'function') { callback = opts opts = {} } - send({ + + send.andTransform({ path: 'repo/version', qs: opts - }, callback) + }, transform, callback) }) } diff --git a/test/repo.spec.js b/test/repo.spec.js index f3307a19c..baf9525d9 100644 --- a/test/repo.spec.js +++ b/test/repo.spec.js @@ -51,7 +51,6 @@ describe('.repo', function () { ipfs.repo.version((err, res) => { expect(err).to.not.exist() expect(res).to.exist() - expect(res).to.have.a.property('Version') done() }) }) @@ -75,7 +74,6 @@ describe('.repo', function () { return ipfs.repo.version() .then(res => { expect(res).to.exist() - expect(res).to.have.a.property('Version') }) }) }) From e77b71cabef370a0180e62443871008a6a6a4a31 Mon Sep 17 00:00:00 2001 From: Henrique Dias Date: Thu, 25 Jan 2018 11:36:53 +0000 Subject: [PATCH 3/3] add repo tests --- test/interface/repo.spec.js | 34 ++++++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) create mode 100644 test/interface/repo.spec.js diff --git a/test/interface/repo.spec.js b/test/interface/repo.spec.js new file mode 100644 index 000000000..acce37e75 --- /dev/null +++ b/test/interface/repo.spec.js @@ -0,0 +1,34 @@ +/* eslint-env mocha */ +/* eslint max-nested-callbacks: ["error", 8] */ +'use strict' + +const test = require('interface-ipfs-core') +const parallel = require('async/parallel') + +const IPFSApi = require('../../src') + +const DaemonFactory = require('ipfsd-ctl') +const df = DaemonFactory.create() + +const nodes = [] +const common = { + setup: function (callback) { + callback(null, { + spawnNode: (cb) => { + df.spawn((err, _ipfsd) => { + if (err) { + return cb(err) + } + + nodes.push(_ipfsd) + cb(null, IPFSApi(_ipfsd.apiAddr)) + }) + } + }) + }, + teardown: function (callback) { + parallel(nodes.map((node) => (cb) => node.stop(cb)), callback) + } +} + +test.repo(common)