chore: fix tests

Author: achingbrain

packages/interface-ipfs-core/src/key/gen.js

@@ -29,6 +29,8 @@ module.exports = (common, options) => {
 
     it('should respect timeout option when generating a key', () => {
       return testTimeout(() => ipfs.key.gen(nanoid(), {
+        type: 'rsa',
+        size: 2048,
         timeout: 1
       }))
     })

packages/ipfs/src/http/api/resources/dht.js

@@ -4,7 +4,6 @@ const Joi = require('../../utils/joi')
 const Boom = require('@hapi/boom')
 const all = require('it-all')
 const pipe = require('it-pipe')
-const { Buffer } = require('buffer')
 const ndjson = require('iterable-ndjson')
 const toStream = require('it-to-stream')
 const { map } = require('streaming-iterables')

packages/ipfs/src/http/utils/joi.js

@@ -12,18 +12,24 @@ const toIpfsPath = (value) => {
   }
 
   value = value.toString()
+  let startedWithIpfs = false
 
-  if (!value.startsWith('/ipfs/')) {
-    value = `/ipfs/${value}`
+  if (value.startsWith('/ipfs/')) {
+    startedWithIpfs = true
+    value = value.replace(/^\/ipfs\//, '')
   }
 
   // section after /ipfs/ should be a valid CID
   const parts = value.split('/')
 
   // will throw if not valid
-  parts[2] = new CID(parts[2])
+  parts[0] = new CID(parts[0])
 
-  return parts.join('/')
+  // go-ipfs returns /ipfs/ prefix for ipfs paths when passed to the http api
+  // and not when it isn't.  E.g.
+  // GET /api/v0/ls?arg=/ipfs/Qmfoo  -> /ipfs/Qmfoo will be in the result
+  // GET /api/v0/ls?arg=Qmfoo  -> Qmfoo will be in the result
+  return `${startedWithIpfs ? '/ipfs/' : ''}${parts.join('/')}`
 }
 
 const toCID = (value) => {

packages/ipfs/test/cli/get.js

@@ -4,7 +4,7 @@
 const fs = require('fs')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const path = require('path')
-const rimraf = require('rimraf').sync
+const clean = require('../utils/clean')
 const CID = require('cids')
 const cli = require('../utils/cli')
 const sinon = require('sinon')
@@ -33,15 +33,15 @@ describe('get', () => {
     }])
 
     const outPath = path.join(process.cwd(), cid.toString())
-    rimraf(outPath)
+    await clean(outPath)
 
     const out = await cli(`get ${cid}`, { ipfs })
     expect(out)
       .to.equal(`Saving file(s) ${cid}\n`)
 
     expect(fs.readFileSync(outPath)).to.deep.equal(buf)
 
-    rimraf(outPath)
+    await clean(outPath)
   })
 
   it('get file with output option', async () => {
@@ -53,15 +53,15 @@ describe('get', () => {
     }])
 
     const outPath = path.join(process.cwd(), 'derp')
-    rimraf(outPath)
+    await clean(outPath)
 
     const out = await cli(`get ${cid} --output ${outPath}`, { ipfs })
     expect(out)
       .to.equal(`Saving file(s) ${cid}\n`)
 
     expect(fs.readFileSync(path.join(outPath, cid.toString()))).to.deep.equal(buf)
 
-    rimraf(outPath)
+    await clean(outPath)
   })
 
   it('get file with short output option', async () => {
@@ -73,15 +73,15 @@ describe('get', () => {
     }])
 
     const outPath = path.join(process.cwd(), 'herp')
-    rimraf(outPath)
+    await clean(outPath)
 
     const out = await cli(`get ${cid} -o ${outPath}`, { ipfs })
     expect(out)
       .to.equal(`Saving file(s) ${cid}\n`)
 
     expect(fs.readFileSync(path.join(outPath, cid.toString()))).to.deep.equal(buf)
 
-    rimraf(outPath)
+    await clean(outPath)
   })
 
   it('get directory', async () => {
@@ -90,15 +90,15 @@ describe('get', () => {
     }])
 
     const outPath = path.join(process.cwd(), cid.toString())
-    rimraf(outPath)
+    await clean(outPath)
 
     const out = await cli(`get ${cid}`, { ipfs })
     expect(out)
       .to.equal(`Saving file(s) ${cid}\n`)
 
     expect(fs.statSync(outPath).isDirectory()).to.be.true()
 
-    rimraf(outPath)
+    await clean(outPath)
   })
 
   it('get recursively', async () => {
@@ -112,7 +112,7 @@ describe('get', () => {
     }])
 
     const outPath = path.join(process.cwd(), cid.toString())
-    rimraf(outPath)
+    await clean(outPath)
 
     const out = await cli(`get ${cid}`, { ipfs })
     expect(out).to.eql(
@@ -123,7 +123,7 @@ describe('get', () => {
     expect(fs.statSync(path.join(outPath, 'foo.txt')).isFile()).to.be.true()
     expect(fs.readFileSync(path.join(outPath, 'foo.txt'))).to.deep.equal(buf)
 
-    rimraf(outPath)
+    await clean(outPath)
   })
 
   it('should get file with a timeout', async () => {
@@ -138,14 +138,14 @@ describe('get', () => {
     }])
 
     const outPath = path.join(process.cwd(), cid.toString())
-    rimraf(outPath)
+    await clean(outPath)
 
     const out = await cli(`get ${cid} --timeout=1s`, { ipfs })
     expect(out)
       .to.equal(`Saving file(s) ${cid}\n`)
 
     expect(fs.readFileSync(outPath)).to.deep.equal(buf)
 
-    rimraf(outPath)
+    await clean(outPath)
   })
 })