From 981a4cc9ced1a2a2a3b8cc65321e79a5ba2f652b Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" <23040076+greenkeeper[bot]@users.noreply.github.com> Date: Fri, 12 Jul 2019 15:58:33 +0000 Subject: [PATCH 1/3] chore(package): update aegir to version 20.0.0 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index ba8121d2b..86c8ce92e 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "through2": "^3.0.1" }, "devDependencies": { - "aegir": "^19.0.3", + "aegir": "^20.0.0", "browser-process-platform": "~0.1.1", "chai": "^4.2.0", "cross-env": "^5.2.0", From aacd203638b0d11f39b48f9f1c96769735b37c10 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Tue, 27 Aug 2019 16:49:25 +0100 Subject: [PATCH 2/3] chore: appease linter License: MIT Signed-off-by: Alan Shaw --- src/dag/get.js | 4 ++-- src/dag/put.js | 4 ++-- src/dht/findprovs.js | 2 +- src/dht/get.js | 3 +-- src/utils/multipart.js | 2 +- src/utils/prepare-file.js | 2 +- src/utils/pubsub-message-stream.js | 2 +- src/utils/send-files-stream.js | 5 ++--- src/utils/tar-stream-to-objects.js | 4 ++-- test/files-mfs.spec.js | 6 +++--- test/log.spec.js | 2 +- 11 files changed, 17 insertions(+), 19 deletions(-) diff --git a/src/dag/get.js b/src/dag/get.js index d0a1dac13..771c38bf4 100644 --- a/src/dag/get.js +++ b/src/dag/get.js @@ -42,8 +42,8 @@ module.exports = (send) => { }, cb) }, (resolved, cb) => { - block(send).get(new CID(resolved['Cid']['/']), (err, ipfsBlock) => { - cb(err, ipfsBlock, resolved['RemPath']) + block(send).get(new CID(resolved.Cid['/']), (err, ipfsBlock) => { + cb(err, ipfsBlock, resolved.RemPath) }) }, (ipfsBlock, path, cb) => { diff --git a/src/dag/put.js b/src/dag/put.js index 42d92b285..6cfca99c0 100644 --- a/src/dag/put.js +++ b/src/dag/put.js @@ -77,8 +77,8 @@ module.exports = (send) => { if (err) { return callback(err) } - if (result['Cid']) { - return callback(null, new CID(result['Cid']['/'])) + if (result.Cid) { + return callback(null, new CID(result.Cid['/'])) } else { return callback(result) } diff --git a/src/dht/findprovs.js b/src/dht/findprovs.js index 41ef4aaeb..695ef04df 100644 --- a/src/dht/findprovs.js +++ b/src/dht/findprovs.js @@ -27,7 +27,7 @@ module.exports = (send) => { res = [res] } - let responses = [] + const responses = [] res.forEach(result => { // 4 = Provider if (result.Type !== 4) return diff --git a/src/dht/get.js b/src/dht/get.js index 279ad51bf..ab64fa892 100644 --- a/src/dht/get.js +++ b/src/dht/get.js @@ -35,8 +35,7 @@ module.exports = (send) => { if (res.Type === 5) { done(null, res.Extra) } else { - let error = new Error('key was not found (type 6)') - done(error) + done(new Error('key was not found (type 6)')) } } diff --git a/src/utils/multipart.js b/src/utils/multipart.js index a6df61fd4..78bead247 100644 --- a/src/utils/multipart.js +++ b/src/utils/multipart.js @@ -67,7 +67,7 @@ class Multipart extends Transform { this.push(leading) - let content = file.content || Buffer.alloc(0) + const content = file.content || Buffer.alloc(0) if (Buffer.isBuffer(content)) { this.push(content) diff --git a/src/utils/prepare-file.js b/src/utils/prepare-file.js index 1ffe3f31c..9a02f8338 100644 --- a/src/utils/prepare-file.js +++ b/src/utils/prepare-file.js @@ -106,7 +106,7 @@ function contentToStream (content) { } function prepareFile (file, opts) { - let files = [].concat(file) + const files = [].concat(file) return flatmap(files, (file) => { // add from fs with file path diff --git a/src/utils/pubsub-message-stream.js b/src/utils/pubsub-message-stream.js index 992529213..d5925f714 100644 --- a/src/utils/pubsub-message-stream.js +++ b/src/utils/pubsub-message-stream.js @@ -10,7 +10,7 @@ class PubsubMessageStream extends TransformStream { } static from (inputStream, callback) { - let outputStream = inputStream.pipe(new PubsubMessageStream()) + const outputStream = inputStream.pipe(new PubsubMessageStream()) inputStream.on('end', () => outputStream.emit('end')) callback(null, outputStream) } diff --git a/src/utils/send-files-stream.js b/src/utils/send-files-stream.js index 232dd34da..91bd90fb4 100644 --- a/src/utils/send-files-stream.js +++ b/src/utils/send-files-stream.js @@ -27,7 +27,6 @@ function headers (file, i) { module.exports = (send, path) => { return (options) => { - let request let ended = false let writing = false @@ -84,7 +83,7 @@ module.exports = (send, path) => { qs.hash = propOrProp(options, 'hash', 'hashAlg') if (options.strategy === 'trickle' || options.trickle) { - qs['trickle'] = 'true' + qs.trickle = 'true' } const args = { @@ -102,7 +101,7 @@ module.exports = (send, path) => { retStream.emit('error', err) }) - request = send(args, (err, response) => { + const request = send(args, (err, response) => { if (err) { return retStream.emit('error', err) } diff --git a/src/utils/tar-stream-to-objects.js b/src/utils/tar-stream-to-objects.js index 6d7765a03..724544583 100644 --- a/src/utils/tar-stream-to-objects.js +++ b/src/utils/tar-stream-to-objects.js @@ -20,8 +20,8 @@ class ObjectsStreams extends ReadableStream { { path: 'string', content: Stream } */ const TarStreamToObjects = (inputStream, callback) => { - let outputStream = new ObjectsStreams() - let extractStream = tar.extract() + const outputStream = new ObjectsStreams() + const extractStream = tar.extract() extractStream .on('entry', (header, stream, next) => { diff --git a/test/files-mfs.spec.js b/test/files-mfs.spec.js index f9b46cdd7..beda9b24a 100644 --- a/test/files-mfs.spec.js +++ b/test/files-mfs.spec.js @@ -65,10 +65,10 @@ describe('.files (the MFS API part)', function () { }) it('.add with Buffer module', (done) => { - let Buffer = require('buffer').Buffer + const { Buffer } = require('buffer') - let expectedBufferMultihash = 'QmWfVY9y3xjsixTgbd9AorQxH7VtMpzfx2HaWtsoUYecaX' - let file = Buffer.from('hello') + const expectedBufferMultihash = 'QmWfVY9y3xjsixTgbd9AorQxH7VtMpzfx2HaWtsoUYecaX' + const file = Buffer.from('hello') ipfs.add(file, (err, res) => { expect(err).to.not.exist() diff --git a/test/log.spec.js b/test/log.spec.js index 16782d66a..1e800f075 100644 --- a/test/log.spec.js +++ b/test/log.spec.js @@ -31,7 +31,7 @@ describe('.log', function () { }) it('.log.tail', (done) => { - let i = setInterval(() => { + const i = setInterval(() => { ipfs.add(Buffer.from('just adding some data to generate logs')) }, 1000) From 69d0ff112d06ef6c6c9d2a287e59063eee979e10 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Tue, 27 Aug 2019 17:18:21 +0100 Subject: [PATCH 3/3] chore: pin go-ipfs-dep to 0.4.21 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 86c8ce92e..33cd7bde1 100644 --- a/package.json +++ b/package.json @@ -85,7 +85,7 @@ "chai": "^4.2.0", "cross-env": "^5.2.0", "dirty-chai": "^2.0.1", - "go-ipfs-dep": "~0.4.21", + "go-ipfs-dep": "0.4.21", "interface-ipfs-core": "^0.109.0", "ipfsd-ctl": "~0.43.0", "nock": "^10.0.2",