chore: normalize msg before emit

src/pubsub/index.js

@@ -576,12 +576,13 @@ class PubsubBaseProtocol extends EventEmitter {
       topicIDs: [topic]
     }
 
+    // ensure that any operations performed on the message will include the signature
+    const outMsg = await this._buildMessage(msgObject)
+    msgObject = utils.normalizeInRpcMessage(outMsg)
+
     // Emit to self if I'm interested and emitSelf enabled
     this.emitSelf && this._emitMessage(msgObject)
 
-    // ensure that any operations performed on the message will include the signature
-    msgObject = await this._buildMessage(msgObject)
-
     // send to all the other peers
     await this._publish(msgObject)
   }

src/pubsub/tests/messages.js

@@ -30,21 +30,25 @@ module.exports = (common) => {
       await common.teardown()
     })
 
-    it('should emit non normalized messages on publish', async () => {
+    it('should emit normalized signed messages on publish', async () => {
       sinon.spy(pubsub, '_emitMessage')
       sinon.spy(utils, 'randomSeqno')
 
       await pubsub.publish(topic, data)
       expect(pubsub._emitMessage.callCount).to.eql(1)
 
       const [messageToEmit] = pubsub._emitMessage.getCall(0).args
-      expect(messageToEmit).to.eql({
-        receivedFrom: pubsub.peerId.toB58String(),
-        from: pubsub.peerId.toB58String(),
-        data,
-        seqno: utils.randomSeqno.getCall(0).returnValue,
-        topicIDs: [topic]
-      })
+
+      const expected = utils.normalizeInRpcMessage(
+        await pubsub._buildMessage({
+          receivedFrom: pubsub.peerId.toB58String(),
+          from: pubsub.peerId.toB58String(),
+          data,
+          seqno: utils.randomSeqno.getCall(0).returnValue,
+          topicIDs: [topic]
+        }))
+
+      expect(messageToEmit).to.eql(expected)
     })
 
     it('should drop unsigned messages', async () => {