fix: use latest multihashing-async as it is all promises now

.gitignore

@@ -33,4 +33,5 @@ node_modules
 
 dist
 package-lock.json
-yarn.lock
+yarn.lock
+.vscode

package.json

@@ -28,13 +28,13 @@
   "license": "MIT",
   "dependencies": {
     "bs58": "^4.0.1",
-    "multihashing-async": "~0.6.0",
+    "multihashing-async": "^0.7.0",
     "nodeify": "^1.0.1",
     "safe-buffer": "^5.1.2",
     "secp256k1": "^3.6.2"
   },
   "devDependencies": {
-    "aegir": "^18.2.2",
+    "aegir": "^19.0.5",
     "benchmark": "^2.1.4",
     "chai": "^4.2.0",
     "dirty-chai": "^2.0.1",
@@ -61,4 +61,4 @@
     "Yusef Napora <[email protected]>",
     "dignifiedquire <[email protected]>"
   ]
-}
+}

src/crypto.js

@@ -8,7 +8,7 @@ const HASH_ALGORITHM = 'sha2-256'
 module.exports = (randomBytes) => {
   const privateKeyLength = 32
 
-  async function generateKey () {
+  function generateKey () {
     let privateKey
     do {
       privateKey = randomBytes(32)
@@ -17,23 +17,13 @@ module.exports = (randomBytes) => {
   }
 
   async function hashAndSign (key, msg) {
-    const digest = await new Promise((resolve, reject) => {
-      multihashing.digest(msg, HASH_ALGORITHM, (err, digest) => {
-        if (err) return reject(err)
-        resolve(digest)
-      })
-    })
+    const digest = await multihashing.digest(msg, HASH_ALGORITHM)
     const sig = secp256k1.sign(digest, key)
     return secp256k1.signatureExport(sig.signature)
   }
 
   async function hashAndVerify (key, sig, msg) {
-    const digest = await new Promise((resolve, reject) => {
-      multihashing.digest(msg, HASH_ALGORITHM, (err, digest) => {
-        if (err) return reject(err)
-        resolve(digest)
-      })
-    })
+    const digest = await multihashing.digest(msg, HASH_ALGORITHM)
     sig = secp256k1.signatureImport(sig)
     return secp256k1.verify(digest, sig, key)
   }

src/index.js

@@ -12,7 +12,7 @@ module.exports = (keysProtobuf, randomBytes, crypto) => {
       this._key = key
     }
 
-    async verify (data, sig) {
+    verify (data, sig) {
       return crypto.hashAndVerify(this._key, sig, data)
     }
 
@@ -31,13 +31,8 @@ module.exports = (keysProtobuf, randomBytes, crypto) => {
       return this.bytes.equals(key.bytes)
     }
 
-    async hash () {
-      return new Promise((resolve, reject) => {
-        multihashing(this.bytes, 'sha2-256', (err, res) => {
-          if (err) return reject(err)
-          resolve(res)
-        })
-      })
+    hash () {
+      return multihashing(this.bytes, 'sha2-256')
     }
   }
 
@@ -49,7 +44,7 @@ module.exports = (keysProtobuf, randomBytes, crypto) => {
       crypto.validatePublicKey(this._publicKey)
     }
 
-    async sign (message) {
+    sign (message) {
       return crypto.hashAndSign(this._key, message)
     }
 
@@ -72,13 +67,8 @@ module.exports = (keysProtobuf, randomBytes, crypto) => {
       return this.bytes.equals(key.bytes)
     }
 
-    async hash () {
-      return new Promise((resolve, reject) => {
-        multihashing(this.bytes, 'sha2-256', (err, res) => {
-          if (err) return reject(err)
-          resolve(res)
-        })
-      })
+    hash () {
+      return multihashing(this.bytes, 'sha2-256')
     }
 
     /**
@@ -91,17 +81,14 @@ module.exports = (keysProtobuf, randomBytes, crypto) => {
      * @param {function(Error, id)} callback
      * @returns {undefined}
      */
-    id (callback) {
-      this.public.hash((err, hash) => {
-        if (err) {
-          return callback(err)
-        }
-        callback(null, bs58.encode(hash))
-      })
+    async id () {
+      const hash = await this.public.hash()
+
+      return bs58.encode(hash)
     }
   }
 
-  async function unmarshalSecp256k1PrivateKey (bytes) {
+  function unmarshalSecp256k1PrivateKey (bytes) {
     return new Secp256k1PrivateKey(bytes)
   }
 

test/secp256k1.spec.js

@@ -57,13 +57,10 @@ describe('secp256k1 keys', () => {
     expect(pkMarshal).to.eql(pkMarshal2)
   })
 
-  it('key id', (done) => {
-    key.id((err, id) => {
-      expect(err).to.not.exist()
-      expect(id).to.exist()
-      expect(id).to.be.a('string')
-      done()
-    })
+  it('key id', async () => {
+    const id = await key.id()
+    expect(id).to.exist()
+    expect(id).to.be.a('string')
   })
 
   describe('key equals', () => {
@@ -103,7 +100,7 @@ describe('key generation error', () => {
 
   before(() => {
     generateKey = crypto.generateKey
-    crypto.generateKey = async () => { throw new Error('Error generating key') }
+    crypto.generateKey = () => { throw new Error('Error generating key') }
     secp256k1 = require('../src')(keysPBM, randomBytes, crypto)
   })
 
@@ -127,7 +124,7 @@ describe('handles generation of invalid key', () => {
 
   before(() => {
     generateKey = crypto.generateKey
-    crypto.generateKey = async () => Buffer.from('not a real key')
+    crypto.generateKey = () => Buffer.from('not a real key')
     secp256k1 = require('../src')(keysPBM, randomBytes, crypto)
   })