From 57c39a2409d4edc7e4167851406b9b023c45610f Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 18 Nov 2019 15:53:37 +0000 Subject: [PATCH 1/2] fix: parents option and ls stream flow --- src/files-mfs/cp.js | 4 ++-- src/files-mfs/flush.js | 2 +- src/files-mfs/index.js | 2 +- src/files-mfs/ls-pull-stream.js | 4 ++-- src/files-mfs/ls-readable-stream.js | 5 +++-- src/files-mfs/ls.js | 4 ++-- src/files-mfs/mkdir.js | 2 +- src/files-mfs/mv.js | 6 +++--- src/files-mfs/rm.js | 4 ++-- src/files-mfs/stat.js | 4 ++-- 10 files changed, 19 insertions(+), 18 deletions(-) diff --git a/src/files-mfs/cp.js b/src/files-mfs/cp.js index 38233eaa6..5eea87531 100644 --- a/src/files-mfs/cp.js +++ b/src/files-mfs/cp.js @@ -46,7 +46,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(testDir, { p: true }, cb), + (cb) => ipfs.files.mkdir(testDir, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/a`, Buffer.from('TEST'), { create: true }, cb), (cb) => ipfs.files.cp(`${testDir}/a`, `${testDir}/b`, cb) ], (err) => { @@ -68,7 +68,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(`${testDir}/lv1/lv2`, { p: true }, cb), + (cb) => ipfs.files.mkdir(`${testDir}/lv1/lv2`, { parents: true }, cb), (cb) => ipfs.files.cp(`${testDir}/lv1/lv2`, `${testDir}/lv1/lv3`, cb) ], (err) => { expect(err).to.not.exist() diff --git a/src/files-mfs/flush.js b/src/files-mfs/flush.js index 99ffb6c0d..647f0ec46 100644 --- a/src/files-mfs/flush.js +++ b/src/files-mfs/flush.js @@ -52,7 +52,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(testDir, { p: true }, cb), + (cb) => ipfs.files.mkdir(testDir, { parents: true }, cb), (cb) => ipfs.files.flush(testDir, cb) ], (err) => { expect(err).to.not.exist() diff --git a/src/files-mfs/index.js b/src/files-mfs/index.js index 6f70a80d7..b1952057d 100644 --- a/src/files-mfs/index.js +++ b/src/files-mfs/index.js @@ -5,7 +5,7 @@ const { createSuite } = require('../utils/suite') const tests = { mkdir: require('./mkdir'), write: require('./write'), - cp: require('./cp'), + cparents: require('./cp'), mv: require('./mv'), rm: require('./rm'), stat: require('./stat'), diff --git a/src/files-mfs/ls-pull-stream.js b/src/files-mfs/ls-pull-stream.js index 40863414a..e9977c127 100644 --- a/src/files-mfs/ls-pull-stream.js +++ b/src/files-mfs/ls-pull-stream.js @@ -52,7 +52,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { p: true }, cb), + (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() @@ -75,7 +75,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { p: true }, cb), + (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() diff --git a/src/files-mfs/ls-readable-stream.js b/src/files-mfs/ls-readable-stream.js index 7dc5a3b17..af489a6fd 100644 --- a/src/files-mfs/ls-readable-stream.js +++ b/src/files-mfs/ls-readable-stream.js @@ -36,6 +36,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` const stream = ipfs.files.lsReadableStream(`${testDir}/404`) + stream.on('data', () => {}) stream.once('error', (err) => { expect(err).to.exist() @@ -48,7 +49,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { p: true }, cb), + (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() @@ -72,7 +73,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { p: true }, cb), + (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() diff --git a/src/files-mfs/ls.js b/src/files-mfs/ls.js index ea065a236..469f16b68 100644 --- a/src/files-mfs/ls.js +++ b/src/files-mfs/ls.js @@ -47,7 +47,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { p: true }, cb), + (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() @@ -67,7 +67,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { p: true }, cb), + (cb) => ipfs.files.mkdir(`${testDir}/lv1`, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() diff --git a/src/files-mfs/mkdir.js b/src/files-mfs/mkdir.js index dc9fac8e5..81190a42c 100644 --- a/src/files-mfs/mkdir.js +++ b/src/files-mfs/mkdir.js @@ -43,7 +43,7 @@ module.exports = (createCommon, options) => { it('should make directory and its parents', (done) => { const testDir = `/test-${hat()}` - ipfs.files.mkdir(`${testDir}/lv1/lv2`, { p: true }, (err) => { + ipfs.files.mkdir(`${testDir}/lv1/lv2`, { parents: true }, (err) => { expect(err).to.not.exist() done() }) diff --git a/src/files-mfs/mv.js b/src/files-mfs/mv.js index 50dd3da45..f98b71a3d 100644 --- a/src/files-mfs/mv.js +++ b/src/files-mfs/mv.js @@ -32,7 +32,7 @@ module.exports = (createCommon, options) => { before((done) => { series([ - (cb) => ipfs.files.mkdir('/test/lv1/lv2', { p: true }, cb), + (cb) => ipfs.files.mkdir('/test/lv1/lv2', { parents: true }, cb), (cb) => ipfs.files.write('/test/a', Buffer.from('Hello, world!'), { create: true }, cb) ], done) }) @@ -52,7 +52,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(`${testDir}/lv1/lv2`, { p: true }, cb), + (cb) => ipfs.files.mkdir(`${testDir}/lv1/lv2`, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/a`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() @@ -67,7 +67,7 @@ module.exports = (createCommon, options) => { it('should move dir, expect no error', (done) => { const testDir = `/test-${hat()}` - ipfs.files.mkdir(`${testDir}/lv1/lv2`, { p: true }, (err) => { + ipfs.files.mkdir(`${testDir}/lv1/lv2`, { parents: true }, (err) => { expect(err).to.not.exist() ipfs.files.mv('/test/lv1/lv2', '/test/lv1/lv4', (err) => { diff --git a/src/files-mfs/rm.js b/src/files-mfs/rm.js index 79757faf8..649a79268 100644 --- a/src/files-mfs/rm.js +++ b/src/files-mfs/rm.js @@ -45,7 +45,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(testDir, { p: true }, cb), + (cb) => ipfs.files.mkdir(testDir, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/c`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() @@ -60,7 +60,7 @@ module.exports = (createCommon, options) => { it('should remove dir, expect no error', (done) => { const testDir = `/test-${hat()}` - ipfs.files.mkdir(`${testDir}/lv1/lv2`, { p: true }, (err) => { + ipfs.files.mkdir(`${testDir}/lv1/lv2`, { parents: true }, (err) => { expect(err).to.not.exist() ipfs.files.rm(`${testDir}/lv1/lv2`, { recursive: true }, (err) => { diff --git a/src/files-mfs/stat.js b/src/files-mfs/stat.js index a9813666a..42c23305e 100644 --- a/src/files-mfs/stat.js +++ b/src/files-mfs/stat.js @@ -48,7 +48,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(testDir, { p: true }, cb), + (cb) => ipfs.files.mkdir(testDir, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/b`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() @@ -74,7 +74,7 @@ module.exports = (createCommon, options) => { const testDir = `/test-${hat()}` series([ - (cb) => ipfs.files.mkdir(testDir, { p: true }, cb), + (cb) => ipfs.files.mkdir(testDir, { parents: true }, cb), (cb) => ipfs.files.write(`${testDir}/a`, Buffer.from('Hello, world!'), { create: true }, cb) ], (err) => { expect(err).to.not.exist() From 55893e0ebdced07073faaa4eee7124b9bcc4b433 Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Mon, 18 Nov 2019 17:04:42 +0000 Subject: [PATCH 2/2] fix: accidental suite name change --- src/files-mfs/index.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/files-mfs/index.js b/src/files-mfs/index.js index b1952057d..6f70a80d7 100644 --- a/src/files-mfs/index.js +++ b/src/files-mfs/index.js @@ -5,7 +5,7 @@ const { createSuite } = require('../utils/suite') const tests = { mkdir: require('./mkdir'), write: require('./write'), - cparents: require('./cp'), + cp: require('./cp'), mv: require('./mv'), rm: require('./rm'), stat: require('./stat'),