From b9b25afd41f1c9c6a46feb4f519ad9d9e1680b5e Mon Sep 17 00:00:00 2001 From: achingbrain Date: Fri, 30 Jul 2021 17:06:44 +0100 Subject: [PATCH 1/2] fix: restore default level-js options Restores level-js options from https://github.com/ipfs/js-ipfs-repo/blob/b82938fcef0f949517fbd6f63700c2c0178ef117/src/default-options-browser.js --- packages/ipfs-core/package.json | 2 +- .../ipfs-core/src/runtime/repo-browser.js | 30 +++++++++++++++---- 2 files changed, 26 insertions(+), 6 deletions(-) diff --git a/packages/ipfs-core/package.json b/packages/ipfs-core/package.json index 0b457266ba..094ddbee72 100644 --- a/packages/ipfs-core/package.json +++ b/packages/ipfs-core/package.json @@ -64,7 +64,7 @@ "blockstore-datastore-adapter": "1.0.0", "datastore-core": "^5.0.1", "datastore-fs": "^5.0.2", - "datastore-level": "^6.0.1", + "datastore-level": "^6.0.2", "datastore-pubsub": "^0.7.0", "debug": "^4.1.1", "dlv": "^1.1.3", diff --git a/packages/ipfs-core/src/runtime/repo-browser.js b/packages/ipfs-core/src/runtime/repo-browser.js index 95ee8b9eea..6994fb790c 100644 --- a/packages/ipfs-core/src/runtime/repo-browser.js +++ b/packages/ipfs-core/src/runtime/repo-browser.js @@ -20,13 +20,33 @@ module.exports = (print, codecs, options) => { const repoPath = options.path || 'ipfs' return createRepo(repoPath, (codeOrName) => codecs.getCodec(codeOrName), { - root: new DatastoreLevel(repoPath), + root: new DatastoreLevel(repoPath, { + extension: '', + prefix: '', + version: 2 + }), blocks: new BlockstoreDatastoreAdapter( - new DatastoreLevel(`${repoPath}/blocks`) + new DatastoreLevel(`${repoPath}/blocks`, { + extension: '', + prefix: '', + version: 2 + }) ), - datastore: new DatastoreLevel(`${repoPath}/datastore`), - keys: new DatastoreLevel(`${repoPath}/keys`), - pins: new DatastoreLevel(`${repoPath}/pins`) + datastore: new DatastoreLevel(`${repoPath}/datastore`, { + extension: '', + prefix: '', + version: 2 + }), + keys: new DatastoreLevel(`${repoPath}/keys`, { + extension: '', + prefix: '', + version: 2 + }), + pins: new DatastoreLevel(`${repoPath}/pins`, { + extension: '', + prefix: '', + version: 2 + }) }, { autoMigrate: options.autoMigrate, onMigrationProgress: options.onMigrationProgress || print From efb5ac349b61eb85106d048deee1fee9a9b4a505 Mon Sep 17 00:00:00 2001 From: achingbrain Date: Fri, 30 Jul 2021 17:14:23 +0100 Subject: [PATCH 2/2] chore: extension is not a level option --- packages/ipfs-core/src/runtime/repo-browser.js | 5 ----- 1 file changed, 5 deletions(-) diff --git a/packages/ipfs-core/src/runtime/repo-browser.js b/packages/ipfs-core/src/runtime/repo-browser.js index 6994fb790c..1d871732bd 100644 --- a/packages/ipfs-core/src/runtime/repo-browser.js +++ b/packages/ipfs-core/src/runtime/repo-browser.js @@ -21,29 +21,24 @@ module.exports = (print, codecs, options) => { return createRepo(repoPath, (codeOrName) => codecs.getCodec(codeOrName), { root: new DatastoreLevel(repoPath, { - extension: '', prefix: '', version: 2 }), blocks: new BlockstoreDatastoreAdapter( new DatastoreLevel(`${repoPath}/blocks`, { - extension: '', prefix: '', version: 2 }) ), datastore: new DatastoreLevel(`${repoPath}/datastore`, { - extension: '', prefix: '', version: 2 }), keys: new DatastoreLevel(`${repoPath}/keys`, { - extension: '', prefix: '', version: 2 }), pins: new DatastoreLevel(`${repoPath}/pins`, { - extension: '', prefix: '', version: 2 })