This repository has been archived by the owner on Feb 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
fix: allow either cidv{0,1} in refs-local test #2989
Closed
Closed
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,6 +7,7 @@ const all = require('it-all') | |
const importer = require('ipfs-unixfs-importer') | ||
const drain = require('it-drain') | ||
const testTimeout = require('./utils/test-timeout') | ||
const CID = require('cids') | ||
|
||
/** @typedef { import("ipfsd-ctl/src/factory") } Factory */ | ||
/** | ||
|
@@ -47,15 +48,46 @@ module.exports = (common, options) => { | |
|
||
const imported = await all(importer(dirs, ipfs.block)) | ||
|
||
// otherwise go-ipfs doesn't show them in the local refs | ||
await Promise.all( | ||
imported.map(i => ipfs.pin.add(i.cid)) | ||
) | ||
// rust-ipfs doesn't yet have pinning api, it'll just list all local cids | ||
// in /refs/local | ||
if (common.opts.type !== 'rust') { | ||
// otherwise go-ipfs doesn't show them in the local refs | ||
await Promise.all( | ||
imported.map(i => ipfs.pin.add(i.cid)) | ||
) | ||
} | ||
|
||
const refs = await all(ipfs.refs.local()) | ||
|
||
const expected = [ | ||
'QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn', | ||
'QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr' | ||
] | ||
|
||
const cids = refs.map(r => r.ref) | ||
expect(cids).to.include('QmVwdDCY4SPGVFnNCiZnX5CtzwWDn6kAM98JXzKxE3kCmn') | ||
expect(cids).to.include('QmR4nFjTu18TyANgC65ArNWp5Yaab1gPzQ4D8zp7Kx3vhr') | ||
|
||
for (const alt of expected.map(alternatives)) { | ||
// allow the cids to be either original or in later cid version. | ||
let removed = false | ||
for (const version of alt) { | ||
const index = cids.indexOf(version) | ||
if (index === -1) { | ||
continue | ||
} | ||
removed = true | ||
delete cids[index] | ||
break | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Reading this again and noticed this was break was missing, added this while rebasing. |
||
} | ||
expect(removed, `failed to remove '${alt[0]}'`).to.be.true() | ||
} | ||
}) | ||
}) | ||
} | ||
|
||
function alternatives (cidstr) { | ||
const cid = new CID(cidstr) | ||
if (cid.version === 0) { | ||
return [cidstr, cid.toV1().toString()] | ||
} | ||
return [cidstr] | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Per ipfs/js-ipfsd-ctl@master...ipfs-rust:add_rust_ipfs_http#diff-d4165b1e3527a04dd7e9d370e18c2a1aR47 (also published as draft PR to js-ipfsd-ctl) which we are using in https://github.com/ipfs-rust/ipfs-rust-conformance