Skip to content
This repository has been archived by the owner on Mar 10, 2020. It is now read-only.

chore: test against go-ipfs 0.4.13 #638

Merged
merged 3 commits into from
Dec 1, 2017
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@
"multihashes": "~0.4.12",
"ndjson": "^1.5.0",
"once": "^1.4.0",
"peer-id": "~0.10.2",
"peer-info": "~0.11.1",
"peer-id": "~0.10.3",
"peer-info": "~0.11.3",
"promisify-es6": "^1.0.3",
"pump": "^1.0.3",
"pull-defer": "^0.2.2",
Expand All @@ -62,14 +62,14 @@
"url": "https://github.com/ipfs/js-ipfs-api"
},
"devDependencies": {
"aegir": "^12.1.3",
"aegir": "^12.2.0",
"chai": "^4.1.2",
"dirty-chai": "^2.0.1",
"eslint-plugin-react": "^7.5.1",
"gulp": "^3.9.1",
"interface-ipfs-core": "~0.36.6",
"interface-ipfs-core": "~0.36.11",
"hapi": "^16.6.2",
"ipfsd-ctl": "~0.25.1",
"ipfsd-ctl": "~0.26.0",
"pre-commit": "^1.2.2",
"socket.io": "^2.0.4",
"socket.io-client": "^2.0.4",
Expand Down
12 changes: 4 additions & 8 deletions src/utils/send-files-stream.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,9 +32,7 @@ module.exports = (send, path) => {
let ended = false
let writing = false

if (!options) {
options = {}
}
options = options || {}

const multipart = new Multipart()

Expand All @@ -45,8 +43,8 @@ module.exports = (send, path) => {
retStream._write = (file, enc, _next) => {
const next = once(_next)
try {
const files = prepareFile(file, Object.assign({}, options, options.qs)).map(
(file) => Object.assign({headers: headers(file)}, file))
const files = prepareFile(file, Object.assign({}, options, options.qs))
.map((file) => Object.assign({headers: headers(file)}, file))

writing = true
eachSeries(
Expand Down Expand Up @@ -117,9 +115,7 @@ module.exports = (send, path) => {
}

if (!response) {
// no response object, which means
// everything is ok, so we end the
// return stream
// no response, which means everything is ok, so we end the retStream
return retStream.push(null) // early
}

Expand Down