chore: apply suggestions from code review

Co-authored-by: Jacob Heun <[email protected]>

package.json

@@ -49,7 +49,7 @@
     "it-pair": "^1.0.0",
     "it-pipe": "^1.1.0",
     "it-pushable": "^1.4.0",
-    "libp2p-crypto": "^0.17.9",
+    "libp2p-crypto": "^0.18.0",
     "libp2p-tcp": "^0.15.0",
     "multiaddr": "^8.0.0",
     "multibase": "^3.0.0",

src/pubsub/README.md

@@ -120,7 +120,7 @@ Publish data message to pubsub topics.
 
 | Name | Type | Description |
 |------|------|-------------|
-| topics | `string` | pubsub topic |
+| topic | `string` | pubsub topic |
 | message | `Uint8Array` | message to publish |
 
 ##### Returns

src/pubsub/index.js

@@ -362,7 +362,7 @@ class PubsubBaseProtocol extends EventEmitter {
   }
 
   /**
-   * Handles an subscription change from a peer
+   * Handles a subscription change from a peer
    * @param {string} id
    * @param {RPC.SubOpt} subOpt
    */

src/pubsub/message/sign.js

@@ -63,12 +63,7 @@ async function verifySignature (message) {
  */
 async function messagePublicKey (message) {
   // should be available in the from property of the message (peer id)
-  let from
-  if (typeof message.from === 'string') {
-    from = PeerId.createFromB58String(message.from)
-  } else {
-    from = PeerId.createFromBytes(message.from)
-  }
+  const from = PeerId.createFromCID(message.from)
 
   if (message.key) {
     const keyPeerId = await PeerId.createFromPubKey(message.key)

src/pubsub/utils.js

@@ -1,7 +1,6 @@
 'use strict'
 
 const crypto = require('libp2p-crypto')
-const multibase = require('multibase')
 const uint8ArrayToString = require('uint8arrays/to-string')
 const uint8ArrayFromString = require('uint8arrays/from-string')
 
@@ -91,7 +90,7 @@ exports.normalizeInRpcMessage = (message, peerId) => {
 exports.normalizeOutRpcMessage = (message) => {
   const m = Object.assign({}, message)
   if (typeof message.from === 'string' || message.from instanceof String) {
-    m.from = multibase.decode('z' + message.from)
+    m.from = uint8ArrayFromString(message.from, 'base58btc')
   }
   if (typeof message.data === 'string' || message.data instanceof String) {
     m.data = uint8ArrayFromString(message.data)