Skip to content
This repository has been archived by the owner on Feb 12, 2024. It is now read-only.

fix: typo in 'multiformats' type defs #3778

Merged
merged 3 commits into from
Jul 30, 2021
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
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/bitswap/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CID } from 'multiformts/cid'
import type { CID } from 'multiformats/cid'
import type { AbortOptions } from '../utils'

export interface API<OptionExtension = {}> {
Expand Down
4 changes: 2 additions & 2 deletions packages/ipfs-core-types/src/block/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { AbortOptions, PreloadOptions, IPFSPath } from '../utils'
import { AbortOptions, PreloadOptions } from '../utils'
import { CID, CIDVersion } from 'multiformats/cid'

export interface API<OptionExtension = {}> {
Expand Down Expand Up @@ -78,7 +78,7 @@ export interface API<OptionExtension = {}> {
* // Logs: 3739
* ```
*/
stat: (ipfsPath: IPFSPath, options?: AbortOptions & PreloadOptions & OptionExtension) => Promise<StatResult>
stat: (cid: CID, options?: AbortOptions & PreloadOptions & OptionExtension) => Promise<StatResult>
}

export interface PutOptions extends AbortOptions, PreloadOptions {
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/dht/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import type { AbortOptions } from '../utils'
import type { Multiaddr } from 'multiaddr'
import type { CID } from 'multiformts/cid'
import type { CID } from 'multiformats/cid'

export interface API<OptionExtension = {}> {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/name/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CID } from 'multiformts/cid'
import { CID } from 'multiformats/cid'
import type { AbortOptions } from '../utils'
import type { API as PubsubAPI } from './pubsub'

Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/object/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CID } from 'multiformts/cid'
import type { CID } from 'multiformats/cid'
import type { AbortOptions, PreloadOptions } from '../utils'
import type { API as PatchAPI } from './patch'
import type { PBNode, PBLink } from '@ipld/dag-pb'
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/object/patch/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import type { CID } from 'multiformts/cid'
import type { CID } from 'multiformats/cid'
import type { AbortOptions } from '../../utils'
import type { PBLink as DAGLink } from '@ipld/dag-pb'

Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/pin/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { AbortOptions, AwaitIterable } from '../utils'
import type { CID } from 'multiformts/cid'
import type { CID } from 'multiformats/cid'
import type { API as Remote } from './remote'

export interface API<OptionExtension = {}> {
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/pin/remote/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CID } from 'multiformts/cid'
import { CID } from 'multiformats/cid'
import { Multiaddr } from 'multiaddr'
import { API as Service } from './service'
import { AbortOptions } from '../../utils'
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/repo/index.d.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import type { AbortOptions } from '../utils'
import { CID } from 'multiformts/cid'
import { CID } from 'multiformats/cid'

export interface API<OptionExtension = {}> {
/**
Expand Down
2 changes: 1 addition & 1 deletion packages/ipfs-core-types/src/utils.d.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { CID } from 'multiformts/cid'
import { CID } from 'multiformats/cid'
import { Mtime, MtimeLike } from 'ipfs-unixfs'

export type Entry<Content extends AsyncIterable<Uint8Array>|Blob> =
Expand Down
13 changes: 1 addition & 12 deletions packages/ipfs-core/src/components/dht.js
Original file line number Diff line number Diff line change
Expand Up @@ -65,19 +65,8 @@ module.exports = ({ network, repo }) => {
*/
async * provide (cids, options = { recursive: false }) {
const { libp2p } = await use(network, options)
/** @type {CID[]} */
const cidArr = Array.isArray(cids) ? cids : [cids]

for (const i in cids) {
if (typeof cids[i] === 'string') {
try {
cids[i] = CID.parse(cids[i])
} catch (err) {
throw errCode(err, 'ERR_INVALID_CID')
}
}
}

// ensure blocks are actually local
const hasCids = await Promise.all(cidArr.map(cid => repo.blocks.has(cid)))
const hasAll = hasCids.every(has => has)
Expand All @@ -91,7 +80,7 @@ module.exports = ({ network, repo }) => {
throw errCode(new Error('not implemented yet'), 'ERR_NOT_IMPLEMENTED_YET')
}

for (const cid of cids) {
for (const cid of cidArr) {
yield libp2p._dht.provide(cid)
}
},
Expand Down
7 changes: 4 additions & 3 deletions packages/ipfs-http-server/src/api/resources/object.js
Original file line number Diff line number Diff line change
Expand Up @@ -399,9 +399,10 @@ exports.stat = {

const base = await ipfs.bases.getBase(cidBase)

stats.Hash = stats.Hash.toString(base.encoder)

return h.response(stats)
return h.response({
...stats,
Hash: stats.Hash.toString(base.encoder)
})
}
}

Expand Down