refactor: apply async peer ID changes

From #2588 thanks to @lidel

Author: Alan Shaw

README.md

@@ -314,10 +314,9 @@ Instead of a boolean, you may provide an object with custom initialization optio
     ```js
     // Generating a Peer ID:
     const PeerId = require('peer-id')
-    PeerId.create({ bits: 2048 }, (err, peerId) => {
-      // Generates a new Peer ID, complete with public/private keypair
-      // See https://github.com/libp2p/js-peer-id
-    })
+    // Generates a new Peer ID, complete with public/private keypair
+    // See https://github.com/libp2p/js-peer-id
+    const peerId = await PeerId.create({ bits: 2048 })
     ```
 - `pass` (string) A passphrase to encrypt keys. You should generally use the [top-level `pass` option](#optionspass) instead of the `init.pass` option (this one will take its value from the top-level option if not set).
 - `profiles` (Array) Apply profile settings to config.

src/core/components/dht.js

@@ -98,7 +98,7 @@ module.exports = (self) => {
      */
     findPeer: callbackify(async (peer) => { // eslint-disable-line require-await
       if (typeof peer === 'string') {
-        peer = PeerId.createFromB58String(peer)
+        peer = PeerId.createFromCID(peer)
       }
 
       return self.libp2p.peerRouting.findPeer(peer)
@@ -160,7 +160,7 @@ module.exports = (self) => {
     query: callbackify(async (peerId) => {
       if (typeof peerId === 'string') {
         try {
-          peerId = PeerId.createFromB58String(peerId)
+          peerId = PeerId.createFromCID(peerId)
         } catch (err) {
           log.error(err)
 

src/core/components/init.js

@@ -4,7 +4,6 @@ const log = require('debug')('ipfs:components:init')
 const PeerId = require('peer-id')
 const PeerInfo = require('peer-info')
 const mergeOptions = require('merge-options')
-const promisify = require('promisify-es6')
 const getDefaultConfig = require('../runtime/config-nodejs.js')
 const createRepo = require('../runtime/repo-nodejs')
 const Keychain = require('libp2p-keychain')
@@ -72,7 +71,7 @@ module.exports = ({
 
     const { peerId, config, keychain } = isInitialized
       ? await initExistingRepo(repo, options)
-      : await initNewRepo(repo, options)
+      : await initNewRepo(repo, { ...options, print })
 
     log('peer created')
     const peerInfo = new PeerInfo(peerId)
@@ -242,7 +241,7 @@ async function initExistingRepo (repo, { config: newConfig, profiles, pass }) {
     log('keychain constructed')
   }
 
-  const peerId = await promisify(PeerId.createFromPrivKey)(config.Identity.PrivKey)
+  const peerId = await PeerId.createFromPrivKey(config.Identity.PrivKey)
 
   // Import the private key as 'self', if needed.
   if (pass) {
@@ -262,11 +261,11 @@ function createPeerId ({ privateKey, bits, print }) {
     log('using user-supplied private-key')
     return typeof privateKey === 'object'
       ? privateKey
-      : promisify(PeerId.createFromPrivKey)(Buffer.from(privateKey, 'base64'))
+      : PeerId.createFromPrivKey(Buffer.from(privateKey, 'base64'))
   } else {
     // Generate peer identity keypair + transform to desired format + add to config.
     print('generating %s-bit RSA keypair...', bits)
-    return promisify(PeerId.create)({ bits })
+    return PeerId.create({ bits })
   }
 }
 

src/core/index.js

@@ -42,7 +42,7 @@ async function create (options) {
   const apiManager = new ApiManager()
 
   const { api } = apiManager.update({
-    init: Components.init({ apiManager, print, constructorOptions: options }),
+    init: Components.init({ apiManager, print, options }),
     dns: Components.dns(),
     isOnline: Components.isOnline({})
   }, () => { throw new NotInitializedError() })

src/core/ipns/publisher.js

@@ -3,7 +3,6 @@
 const PeerId = require('peer-id')
 const { Key, Errors } = require('interface-datastore')
 const errcode = require('err-code')
-const promisify = require('promisify-es6')
 const debug = require('debug')
 const log = debug('ipfs:ipns:publisher')
 log.error = debug('ipfs:ipns:publisher:error')
@@ -26,7 +25,7 @@ class IpnsPublisher {
       throw errcode(new Error('invalid private key'), 'ERR_INVALID_PRIVATE_KEY')
     }
 
-    const peerId = await promisify(PeerId.createFromPrivKey)(privKey.bytes)
+    const peerId = await PeerId.createFromPrivKey(privKey.bytes)
     const record = await this._updateOrCreateRecord(privKey, value, lifetime, peerId)
 
     return this._putRecordToRouting(record, peerId)

src/core/ipns/republisher.js

@@ -4,7 +4,6 @@ const ipns = require('ipns')
 const crypto = require('libp2p-crypto')
 const PeerId = require('peer-id')
 const errcode = require('err-code')
-const promisify = require('promisify-es6')
 
 const debug = require('debug')
 const log = debug('ipfs:ipns:republisher')
@@ -132,7 +131,7 @@ class IpnsRepublisher {
     }
 
     try {
-      const peerId = await promisify(PeerId.createFromPrivKey)(privateKey.bytes)
+      const peerId = await PeerId.createFromPrivKey(privateKey.bytes)
       const value = await this._getPreviousValue(peerId)
       await this._publisher.publishWithEOL(privateKey, value, defaultRecordLifetime)
     } catch (err) {

src/core/ipns/resolver.js

@@ -4,8 +4,6 @@ const ipns = require('ipns')
 const crypto = require('libp2p-crypto')
 const PeerId = require('peer-id')
 const errcode = require('err-code')
-const CID = require('cids')
-
 const debug = require('debug')
 const log = debug('ipfs:ipns:resolver')
 log.error = debug('ipfs:ipns:resolver:error')
@@ -75,7 +73,7 @@ class IpnsResolver {
 
   // resolve ipns entries from the provided routing
   async _resolveName (name) {
-    const peerId = PeerId.createFromBytes(new CID(name).multihash) // TODO: change to `PeerId.createFromCID` when https://github.com/libp2p/js-peer-id/pull/105 lands and js-ipfs switched to async peer-id lib
+    const peerId = PeerId.createFromCID(name)
     const { routingKey } = ipns.getIdKeys(peerId.toBytes())
     let record
 

test/cli/bitswap.js

@@ -22,12 +22,9 @@ describe('bitswap', () => runOn((thing) => {
     ipfs('block get ' + key1).catch(() => {})
   })
 
-  before(function (done) {
-    PeerId.create({ bits: 512 }, (err, peer) => {
-      expect(err).to.not.exist()
-      peerId = peer.toB58String()
-      done()
-    })
+  before(async function () {
+    const peer = await PeerId.create({ bits: 512 })
+    peerId = peer.toB58String()
   })
 
   before(async () => {

test/cli/swarm.js

@@ -83,12 +83,9 @@ describe('swarm', () => {
     }
 
     describe('addrs', () => {
-      before((done) => {
-        PeerId.create({ bits: 512 }, (err, peerId) => {
-          if (err) return done(err)
-          peerInfo = new PeerInfo(peerId)
-          done()
-        })
+      before(async () => {
+        const peerId = await PeerId.create({ bits: 512 })
+        peerInfo = new PeerInfo(peerId)
       })
 
       it('should return addresses for all peers', (done) => {

test/core/interface.spec.js

@@ -32,6 +32,8 @@ describe('interface-ipfs-core tests', function () {
   }
   const commonFactory = createFactory(commonOptions, overrides)
 
+  tests.root(commonFactory)
+
   tests.bitswap(commonFactory)
 
   tests.block(commonFactory)

test/core/name-pubsub.js

@@ -6,12 +6,11 @@ const hat = require('hat')
 const { expect } = require('interface-ipfs-core/src/utils/mocha')
 const base64url = require('base64url')
 const { fromB58String } = require('multihashes')
-const peerId = require('peer-id')
+const PeerId = require('peer-id')
 const isNode = require('detect-node')
 const ipns = require('ipns')
 const waitFor = require('../utils/wait-for')
 const delay = require('delay')
-const promisify = require('promisify-es6')
 
 const factory = require('../utils/factory')
 
@@ -157,8 +156,8 @@ describe('name-pubsub', function () {
     await nodeB.pubsub.subscribe(topic, checkMessage)
     await nodeA.name.publish(ipfsRef, { resolve: false, key: testAccountName })
     await waitFor(alreadySubscribed)
-    const messageKey = await promisify(peerId.createFromPubKey)(publishedMessage.key)
-    const pubKeyPeerId = await promisify(peerId.createFromPubKey)(publishedMessageData.pubKey)
+    const messageKey = await PeerId.createFromPubKey(publishedMessage.key)
+    const pubKeyPeerId = await PeerId.createFromPubKey(publishedMessageData.pubKey)
 
     expect(pubKeyPeerId.toB58String()).not.to.equal(messageKey.toB58String())
     expect(pubKeyPeerId.toB58String()).to.equal(testAccount.id)