Add default impl for getFastMsgIdStr()

ChainSafe · Jan 11, 2022 · dfc2628 · dfc2628
1 parent 42b14e9
commit dfc2628
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/ts/index.ts b/ts/index.ts
@@ -93,7 +93,7 @@ interface AcceptFromWhitelistEntry {
   acceptUntil: number
 }
 
-type FastMsgIdFn = (msg: InMessage) => string;
+type FastMsgIdFn = (msg: InMessage) => Promise<string>;
 
 class Gossipsub extends Pubsub {
   peers: Map<string, PeerStreams>
@@ -112,7 +112,6 @@ class Gossipsub extends Pubsub {
   backoff: Map<string, Map<string, number>>
   outbound: Map<string, boolean>
   defaultMsgIdFn: MessageIdFunction
-  _msgIdFn: MessageIdFunction
   getFastMsgIdStr: FastMsgIdFn
   messageCache: MessageCache
   score: PeerScore
@@ -152,7 +151,7 @@ class Gossipsub extends Pubsub {
    */
   constructor (
     libp2p: Libp2p,
-    options: Partial<GossipInputOptions> & Pick<GossipInputOptions, 'fastMsgIdFn'>
+    options: Partial<GossipInputOptions>
   ) {
     const multicodecs = [constants.GossipsubIDv11, constants.GossipsubIDv10]
     const opts = {
@@ -295,7 +294,11 @@ class Gossipsub extends Pubsub {
     /**
      * A fast message id function which return a string from InMessage
      */
-    this.getFastMsgIdStr = options.fastMsgIdFn
+    if (options.fastMsgIdFn) {
+      this.getFastMsgIdStr = options.fastMsgIdFn
+    } else {
+      this.getFastMsgIdStr = async (msg: InMessage): Promise<string> => messageIdToString(await this.getMsgId(msg))
+    }
 
     /**
      * A heartbeat timer that maintains the mesh
@@ -462,7 +465,7 @@ class Gossipsub extends Pubsub {
    * @returns {Promise<void>}
    */
   async _processRpcMessage (msg: InMessage): Promise<void> {
-    const fastMsgIdStr = this.getFastMsgIdStr(msg)
+    const fastMsgIdStr = await this.getFastMsgIdStr(msg)
 
     // Ignore if we've already seen the message
     let canonicalMsgIdStr = this.fastMsgIdCache.get(fastMsgIdStr)
@@ -1102,7 +1105,7 @@ class Gossipsub extends Pubsub {
    * @param {InMessage} msg
    */
   async getCanonicalMsgIdStr (msg: InMessage): Promise<string> {
-    return this.getCachedMsgIdStr(msg) ?? this.fastMsgIdCache.get(this.getFastMsgIdStr(msg)) ?? messageIdToString(await this.getMsgId(msg))
+    return this.getCachedMsgIdStr(msg) ?? this.fastMsgIdCache.get(await this.getFastMsgIdStr(msg)) ?? messageIdToString(await this.getMsgId(msg))
   }
 
   /**