Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use CIDv1 by default #2402

Merged
merged 2 commits into from
Feb 21, 2023
Merged

Use CIDv1 by default #2402

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c0853f4
Use CIDv1 by default
davidd8 Feb 3, 2023
672afaa
Merge branch 'main' into main
SgtPooki Feb 8, 2023
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
15 changes: 11 additions & 4 deletions src/add-to-ipfs.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ async function getShareableCid (ipfs, files) {
// because it handles HAMT-sharding of big directories automatically
// See: https://github.com/ipfs/go-ipfs/issues/8106
const dirpath = `/zzzz_${Date.now()}`
await ipfs.files.mkdir(dirpath, {})
await ipfs.files.mkdir(dirpath, { cidVersion: 1 })

for (const { cid, filename } of files) {
await ipfs.files.cp(`/ipfs/${cid}`, `${dirpath}/${filename}`)
Expand Down Expand Up @@ -88,12 +88,19 @@ async function addFileOrDirectory (ipfs, filepath) {
let cid = null

if (stat.isDirectory()) {
const files = globSource(filepath, '**/*', { recursive: true })
const res = await last(ipfs.addAll(files, { pin: false, wrapWithDirectory: true }))
const files = globSource(filepath, '**/*', { recursive: true, cidVersion: 1 })
const res = await last(ipfs.addAll(files, {
pin: false,
wrapWithDirectory: true,
cidVersion: 1
}))
cid = res.cid
} else {
const readStream = fs.createReadStream(filepath)
const res = await ipfs.add(readStream, { pin: false })
const res = await ipfs.add(readStream, {
pin: false,
cidVersion: 1
})
cid = res.cid
}

Expand Down
6 changes: 3 additions & 3 deletions test/unit/add-to-ipfs.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,22 +44,22 @@ test.describe('Add To Ipfs', function () {
expect(electron.clipboard.writeText.callCount).toEqual(1)
expect(notify.notifyError.callCount).toEqual(0)
expect(notify.notify.callCount).toEqual(1)
expect(cid.toString()).toEqual('QmWGeRAEgtsHW3ec7U4qW2CyVy7eA2mFRVbk1nb24jFyks')
expect(cid.toString()).toEqual('bafkreibrl5n5w5wqpdcdxcwaazheualemevr7ttxzbutiw74stdvrfhn2m')
})

test('add to ipfs single directory', async () => {
const cid = await addToIpfs(ctx, getFixtures('dir'))
expect(electron.clipboard.writeText.callCount).toEqual(1)
expect(notify.notifyError.callCount).toEqual(0)
expect(notify.notify.callCount).toEqual(1)
expect(cid.toString()).toEqual('QmVuxXkWEyCKvQiMqVnDiwyJUUyDQZ7VsKhQDCZzPj1Yq8')
expect(cid.toString()).toEqual('bafybeieyzpi3qdqtj7b7hfzdpt2mnmaiicvtrj7ngmf2fc76byecj62gea')
})

test('add to ipfs multiple files', async () => {
const cid = await addToIpfs(ctx, getFixtures('dir', 'hello-world.txt'))
expect(electron.clipboard.writeText.callCount).toEqual(1)
expect(notify.notifyError.callCount).toEqual(0)
expect(notify.notify.callCount).toEqual(1)
expect(cid.toString()).toEqual('QmdYASNGKMVK4HL1uzi3VCZyjQGg3M6VuLsgX5xTKL1gvH')
expect(cid.toString()).toEqual('bafybeiaqy3wawya5ryds5zs4nsxv7ulptbdtgfngipqin7ee65azaxs2uq')
})
})