From a50ae36b03dc7f13046acc082ed8c6d8301e8cdc Mon Sep 17 00:00:00 2001 From: Alan Shaw Date: Wed, 1 Jan 2020 23:10:30 +0000 Subject: [PATCH 1/2] chore: update multihashing-async dep @vasco-santos @jacobheun do you have any plans to add automated dependency updating? --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 911a421..18b7ad1 100644 --- a/package.json +++ b/package.json @@ -47,7 +47,7 @@ "buffer-split": "^1.0.0", "err-code": "^1.1.2", "multihashes": "~0.4.15", - "multihashing-async": "~0.7.0", + "multihashing-async": "^0.8.0", "protons": "^1.0.1" }, "contributors": [ From 87ed92043d5a5d9986ceba3d2be49f62faca2910 Mon Sep 17 00:00:00 2001 From: Vasco Santos Date: Thu, 2 Jan 2020 09:43:26 +0100 Subject: [PATCH 2/2] chore: updated remaining dependencies and fixed linting --- package.json | 6 +++--- src/selection.js | 10 +++++----- src/validator.js | 4 ++-- src/validators/public-key.js | 8 ++++---- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 18b7ad1..5e39a38 100644 --- a/package.json +++ b/package.json @@ -37,15 +37,15 @@ }, "homepage": "https://github.com/libp2p/js-libp2p-record", "devDependencies": { - "aegir": "^20.0.0", + "aegir": "^20.5.0", "chai": "^4.2.0", "dirty-chai": "^2.0.1", "libp2p-crypto": "~0.17.0", - "peer-id": "~0.13.2" + "peer-id": "~0.13.6" }, "dependencies": { "buffer-split": "^1.0.0", - "err-code": "^1.1.2", + "err-code": "^2.0.0", "multihashes": "~0.4.15", "multihashing-async": "^0.8.0", "protons": "^1.0.1" diff --git a/src/selection.js b/src/selection.js index b03b0af..93e18ab 100644 --- a/src/selection.js +++ b/src/selection.js @@ -13,17 +13,17 @@ const errcode = require('err-code') */ const bestRecord = (selectors, k, records) => { if (records.length === 0) { - const errMsg = `No records given` + const errMsg = 'No records given' - throw errcode(errMsg, 'ERR_NO_RECORDS_RECEIVED') + throw errcode(new Error(errMsg), 'ERR_NO_RECORDS_RECEIVED') } const parts = bsplit(k, Buffer.from('/')) if (parts.length < 3) { - const errMsg = `Record key does not have a selector function` + const errMsg = 'Record key does not have a selector function' - throw errcode(errMsg, 'ERR_NO_SELECTOR_FUNCTION_FOR_RECORD_KEY') + throw errcode(new Error(errMsg), 'ERR_NO_SELECTOR_FUNCTION_FOR_RECORD_KEY') } const selector = selectors[parts[1].toString()] @@ -31,7 +31,7 @@ const bestRecord = (selectors, k, records) => { if (!selector) { const errMsg = `Unrecognized key prefix: ${parts[1]}` - throw errcode(errMsg, 'ERR_UNRECOGNIZED_KEY_PREFIX') + throw errcode(new Error(errMsg), 'ERR_UNRECOGNIZED_KEY_PREFIX') } return selector(k, records) diff --git a/src/validator.js b/src/validator.js index 95ade5e..07d17e6 100644 --- a/src/validator.js +++ b/src/validator.js @@ -24,9 +24,9 @@ const verifyRecord = (validators, record) => { const validator = validators[parts[1].toString()] if (!validator) { - const errMsg = `Invalid record keytype` + const errMsg = 'Invalid record keytype' - throw errcode(errMsg, 'ERR_INVALID_RECORD_KEY_TYPE') + throw errcode(new Error(errMsg), 'ERR_INVALID_RECORD_KEY_TYPE') } return validator.func(key, record.value) diff --git a/src/validators/public-key.js b/src/validators/public-key.js index 95e2d41..1681944 100644 --- a/src/validators/public-key.js +++ b/src/validators/public-key.js @@ -15,17 +15,17 @@ const errcode = require('err-code') */ const validatePublicKeyRecord = async (key, publicKey) => { if (!Buffer.isBuffer(key)) { - throw errcode('"key" must be a Buffer', 'ERR_INVALID_RECORD_KEY_NOT_BUFFER') + throw errcode(new Error('"key" must be a Buffer'), 'ERR_INVALID_RECORD_KEY_NOT_BUFFER') } if (key.length < 5) { - throw errcode('invalid public key record', 'ERR_INVALID_RECORD_KEY_TOO_SHORT') + throw errcode(new Error('invalid public key record'), 'ERR_INVALID_RECORD_KEY_TOO_SHORT') } const prefix = key.slice(0, 4).toString() if (prefix !== '/pk/') { - throw errcode('key was not prefixed with /pk/', 'ERR_INVALID_RECORD_KEY_BAD_PREFIX') + throw errcode(new Error('key was not prefixed with /pk/'), 'ERR_INVALID_RECORD_KEY_BAD_PREFIX') } const keyhash = key.slice(4) @@ -33,7 +33,7 @@ const validatePublicKeyRecord = async (key, publicKey) => { const publicKeyHash = await multihashing(publicKey, 'sha2-256') if (!keyhash.equals(publicKeyHash)) { - throw errcode('public key does not match passed in key', 'ERR_INVALID_RECORD_HASH_MISMATCH') + throw errcode(new Error('public key does not match passed in key'), 'ERR_INVALID_RECORD_HASH_MISMATCH') } }