From 59bd365c16fd40506c167e8dd7e439684ab4bd11 Mon Sep 17 00:00:00 2001
From: Ivan FB <128452529+Ivansete-status@users.noreply.github.com>
Date: Wed, 8 Apr 2026 15:33:16 +0200
Subject: [PATCH] setting num-shards-in-network to 0 by default (#3748)

Co-authored-by: darshankabariya <darshan@status.im>
---
 tests/wakunode2/test_cli_args.nim | 12 ++++++------
 tools/confutils/cli_args.nim      |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/tests/wakunode2/test_cli_args.nim b/tests/wakunode2/test_cli_args.nim
index 9197afe02..d08544c2c 100644
--- a/tests/wakunode2/test_cli_args.nim
+++ b/tests/wakunode2/test_cli_args.nim
@@ -23,9 +23,8 @@ import
 suite "Waku external config - default values":
   test "Default sharding value":
     ## Setup
-    let defaultShardingMode = AutoSharding
-    let defaultNumShardsInCluster = 1.uint16
-    let defaultSubscribeShards = @[0.uint16]
+    let defaultShardingMode = StaticSharding
+    let defaultSubscribeShards: seq[uint16] = @[]
 
     ## Given
     let preConfig = defaultWakuNodeConf().get()
@@ -37,7 +36,6 @@ suite "Waku external config - default values":
     ## Then
     let conf = res.get()
     check conf.shardingConf.kind == defaultShardingMode
-    check conf.shardingConf.numShardsInCluster == defaultNumShardsInCluster
     check conf.subscribeShards == defaultSubscribeShards
 
   test "Default shards value in static sharding":
@@ -212,7 +210,7 @@ suite "Waku external config - Shards":
     let vRes = wakuConf.validate()
     assert vRes.isOk(), $vRes.error
 
-  test "Imvalid shard is passed without num shards":
+  test "Any shard is valid without num shards in static sharding mode":
     ## Setup
 
     ## Given
@@ -222,7 +220,9 @@ suite "Waku external config - Shards":
     let res = wakuNodeConf.toWakuConf()
 
     ## Then
-    assert res.isErr(), "Invalid shard was accepted"
+    let wakuConf = res.get()
+    let vRes = wakuConf.validate()
+    assert vRes.isOk(), $vRes.error
 
 suite "Waku external config - store retention policy":
   test "Default retention policy":
diff --git a/tools/confutils/cli_args.nim b/tools/confutils/cli_args.nim
index 5c1934712..d63b5880c 100644
--- a/tools/confutils/cli_args.nim
+++ b/tools/confutils/cli_args.nim
@@ -331,7 +331,7 @@ hence would have reachability issues.""",
     numShardsInNetwork* {.
       desc:
         "Enables autosharding and set number of shards in the cluster, set to `0` to use static sharding",
-      defaultValue: 1,
+      defaultValue: 0,
       name: "num-shards-in-network"
     .}: uint16