From d851c2ec4c1e71cf9b19bee3f4305f07a4ab7a1a Mon Sep 17 00:00:00 2001 From: David Dias Date: Sat, 26 Aug 2017 15:39:38 +0200 Subject: [PATCH 1/9] wip --- .aegir.js | 55 +++++++++++++++++++++++++++++++++++++++++++ gulpfile.js | 64 --------------------------------------------------- package.json | 44 +++++++++++++++++------------------ test/index.js | 5 ++++ test/node.js | 36 ----------------------------- 5 files changed, 82 insertions(+), 122 deletions(-) delete mode 100644 gulpfile.js create mode 100644 test/index.js delete mode 100644 test/node.js diff --git a/.aegir.js b/.aegir.js index 06490c5f1f..a638d49cef 100644 --- a/.aegir.js +++ b/.aegir.js @@ -1,5 +1,44 @@ 'use strict' +const parallel = require('async/parallel') +const series = require('async/series') +const createTempRepo = require('./test/utils/create-repo-nodejs.js') +const HTTPAPI = require('./src/http-api') +const leftPad = require('left-pad') + +let nodes = [] + +/* + * spawns a daemon with ports numbers starting in 10 and ending in `num` + */ +function spawnDaemon (num, callback) { + num = leftPad(num, 3, 0) + + const config = { + Addresses: { + Swarm: [ + `/ip4/127.0.0.1/tcp/10${num}`, + `/ip4/127.0.0.1/tcp/20${num}/ws` + ], + API: `/ip4/127.0.0.1/tcp/31${num}`, + Gateway: `/ip4/127.0.0.1/tcp/32${num}` + }, + Bootstrap: [], + Discovery: { + MDNS: { + Enabled: false + }, + webRTCStar: { + Enabled: false + } + } + } + + const daemon = new HTTPAPI(createTempRepo(), config) + nodes.push(daemon) + daemon.start(true, callback) +} + module.exports = { karma: { files: [{ @@ -8,5 +47,21 @@ module.exports = { served: true, included: false }] + }, + hooks: { + pre (callback) { + nodes = [] + parallel([ + (cb) => spawnDaemon(7, cb), + (cb) => spawnDaemon(8, cb), + (cb) => spawnDaemon(12, cb), + (cb) => spawnDaemon(13, cb) + ], callback) + }, + post (callback) { + series(nodes.map((node) => (cb) => { + setTimeout(() => node.stop(cb), 100) + }), callback) + } } } diff --git a/gulpfile.js b/gulpfile.js deleted file mode 100644 index 2be23a3e2b..0000000000 --- a/gulpfile.js +++ /dev/null @@ -1,64 +0,0 @@ -'use strict' - -const gulp = require('gulp') -const parallel = require('async/parallel') -const series = require('async/series') -const createTempRepo = require('./test/utils/create-repo-nodejs.js') -const HTTPAPI = require('./src/http-api') -const leftPad = require('left-pad') - -let nodes = [] - -/* - * spawns a daemon with ports numbers starting in 10 and ending in `num` - */ -function spawnDaemon (num, callback) { - num = leftPad(num, 3, 0) - - const config = { - Addresses: { - Swarm: [ - `/ip4/127.0.0.1/tcp/10${num}`, - `/ip4/127.0.0.1/tcp/20${num}/ws` - ], - API: `/ip4/127.0.0.1/tcp/31${num}`, - Gateway: `/ip4/127.0.0.1/tcp/32${num}` - }, - Bootstrap: [], - Discovery: { - MDNS: { - Enabled: false - }, - webRTCStar: { - Enabled: false - } - } - } - - const daemon = new HTTPAPI(createTempRepo(), config) - nodes.push(daemon) - daemon.start(true, callback) -} - -gulp.task('libnode:start', (done) => { - nodes = [] - parallel([ - (cb) => spawnDaemon(7, cb), - (cb) => spawnDaemon(8, cb), - (cb) => spawnDaemon(12, cb), - (cb) => spawnDaemon(13, cb) - ], done) -}) - -gulp.task('libnode:stop', (done) => { - series(nodes.map((node) => (cb) => { - setTimeout(() => node.stop(cb), 100) - }), done) -}) - -gulp.task('test:browser:before', ['libnode:start']) -gulp.task('test:node:before', ['libnode:start']) -gulp.task('test:browser:after', ['libnode:stop']) -gulp.task('test:node:after', ['libnode:stop']) - -require('aegir/gulp')(gulp) diff --git a/package.json b/package.json index 7f00275de6..5a7c96adb5 100644 --- a/package.json +++ b/package.json @@ -19,16 +19,21 @@ "npm": ">=3.0.0" }, "scripts": { - "lint": "aegir-lint", - "coverage": "gulp coverage", - "test": "gulp test --dom", - "test:node": "npm run test:unit:node", - "test:browser": "npm run test:unit:browser", - "test:unit:node": "gulp test:node", - "test:unit:node:core": "TEST=core npm run test:unit:node", - "test:unit:node:http": "TEST=http npm run test:unit:node", - "test:unit:node:cli": "TEST=cli npm run test:unit:node", - "test:unit:browser": "gulp test:browser", + "lint": "aegir lint", + "coverage": "aegir coverage", + "build": "aegir build", + "release": "aegir release", + "release-minor": "aegir release --type minor", + "release-major": "aegir release --type major", + "coverage-publish": "aegir coverage publish", + "test": "aegir test", + "test:node": "aegir test --target node", + "test:browser": "aegir test--target browser", + "test:unit:node": "npm run test:node", + "test:unit:node:core": "aegir test --target node --files test/core/**", + "test:unit:node:http": "aegir test --target node --files test/http/**", + "test:unit:node:cli": "aegit test --target node --files test/cli/**", + "test:unit:browser": "npm run test:browser", "test:interop": "npm run test:interop:node", "test:interop:node": "mocha -t 60000 test/interop/node.js", "test:interop:browser": "mocha -t 60000 test/interop/browser.js", @@ -36,12 +41,7 @@ "test:benchmark:node": "echo \"Error: no benchmarks yet\" && exit 1", "test:benchmark:node:core": "echo \"Error: no benchmarks yet\" && exit 1", "test:benchmark:node:http": "echo \"Error: no benchmarks yet\" && exit 1", - "test:benchmark:browser": "echo \"Error: no benchmarks yet\" && exit 1", - "build": "gulp build", - "release": "gulp release", - "release-minor": "gulp release --type minor", - "release-major": "gulp release --type major", - "coverage-publish": "aegir-coverage publish" + "test:benchmark:browser": "echo \"Error: no benchmarks yet\" && exit 1" }, "pre-commit": [ "lint", @@ -61,17 +61,17 @@ }, "homepage": "https://github.com/ipfs/js-ipfs#readme", "devDependencies": { - "aegir": "^11.0.2", + "aegir": "^12.0.0", "buffer-loader": "0.0.1", "chai": "^4.1.1", "delay": "^2.0.0", "detect-node": "^2.0.3", "dir-compare": "^1.4.0", "dirty-chai": "^2.0.1", - "eslint-plugin-react": "^7.2.1", + "eslint-plugin-react": "^7.3.0", "execa": "^0.8.0", "expose-loader": "^0.7.3", - "form-data": "^2.2.0", + "form-data": "^2.3.1", "gulp": "^3.9.1", "interface-ipfs-core": "~0.30.1", "ipfsd-ctl": "~0.21.0", @@ -93,7 +93,7 @@ "bl": "^1.2.1", "boom": "^5.2.0", "cids": "^0.5.1", - "debug": "^3.0.0", + "debug": "^3.0.1", "fsm-event": "^2.1.0", "glob": "^7.1.2", "hapi": "^16.5.2", @@ -118,7 +118,7 @@ "libp2p-multiplex": "^0.4.4", "libp2p-railing": "^0.6.1", "libp2p-secio": "^0.7.1", - "libp2p-swarm": "^0.31.0", + "libp2p-swarm": "^0.31.2", "libp2p-tcp": "^0.10.2", "libp2p-webrtc-star": "^0.12.0", "libp2p-websockets": "^0.10.1", @@ -129,7 +129,7 @@ "mafmt": "^2.1.8", "mkdirp": "^0.5.1", "multiaddr": "^2.3.0", - "multihashes": "~0.4.5", + "multihashes": "~0.4.8", "once": "^1.4.0", "path-exists": "^3.0.0", "peer-book": "^0.5.0", diff --git a/test/index.js b/test/index.js new file mode 100644 index 0000000000..f63edbe459 --- /dev/null +++ b/test/index.js @@ -0,0 +1,5 @@ +'use strict' + +require('./core') +require('./http-api') +require('./cli') diff --git a/test/node.js b/test/node.js deleted file mode 100644 index 22872e6d02..0000000000 --- a/test/node.js +++ /dev/null @@ -1,36 +0,0 @@ -'use strict' - -let testCore = true -let testHTTP = true -let testCLI = true - -if (process.env.TEST) { - switch (process.env.TEST) { - case 'core': - testHTTP = false - testCLI = false - break - case 'http': - testCore = false - testCLI = false - break - case 'cli': - testCore = false - testHTTP = false - break - default: - break - } -} - -if (testCore) { - // require('./core/node') -} - -if (testHTTP) { - require('./http-api') -} - -if (testCLI) { - require('./cli') -} From 31c20a5462d50cf537806fde55588d86e34c96d9 Mon Sep 17 00:00:00 2001 From: David Dias Date: Sun, 27 Aug 2017 10:20:38 +0200 Subject: [PATCH 2/9] chore: update interface-ipfs-core --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5a7c96adb5..edb5cc11b9 100644 --- a/package.json +++ b/package.json @@ -73,7 +73,7 @@ "expose-loader": "^0.7.3", "form-data": "^2.3.1", "gulp": "^3.9.1", - "interface-ipfs-core": "~0.30.1", + "interface-ipfs-core": "~0.31.2", "ipfsd-ctl": "~0.21.0", "left-pad": "^1.1.3", "lodash": "^4.17.4", From 51c7bada44e329a11ad9c1c799ae106ea0df3cc1 Mon Sep 17 00:00:00 2001 From: David Dias Date: Mon, 28 Aug 2017 06:29:29 +0200 Subject: [PATCH 3/9] fix npm scripts --- package.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package.json b/package.json index edb5cc11b9..d224813baa 100644 --- a/package.json +++ b/package.json @@ -28,11 +28,11 @@ "coverage-publish": "aegir coverage publish", "test": "aegir test", "test:node": "aegir test --target node", - "test:browser": "aegir test--target browser", + "test:browser": "aegir test --target browser", "test:unit:node": "npm run test:node", "test:unit:node:core": "aegir test --target node --files test/core/**", "test:unit:node:http": "aegir test --target node --files test/http/**", - "test:unit:node:cli": "aegit test --target node --files test/cli/**", + "test:unit:node:cli": "aegir test --target node --files test/cli/**", "test:unit:browser": "npm run test:browser", "test:interop": "npm run test:interop:node", "test:interop:node": "mocha -t 60000 test/interop/node.js", From a07ff6074a8afa04715a827cb7999b97d9520713 Mon Sep 17 00:00:00 2001 From: David Dias Date: Tue, 29 Aug 2017 09:16:46 +0200 Subject: [PATCH 4/9] test: --no-parallel --- package.json | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index d224813baa..008db42914 100644 --- a/package.json +++ b/package.json @@ -22,18 +22,18 @@ "lint": "aegir lint", "coverage": "aegir coverage", "build": "aegir build", - "release": "aegir release", - "release-minor": "aegir release --type minor", - "release-major": "aegir release --type major", + "release": "aegir release --no-parallel", + "release-minor": "aegir release --type minor --no-parallel", + "release-major": "aegir release --type major --no-parallel", "coverage-publish": "aegir coverage publish", - "test": "aegir test", - "test:node": "aegir test --target node", - "test:browser": "aegir test --target browser", - "test:unit:node": "npm run test:node", - "test:unit:node:core": "aegir test --target node --files test/core/**", - "test:unit:node:http": "aegir test --target node --files test/http/**", - "test:unit:node:cli": "aegir test --target node --files test/cli/**", - "test:unit:browser": "npm run test:browser", + "test": "aegir test --no-parallel", + "test:node": "aegir test --target node --no-parallel", + "test:browser": "aegir test --target browser --no-parallel", + "test:unit:node": "npm run test:node --no-parallel", + "test:unit:node:core": "aegir test --target node --files test/core/** --no-parallel", + "test:unit:node:http": "aegir test --target node --files test/http/** --no-parallel", + "test:unit:node:cli": "aegir test --target node --files test/cli/** --no-parallel", + "test:unit:browser": "npm run test:browser --no-parallel", "test:interop": "npm run test:interop:node", "test:interop:node": "mocha -t 60000 test/interop/node.js", "test:interop:browser": "mocha -t 60000 test/interop/browser.js", From f50c89bcd4375fcf89837f38d99a9042176af384 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Mon, 4 Sep 2017 13:57:00 +0200 Subject: [PATCH 5/9] fixes for merge with master --- .gitignore | 1 + examples/exchange-files-in-browser/public/js/app.js | 8 ++++---- examples/traverse-ipld-graphs/get-path-accross-formats.js | 2 +- examples/traverse-ipld-graphs/tree.js | 2 +- package.json | 2 +- src/cli/commands/bitswap/stat.js | 2 +- src/cli/commands/config/edit.js | 2 +- src/cli/commands/pubsub/pub.js | 2 +- src/core/boot.js | 2 +- src/core/components/id.js | 8 ++++---- src/core/components/object.js | 6 +++--- src/core/components/pubsub.js | 4 ++-- src/http-api/resources/object.js | 4 ++-- src/http-api/resources/pubsub.js | 2 +- test/cli/block.js | 2 +- test/cli/dag.js | 2 +- test/cli/files.js | 2 +- test/core/init.spec.js | 2 +- test/http-api/over-ipfs-api/block.js | 2 +- test/http-api/over-ipfs-api/object.js | 4 ++-- test/http-api/spec/files.js | 4 ++-- test/http-api/spec/object.js | 2 +- test/http-api/spec/pubsub.js | 2 +- test/utils/ipfs-factory-instance/index.js | 4 ++-- 24 files changed, 37 insertions(+), 36 deletions(-) diff --git a/.gitignore b/.gitignore index e4c5b0e314..8545c7ec63 100644 --- a/.gitignore +++ b/.gitignore @@ -40,3 +40,4 @@ test/test-data/go-ipfs-repo/LOG.old # while testing npm5 package-lock.json +yarn.lock \ No newline at end of file diff --git a/examples/exchange-files-in-browser/public/js/app.js b/examples/exchange-files-in-browser/public/js/app.js index 8d14ce7c6d..4bf528ae65 100644 --- a/examples/exchange-files-in-browser/public/js/app.js +++ b/examples/exchange-files-in-browser/public/js/app.js @@ -150,8 +150,8 @@ function onDrop (event) { let progress = 0 let myReadableStreamBuffer = new streamBuffers.ReadableStreamBuffer({ - // frequency: 10, // in milliseconds. - chunkSize: 32048 // in bytes. + // frequency: 10, // in milliseconds. + chunkSize: 32048 // in bytes. }) node.files.createAddStream((err, stream) => { @@ -200,8 +200,8 @@ function onDrop (event) { if (files && files.length) { $multihashInput.value = files[0].hash $filesStatus.innerHTML = files - .map((e) => `Added ${e.path} as ${e.hash}`) - .join('
') + .map((e) => `Added ${e.path} as ${e.hash}`) + .join('
') } }) .catch(onError) diff --git a/examples/traverse-ipld-graphs/get-path-accross-formats.js b/examples/traverse-ipld-graphs/get-path-accross-formats.js index f3abae4d40..004c93171b 100644 --- a/examples/traverse-ipld-graphs/get-path-accross-formats.js +++ b/examples/traverse-ipld-graphs/get-path-accross-formats.js @@ -16,7 +16,7 @@ createNode((err, ipfs) => { series([ (cb) => { - const someData = new Buffer('capoeira') + const someData = Buffer.from('capoeira') dagPB.DAGNode.create(someData, (err, node) => { if (err) { diff --git a/examples/traverse-ipld-graphs/tree.js b/examples/traverse-ipld-graphs/tree.js index 6608faed27..920f7a2bb3 100644 --- a/examples/traverse-ipld-graphs/tree.js +++ b/examples/traverse-ipld-graphs/tree.js @@ -16,7 +16,7 @@ createNode((err, ipfs) => { series([ (cb) => { - const someData = new Buffer('capoeira') + const someData = Buffer.from('capoeira') dagPB.DAGNode.create(someData, (err, node) => { if (err) { diff --git a/package.json b/package.json index b9a154c928..4e01e61b88 100644 --- a/package.json +++ b/package.json @@ -61,7 +61,7 @@ }, "homepage": "https://github.com/ipfs/js-ipfs#readme", "devDependencies": { - "aegir": "^12.0.0", + "aegir": "^12.0.2", "buffer-loader": "0.0.1", "chai": "^4.1.2", "delay": "^2.0.0", diff --git a/src/cli/commands/bitswap/stat.js b/src/cli/commands/bitswap/stat.js index f19d5d9f08..ef55ec0d1c 100644 --- a/src/cli/commands/bitswap/stat.js +++ b/src/cli/commands/bitswap/stat.js @@ -18,7 +18,7 @@ module.exports = { stats.Wantlist = stats.Wantlist || [] stats.Wantlist = stats.Wantlist.map((entry) => { - const buf = new Buffer(entry.cid.hash.data) + const buf = Buffer.from(entry.cid.hash.data) const cid = new CID(entry.cid.version, entry.cid.codec, buf) return cid.toBaseEncodedString() }) diff --git a/src/cli/commands/config/edit.js b/src/cli/commands/config/edit.js index 4d0c5ef865..1238e4b4ad 100644 --- a/src/cli/commands/config/edit.js +++ b/src/cli/commands/config/edit.js @@ -81,7 +81,7 @@ module.exports = { function saveConfig (config, next) { config = utils.isDaemonOn() - ? new Buffer(JSON.stringify(config)) : config + ? Buffer.from(JSON.stringify(config)) : config argv.ipfs.config.replace(config, (err) => { if (err) { diff --git a/src/cli/commands/pubsub/pub.js b/src/cli/commands/pubsub/pub.js index bed5232805..e0567cdaf7 100644 --- a/src/cli/commands/pubsub/pub.js +++ b/src/cli/commands/pubsub/pub.js @@ -8,7 +8,7 @@ module.exports = { builder: {}, handler (argv) { - const data = new Buffer(String(argv.data)) + const data = Buffer.from(String(argv.data)) argv.ipfs.pubsub.publish(argv.topic, data, (err) => { if (err) { diff --git a/src/core/boot.js b/src/core/boot.js index 5ba2e3b5b6..e8f8402887 100644 --- a/src/core/boot.js +++ b/src/core/boot.js @@ -43,7 +43,7 @@ module.exports = (self) => { if (err.message.match(/not found/) || // indexeddb err.message.match(/ENOENT/) || // fs err.message.match(/No value/) // memory - ) { + ) { return cb(null, false) } return cb(err) diff --git a/src/core/components/id.js b/src/core/components/id.js index af4eceeeb4..dedad190fd 100644 --- a/src/core/components/id.js +++ b/src/core/components/id.js @@ -14,10 +14,10 @@ module.exports = function id (self) { id: self._peerInfo.id.toB58String(), publicKey: self._peerInfo.id.pubKey.bytes.toString('base64'), addresses: self._peerInfo.multiaddrs - .toArray() - .map((ma) => ma.toString()) - .filter((ma) => ma.indexOf('ipfs') >= 0) - .sort(), + .toArray() + .map((ma) => ma.toString()) + .filter((ma) => ma.indexOf('ipfs') >= 0) + .sort(), agentVersion: 'js-ipfs', protocolVersion: '9000' })) diff --git a/src/core/components/object.js b/src/core/components/object.js index 4c716c4504..3164729261 100644 --- a/src/core/components/object.js +++ b/src/core/components/object.js @@ -16,7 +16,7 @@ function normalizeMultihash (multihash, enc) { return multihash } - return new Buffer(multihash, enc) + return Buffer.from(multihash, enc) } else if (Buffer.isBuffer(multihash)) { return multihash } else { @@ -49,7 +49,7 @@ function parseJSONBuffer (buf, callback) { mh.fromB58String(link.Hash || link.hash || link.multihash) ) }) - data = new Buffer(parsed.Data) + data = Buffer.from(parsed.Data) } catch (err) { return callback(new Error('failed to parse JSON: ' + err)) } @@ -104,7 +104,7 @@ module.exports = function object (self) { assert(template === 'unixfs-dir', 'unkown template') data = (new Unixfs('directory')).marshal() } else { - data = new Buffer(0) + data = Buffer.from(0) } DAGNode.create(data, (err, node) => { diff --git a/src/core/components/pubsub.js b/src/core/components/pubsub.js index b0a1eb283d..0927384dd8 100644 --- a/src/core/components/pubsub.js +++ b/src/core/components/pubsub.js @@ -73,8 +73,8 @@ module.exports = function pubsub (self) { } const peers = Array.from(self._pubsub.peers.values()) - .filter((peer) => peer.topics.has(topic)) - .map((peer) => peer.info.id.toB58String()) + .filter((peer) => peer.topics.has(topic)) + .map((peer) => peer.info.id.toB58String()) setImmediate(() => callback(null, peers)) }), diff --git a/src/http-api/resources/object.js b/src/http-api/resources/object.js index 4a366f4e60..16f5db9c8d 100644 --- a/src/http-api/resources/object.js +++ b/src/http-api/resources/object.js @@ -149,7 +149,7 @@ exports.put = { }) } - file = new Buffer(JSON.stringify(answer)) + file = Buffer.from(JSON.stringify(answer)) finished = true }) } else { @@ -190,7 +190,7 @@ exports.put = { series([ (cb) => { - DAGNode.create(new Buffer(node.Data), node.Links, (err, _node) => { + DAGNode.create(Buffer.from(node.Data), node.Links, (err, _node) => { if (err) { return cb(err) } diff --git a/src/http-api/resources/pubsub.js b/src/http-api/resources/pubsub.js index 39ece9935c..8d35abce97 100644 --- a/src/http-api/resources/pubsub.js +++ b/src/http-api/resources/pubsub.js @@ -68,7 +68,7 @@ exports.publish = { return reply(new Error('Missing buf')) } - ipfs.pubsub.publish(topic, new Buffer(String(buf)), (err) => { + ipfs.pubsub.publish(topic, Buffer.from(String(buf)), (err) => { if (err) { return reply(new Error(`Failed to publish to topic ${topic}: ${err}`)) } diff --git a/test/cli/block.js b/test/cli/block.js index 5e328d7627..381c7f592f 100644 --- a/test/cli/block.js +++ b/test/cli/block.js @@ -33,7 +33,7 @@ describe('block', () => runOnAndOff((thing) => { expect(out).to.eql('QmTwbQs4sGcCiPxV97SpbHS7QgmVg9SiKxcG1AcF1Ly2SL\n') return ipfs('block get QmTwbQs4sGcCiPxV97SpbHS7QgmVg9SiKxcG1AcF1Ly2SL') }) - .then((out) => expect(out).to.eql('there is no newline at end of this file')) + .then((out) => expect(out).to.eql('there is no newline at end of this file')) }) it('stat', () => { diff --git a/test/cli/dag.js b/test/cli/dag.js index 5fd77a79e9..f14996489a 100644 --- a/test/cli/dag.js +++ b/test/cli/dag.js @@ -18,7 +18,7 @@ describe('dag', () => runOnAndOff.off((thing) => { // lookup path on eth-block return ipfs('dag get z43AaGF23fmvRnDP56Ub9WcJCfzSfqtmzNCCvmz5eudT8dtdCDS/parentHash') }).then((out) => { - let expectHash = new Buffer('c8c0a17305adea9bbb4b98a52d44f0c1478f5c48fc4b64739ee805242501b256', 'hex') + let expectHash = Buffer.from('c8c0a17305adea9bbb4b98a52d44f0c1478f5c48fc4b64739ee805242501b256', 'hex') expect(out).to.be.eql('0x' + expectHash.toString('hex') + '\n') }) }) diff --git a/test/cli/files.js b/test/cli/files.js index b7030ebc3d..2c9297701d 100644 --- a/test/cli/files.js +++ b/test/cli/files.js @@ -11,7 +11,7 @@ const runOnAndOff = require('../utils/on-and-off') describe('files', () => runOnAndOff((thing) => { let ipfs const readme = fs.readFileSync(path.join(process.cwd(), '/src/init-files/init-docs/readme')) - .toString('utf-8') + .toString('utf-8') const recursiveGetDirResults = [ 'added QmR56UJmAaZLXLdTT1ALrE9vVqV8soUEekm9BMd4FnuYqV recursive-get-dir/version', 'added QmYE7xo6NxbHEVEHej1yzxijYaNY51BaeKxjXxn6Ssa6Bs recursive-get-dir/init-docs/tour/0.0-intro', diff --git a/test/core/init.spec.js b/test/core/init.spec.js index 309ef2265b..647e7c066b 100644 --- a/test/core/init.spec.js +++ b/test/core/init.spec.js @@ -82,7 +82,7 @@ describe('init', () => { expect(err).to.not.exist() // Should not have default assets - const multihash = new Buffer('12205e7c3ce237f936c76faf625e90f7751a9f5eeb048f59873303c215e9cce87599', 'hex') + const multihash = Buffer.from('12205e7c3ce237f936c76faf625e90f7751a9f5eeb048f59873303c215e9cce87599', 'hex') ipfs.object.get(multihash, {}, (err, node) => { expect(err).to.exist() diff --git a/test/http-api/over-ipfs-api/block.js b/test/http-api/over-ipfs-api/block.js index 2555386587..dd66c99836 100644 --- a/test/http-api/over-ipfs-api/block.js +++ b/test/http-api/over-ipfs-api/block.js @@ -13,7 +13,7 @@ module.exports = (ctl) => { describe('.block', () => { describe('.put', () => { it('updates value', (done) => { - const data = new Buffer('hello world\n') + const data = Buffer.from('hello world\n') const expectedResult = { key: 'QmZjTnYw2TFhn9Nn7tjmPSoTBoY7YRkwPzwSrSbabY24Kp', size: 12 diff --git a/test/http-api/over-ipfs-api/object.js b/test/http-api/over-ipfs-api/object.js index 105b25bdd3..2d9ce118da 100644 --- a/test/http-api/over-ipfs-api/object.js +++ b/test/http-api/over-ipfs-api/object.js @@ -50,7 +50,7 @@ module.exports = (ctl) => { ctl.object.get('QmdfTbBqBPQ7VNxZEYEj14VmRuZBkqFbiwReogJgS1zR1n', {enc: 'base58'}, asJson((err, res) => { expect(err).to.not.exist() expect(res.links).to.be.eql([]) - expect(res.data).to.eql(new Buffer('')) + expect(res.data).to.eql(Buffer.from('')) done() })) }) @@ -69,7 +69,7 @@ module.exports = (ctl) => { it('updates value', (done) => { const filePath = fs.readFileSync('test/test-data/node.json') const expectedResult = { - data: new Buffer('another'), + data: Buffer.from('another'), multihash: 'QmZZmY4KCu9r3e7M2Pcn46Fc5qbn6NpzaAGaYb22kbfTqm', links: [{ name: 'some link', diff --git a/test/http-api/spec/files.js b/test/http-api/spec/files.js index 1ff7b27c88..2f4c26dc6d 100644 --- a/test/http-api/spec/files.js +++ b/test/http-api/spec/files.js @@ -42,8 +42,8 @@ module.exports = (http) => { url: '/api/v0/cat?arg=QmT78zSuBmuS4z925WZfrqQ1qHaJ56DQaTfyMUF7F8ff5o' }, (res) => { expect(res.statusCode).to.equal(200) - expect(res.rawPayload).to.deep.equal(new Buffer('hello world' + '\n')) - expect(res.payload).to.equal('hello world' + '\n') + expect(res.rawPayload).to.deep.equal(Buffer.from('hello world\n')) + expect(res.payload).to.equal('hello world\n') done() }) }) diff --git a/test/http-api/spec/object.js b/test/http-api/spec/object.js index d39560ca76..cb58788274 100644 --- a/test/http-api/spec/object.js +++ b/test/http-api/spec/object.js @@ -115,7 +115,7 @@ module.exports = (http) => { const headers = form.getHeaders() const expectedResult = { - Data: new Buffer('another'), + Data: Buffer.from('another'), Hash: 'QmZZmY4KCu9r3e7M2Pcn46Fc5qbn6NpzaAGaYb22kbfTqm', Links: [{ Name: 'some link', diff --git a/test/http-api/spec/pubsub.js b/test/http-api/spec/pubsub.js index cb5447f999..245b6d153c 100644 --- a/test/http-api/spec/pubsub.js +++ b/test/http-api/spec/pubsub.js @@ -14,7 +14,7 @@ module.exports = (http) => { let api let tmpNode - const buf = new Buffer('some message') + const buf = Buffer.from('some message') const topic = 'nonScents' const topicNotSubscribed = 'somethingRandom' diff --git a/test/utils/ipfs-factory-instance/index.js b/test/utils/ipfs-factory-instance/index.js index 9d36a361f0..3b77e290a9 100644 --- a/test/utils/ipfs-factory-instance/index.js +++ b/test/utils/ipfs-factory-instance/index.js @@ -29,8 +29,8 @@ function Factory () { if (!repoPath) { repoPath = '/tmp/.ipfs-' + Math.random() - .toString() - .substring(2, 8) + .toString() + .substring(2, 8) } config = config || defaultConfig From f97e01c72bcf6f0936855fddfbad4a0d20047a78 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Mon, 4 Sep 2017 13:59:14 +0200 Subject: [PATCH 6/9] move coverage to circle --- .travis.yml | 1 - circle.yml | 3 +++ package.json | 1 - 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 584f308f81..a3a6eabf40 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,7 +13,6 @@ matrix: script: - npm run lint - npm run test - - npm run coverage - make test before_script: diff --git a/circle.yml b/circle.yml index 56f7efbe2d..db2c69540e 100644 --- a/circle.yml +++ b/circle.yml @@ -1,6 +1,9 @@ machine: node: version: stable +test: + post: + - npm run coverage -- --upload dependencies: pre: diff --git a/package.json b/package.json index 4e01e61b88..5f79e91131 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,6 @@ "release": "aegir release --no-parallel", "release-minor": "aegir release --type minor --no-parallel", "release-major": "aegir release --type major --no-parallel", - "coverage-publish": "aegir coverage publish", "test": "aegir test --no-parallel", "test:node": "aegir test --target node --no-parallel", "test:browser": "aegir test --target browser --no-parallel", From 8c19b5ee66cbaf8de0c53b94a588f3330d250d5f Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Mon, 4 Sep 2017 14:15:38 +0200 Subject: [PATCH 7/9] more timeouts --- package.json | 4 ++-- src/core/components/object.js | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index 5f79e91131..fe4ef70723 100644 --- a/package.json +++ b/package.json @@ -20,12 +20,12 @@ }, "scripts": { "lint": "aegir lint", - "coverage": "aegir coverage", + "coverage": "aegir coverage --timeout 50000", "build": "aegir build", "release": "aegir release --no-parallel", "release-minor": "aegir release --type minor --no-parallel", "release-major": "aegir release --type major --no-parallel", - "test": "aegir test --no-parallel", + "test": "aegir test --no-parallel --timeout 50000", "test:node": "aegir test --target node --no-parallel", "test:browser": "aegir test --target browser --no-parallel", "test:unit:node": "npm run test:node --no-parallel", diff --git a/src/core/components/object.js b/src/core/components/object.js index 3164729261..1b1f51e0e1 100644 --- a/src/core/components/object.js +++ b/src/core/components/object.js @@ -104,7 +104,7 @@ module.exports = function object (self) { assert(template === 'unixfs-dir', 'unkown template') data = (new Unixfs('directory')).marshal() } else { - data = Buffer.from(0) + data = Buffer.alloc(0) } DAGNode.create(data, (err, node) => { From 5900d7c8728584b6b879a48a84edeca53efff677 Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Tue, 5 Sep 2017 16:26:55 +0200 Subject: [PATCH 8/9] bump versions --- package.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/package.json b/package.json index fe4ef70723..fe15a75d85 100644 --- a/package.json +++ b/package.json @@ -60,7 +60,7 @@ }, "homepage": "https://github.com/ipfs/js-ipfs#readme", "devDependencies": { - "aegir": "^12.0.2", + "aegir": "^12.0.6", "buffer-loader": "0.0.1", "chai": "^4.1.2", "delay": "^2.0.0", @@ -98,7 +98,7 @@ "hapi": "^16.5.2", "hapi-set-header": "^1.0.2", "hoek": "^4.2.0", - "ipfs-api": "^14.2.1", + "ipfs-api": "^14.3.2", "ipfs-bitswap": "~0.17.0", "ipfs-block": "~0.6.0", "ipfs-block-service": "~0.12.0", @@ -118,7 +118,7 @@ "libp2p-railing": "~0.7.0", "libp2p-secio": "~0.8.0", "libp2p-tcp": "~0.11.0", - "libp2p-webrtc-star": "~0.13.0", + "libp2p-webrtc-star": "~0.13.1", "libp2p-websockets": "~0.10.1", "lodash.flatmap": "^4.5.0", "lodash.get": "^4.4.2", From 0c0e32531398881a8f80675c9bbf5be29091a49b Mon Sep 17 00:00:00 2001 From: dignifiedquire Date: Tue, 5 Sep 2017 16:57:49 +0200 Subject: [PATCH 9/9] more default timeouts --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index fe15a75d85..85c914d63f 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,7 @@ "release-minor": "aegir release --type minor --no-parallel", "release-major": "aegir release --type major --no-parallel", "test": "aegir test --no-parallel --timeout 50000", - "test:node": "aegir test --target node --no-parallel", + "test:node": "aegir test --target node --no-parallel --timeout 50000", "test:browser": "aegir test --target browser --no-parallel", "test:unit:node": "npm run test:node --no-parallel", "test:unit:node:core": "aegir test --target node --files test/core/** --no-parallel",