fix: add validate function and more

Author: hugomrdias

package.json

@@ -35,17 +35,18 @@
   },
   "dependencies": {
     "blakejs": "^1.1.0",
+    "buffer": "^5.2.1",
     "err-code": "^1.1.2",
     "js-sha3": "~0.8.0",
     "multihashes": "~0.4.13",
     "murmurhash3js-revisited": "^3.0.0"
   },
   "devDependencies": {
-    "sinon": "^7.2.7",
-    "aegir": "^18.0.3",
+    "aegir": "^18.2.2",
     "benchmark": "^2.1.4",
     "chai": "^4.1.2",
-    "dirty-chai": "^2.0.1"
+    "dirty-chai": "^2.0.1",
+    "sinon": "^7.2.7"
   },
   "engines": {
     "node": ">=6.0.0",

src/blake.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const blake = require('blakejs')
 
 const minB = 0xb201

src/crypto.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const sha3 = require('js-sha3')
 const mur = require('murmurhash3js-revisited')
 const sha = require('./sha')

src/index.js

@@ -1,5 +1,6 @@
 'use strict'
 
+const { Buffer } = require('buffer')
 const errcode = require('err-code')
 const multihash = require('multihashes')
 const crypto = require('./crypto')
@@ -102,11 +103,10 @@ Multihashing.functions = {
 // add blake functions
 crypto.addBlake(Multihashing.functions)
 
-Multihashing.validate = (data, hash, callback) => {
-  let algo = multihash.decode(hash).name
-  Multihashing(data, algo, (err, newHash) => {
-    if (err) return callback(err)
-    callback(err, Buffer.compare(hash, newHash) === 0)
-  })
+Multihashing.validate = async (buf, hash) => {
+  const newHash = await Multihashing(buf, multihash.decode(hash).name)
+
+  return Buffer.compare(hash, newHash) === 0
 }
+
 module.exports = Multihashing

src/sha.browser.js

@@ -1,4 +1,7 @@
 'use strict'
+
+const { Buffer } = require('buffer')
+
 const crypto = self.crypto || self.msCrypto
 
 module.exports = (algorithm) => {
@@ -21,7 +24,7 @@ module.exports = (algorithm) => {
         return Buffer.from(await crypto.subtle.digest({ name: 'SHA-256' }, d))
       }
       default:
-        throw new TypeError(`${algorithm} is not a supported algorithm`)
+        throw new Error(`${algorithm} is not a supported algorithm`)
     }
   }
 }

src/sha.js

@@ -17,6 +17,6 @@ module.exports = (algorithm) => async (data) => {
       return crypto.createHash('sha256').update(first).digest()
     }
     default:
-      throw new TypeError(`${algorithm} is not a supported algorithm`)
+      throw new Error(`${algorithm} is not a supported algorithm`)
   }
 }

src/utils.js

@@ -1,5 +1,7 @@
 'use strict'
 
+const { Buffer } = require('buffer')
+
 const fromNumberTo32BitBuf = (number) => {
   const bytes = new Array(4)
 

test/index.spec.js

@@ -1,6 +1,7 @@
 /* eslint-env mocha */
 'use strict'
 
+const { Buffer } = require('buffer')
 const chai = require('chai')
 const dirtyChai = require('dirty-chai')
 chai.use(dirtyChai)
@@ -43,26 +44,17 @@ describe('multihashing', () => {
 })
 
 describe('validate', () => {
-  it('true on pass', done => {
-    multihashing(Buffer.from('test'), 'sha2-256', (err, hash) => {
-      if (err) throw done(err)
-      multihashing.validate(Buffer.from('test'), hash, (err, bool) => {
-        if (err) throw done(err)
-        expect(bool).to.eql(true)
-        done()
-      })
-    })
+  it('true on pass', async () => {
+    const hash = await multihashing(Buffer.from('test'), 'sha2-256')
+    const validation = await multihashing.validate(Buffer.from('test'), hash)
+
+    return expect(validation).to.eql(true)
   })
 
-  it('false on fail', done => {
-    multihashing(Buffer.from('test'), 'sha2-256', (err, hash) => {
-      if (err) throw done(err)
-      multihashing.validate(Buffer.from('test-fail'), hash, (err, bool) => {
-        if (err) throw done(err)
-        expect(bool).to.eql(false)
-        done()
-      })
-    })
+  it('false on fail', async () => {
+    const hash = await multihashing(Buffer.from('test'), 'sha2-256')
+    const validation = await multihashing.validate(Buffer.from('test-fail'), hash)
+    return expect(validation).to.eql(false)
   })
 })