fix: sharding utils for error handling

waku-org · Nov 27, 2023 · 85500d3 · 85500d3
1 parent 7fd07b2
commit 85500d3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/packages/tests/tests/light-push/multiple_pubsub.node.spec.ts b/packages/tests/tests/light-push/multiple_pubsub.node.spec.ts
@@ -26,7 +26,6 @@ describe("Waku Light Push : Multiple PubsubTopics", function () {
   let nwaku: NimGoNode;
   let nwaku2: NimGoNode;
   let messageCollector: MessageCollector;
-
   const customPubsubTopic1 = singleTopicShardInfoToPubsubTopic({
     cluster: 3,
     index: 1

diff --git a/packages/utils/src/common/sharding.ts b/packages/utils/src/common/sharding.ts
@@ -10,15 +10,16 @@ import { concat, utf8ToBytes } from "../bytes/index.js";
 export const singleTopicShardInfoToPubsubTopic = (
   shardInfo: SingleTopicShardInfo
 ): PubsubTopic => {
-  if (!shardInfo.cluster || !shardInfo.index) throw new Error("Invalid shard");
+  if (shardInfo.cluster === undefined || shardInfo.index === undefined)
+    throw new Error("Invalid shard");
 
   return `/waku/2/rs/${shardInfo.cluster}/${shardInfo.index}`;
 };
 
 export const shardInfoToPubsubTopics = (
   shardInfo: ShardInfo
 ): PubsubTopic[] => {
-  if (!shardInfo.cluster || !shardInfo.indexList)
+  if (shardInfo.cluster === undefined || shardInfo.indexList === undefined)
     throw new Error("Invalid shard");
 
   return shardInfo.indexList.map(
@@ -30,12 +31,13 @@ export const pubsubTopicToSingleTopicShardInfo = (
   pubsubTopics: PubsubTopic
 ): SingleTopicShardInfo => {
   const parts = pubsubTopics.split("/");
-  if (parts.length != 5) throw new Error("Invalid pubsub topic");
+  if (parts.length != 6) throw new Error("Invalid pubsub topic");
 
-  return {
-    cluster: parseInt(parts[3]),
-    index: parseInt(parts[4])
-  };
+  const cluster = parseInt(parts[4]);
+  const index = parseInt(parts[5]);
+  if (isNaN(cluster) || isNaN(index)) throw new Error("Invalid pubsub topic");
+
+  return { cluster, index };
 };
 
 export function ensurePubsubTopicIsConfigured(