fix: Imports key-composer for tree shaking and silences lint errors

libp2p · Apr 23, 2019 · ac3b044 · ac3b044
1 parent aa11916
commit ac3b044
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/index.js b/src/index.js
@@ -2,7 +2,7 @@
 
 const bs58 = require('bs58')
 const multihashing = require('multihashing-async')
-const keyComposer = require('crypto-key-composer')
+const { composePrivateKey, decomposePrivateKey } = require('crypto-key-composer')
 
 module.exports = (keysProtobuf, randomBytes, crypto) => {
   crypto = crypto || require('./crypto')(randomBytes)
@@ -118,7 +118,7 @@ module.exports = (keysProtobuf, randomBytes, crypto) => {
       const decompressedPublicKey = typedArrayToUint8Array(crypto.decompressPublicKey(this.public._key))
       try {
         if (format === 'pkcs-8') {
-          pem = keyComposer.composePrivateKey({
+          pem = composePrivateKey({
             format: 'pkcs8-pem',
             keyAlgorithm: {
               id: 'ec-public-key',
@@ -183,7 +183,7 @@ module.exports = (keysProtobuf, randomBytes, crypto) => {
   function importPEM (pem, password, callback) {
     let privkey
     try {
-      const decomposedPrivateKey = keyComposer.decomposePrivateKey(pem, { password })
+      const decomposedPrivateKey = decomposePrivateKey(pem, { password })
       privkey = new Secp256k1PrivateKey(Buffer.from(decomposedPrivateKey.keyData.d))
     } catch (err) { return callback(err) }
 

diff --git a/test/secp256k1.spec.js b/test/secp256k1.spec.js
@@ -141,6 +141,7 @@ describe('secp256k1 keys', () => {
     })
   })
 
+  /* eslint-disable */
   describe('import and export', () => {
     it('password protected PKCS #8', (done) => {
       key.export('pkcs-8', 'my secret', (err, pem) => {
@@ -178,6 +179,7 @@ describe('secp256k1 keys', () => {
       })
     })
   })
+  /* eslint-enable */
 })
 
 describe('key generation error', () => {