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.

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

fix: upgrade datastores for node 10 #168

Merged
merged 7 commits into from
May 29, 2018
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 ci/Jenkinsfile
Original file line number Diff line number Diff line change
@@ -1 +1 @@
javascript()
javascript(['nodejs_versions': ['8.11.1','9.2.0','10.0.0']])
9 changes: 3 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"browser": {
"rimraf": false,
"datastore-fs": "datastore-level",
"leveldown": "level-js",
"./src/lock.js": "./src/lock-memory.js",
"./src/default-options.js": "./src/default-options-browser.js"
},
Expand Down Expand Up @@ -59,14 +58,12 @@
"big.js": "^5.0.3",
"cids": "~0.5.3",
"datastore-core": "~0.4.0",
"datastore-fs": "~0.4.2",
"datastore-level": "~0.7.0",
"datastore-fs": "~0.5.0",
"datastore-level": "~0.8.0",
"debug": "^3.1.0",
"interface-datastore": "~0.4.2",
"ipfs-block": "~0.7.1",
"level-js": "timkuijsten/level.js#idbunwrapper",
"leveldown": "^1.7.2",
"lock-me": "^1.0.3",
"lock-me": "^1.0.4",
"lodash.get": "^4.4.2",
"lodash.has": "^4.5.2",
"lodash.set": "^4.3.2",
Expand Down
10 changes: 2 additions & 8 deletions src/default-options-browser.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,19 +11,13 @@ module.exports = {
},
storageBackendOptions: {
root: {
db: require('level-js'),
extension: ''
},
blocks: {
sharding: false,
db: require('level-js')
sharding: false
},
keys: {
sharding: false,
db: require('level-js')
},
datastore: {
db: require('level-js')
sharding: false
}
}
}
3 changes: 3 additions & 0 deletions src/errors/index.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
'use strict'

exports.ERR_REPO_NOT_INITIALIZED = 'ERR_REPO_NOT_INITIALIZED'
11 changes: 7 additions & 4 deletions src/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ const config = require('./config')
const apiAddr = require('./api-addr')
const blockstore = require('./blockstore')
const defaultOptions = require('./default-options')
const ERRORS = require('./errors')

const log = debug('repo')

Expand Down Expand Up @@ -212,14 +213,14 @@ class IpfsRepo {
},
(err, res) => {
log('init', err, res)
if (err) {
if (err && !res.config) {
return callback(Object.assign(new Error('repo is not initialized yet'),
{
code: 'ERR_REPO_NOT_INITIALIZED',
code: ERRORS.ERR_REPO_NOT_INITIALIZED,
path: this.path
}))
}
callback()
callback(err)
}
)
}
Expand Down Expand Up @@ -355,7 +356,9 @@ function ignoringAlreadyOpened (cb) {
}

function ignoringNotFound (cb) {
return ignoringIf((err) => err.message.startsWith('ENOENT'), cb)
return ignoringIf((err) => {
return err && (err.code === ERRORS.ERR_REPO_NOT_INITIALIZED || err.message.startsWith('ENOENT'))
}, cb)
}

function buildOptions (_options) {
Expand Down
6 changes: 0 additions & 6 deletions test/options-test.js
Original file line number Diff line number Diff line change
Expand Up @@ -86,15 +86,9 @@ function expectedRepoOptions () {
}

if (process.browser) {
options.storageBackendOptions.root.db = require('leveldown')
options.storageBackendOptions.keys.db = require('leveldown')
options.storageBackendOptions.keys.sharding = false
options.storageBackendOptions.blocks.db = require('leveldown')
delete options.storageBackendOptions.blocks.extension
options.storageBackendOptions.blocks.sharding = false
options.storageBackendOptions.datastore = {
db: require('leveldown')
}
}
return options
}