Skip to content

Commit

Permalink
chore: move withTimeoutOption to core-utils (#3407)
Browse files Browse the repository at this point in the history
Pulls non-grpc changes out of #3403 to ease the continued merging of
master into that branch.

- Moves withTimeoutOption into core-utils
- Moves TimeoutError into core-utils
- Adds missing ts project links
- Adds more add-all tests to interface suite
- Ignores unpassable tests for non-grpc or core implementations
- Normalises mode and mtime in normalise-input function
- Dedupes mtime normalisation between core and http client
  • Loading branch information
achingbrain committed Nov 18, 2020
1 parent a8a908b commit 128e96e
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 70 deletions.
2 changes: 1 addition & 1 deletion src/files/write.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const modeToString = require('../lib/mode-to-string')
const mtimeToObject = require('../lib/mtime-to-object')
const { mtimeToObject } = require('ipfs-core-utils/src/files/normalise-input/utils')
const configure = require('../lib/configure')
const multipartRequest = require('../lib/multipart-request')
const toUrlSearchParams = require('../lib/to-url-search-params')
Expand Down
60 changes: 0 additions & 60 deletions src/lib/mtime-to-object.js

This file was deleted.

6 changes: 2 additions & 4 deletions src/lib/multipart-request.browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
// version and fail.
const normaliseInput = require('ipfs-core-utils/src/files/normalise-input/index.browser')
const modeToString = require('./mode-to-string')
const mtimeToObject = require('./mtime-to-object')
const { File, FormData } = require('ipfs-utils/src/globalthis')

async function multipartRequest (source = '', abortController, headers = {}) {
Expand All @@ -28,9 +27,8 @@ async function multipartRequest (source = '', abortController, headers = {}) {
qs.push(`mode=${modeToString(mode)}`)
}

const time = mtimeToObject(mtime)
if (time != null) {
const { secs, nsecs } = time
if ((mtime) != null) {
const { secs, nsecs } = (mtime)

qs.push(`mtime=${secs}`)

Expand Down
6 changes: 2 additions & 4 deletions src/lib/multipart-request.node.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@
const normaliseInput = require('ipfs-core-utils/src/files/normalise-input')
const { nanoid } = require('nanoid')
const modeToString = require('./mode-to-string')
const mtimeToObject = require('./mtime-to-object')
const merge = require('merge-options').bind({ ignoreUndefined: true })
const toStream = require('it-to-stream')

Expand Down Expand Up @@ -36,9 +35,8 @@ async function multipartRequest (source = '', abortController, headers = {}, bou
qs.push(`mode=${modeToString(mode)}`)
}

const time = mtimeToObject(mtime)
if (time != null) {
const { secs, nsecs } = time
if (mtime != null) {
const { secs, nsecs } = mtime

qs.push(`mtime=${secs}`)

Expand Down
2 changes: 1 addition & 1 deletion src/lib/to-url-search-params.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
'use strict'

const modeToString = require('./mode-to-string')
const mtimeToObject = require('./mtime-to-object')
const { mtimeToObject } = require('ipfs-core-utils/src/files/normalise-input/utils')

/**
* @param {*} params
Expand Down

0 comments on commit 128e96e

Please sign in to comment.