From fd1ae50830a6f9d6adce3924ce90bf5b48eda3f6 Mon Sep 17 00:00:00 2001
From: Agnish Ghosh <iamagnix@gmail.com>
Date: Thu, 22 Aug 2024 16:04:15 +0530
Subject: [PATCH] revert to initially subscribing to all subnets

---
 beacon_chain/gossip_processing/block_processor.nim | 2 +-
 beacon_chain/nimbus_beacon_node.nim                | 8 +-------
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/beacon_chain/gossip_processing/block_processor.nim b/beacon_chain/gossip_processing/block_processor.nim
index 29800431d..755d4aa23 100644
--- a/beacon_chain/gossip_processing/block_processor.nim
+++ b/beacon_chain/gossip_processing/block_processor.nim
@@ -220,7 +220,7 @@ proc storeBackfillBlock(
         for i in 0..<data_columns.len:
           let r = verify_data_column_sidecar_kzg_proofs(data_columns[i][])
           if r.isErr():
-            debug "backfill datacolumn validation failed",
+            debug "backfill data column validation failed",
               blockRoot = shortLog(signedBlock.root),
               blck = shortLog(signedBlock.message),
               signature = shortLog(signedBlock.signature),
diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index f01864094..de976aa71 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -2041,13 +2041,7 @@ proc installMessageValidators(node: BeaconNode) =
 
         # data_column_sidecar_{subnet_id}
         #
-        let subnetCount = 
-          if node.config.subscribeAllSubnets:
-            DATA_COLUMN_SIDECAR_SUBNET_COUNT.uint64
-          else:
-            CUSTODY_REQUIREMENT.uint64
-
-        for it in 0'u64 ..< subnetCount:
+        for it in 0'u64 ..< DATA_COLUMN_SIDECAR_SUBNET_COUNT:
           closureScope:  # Needed for inner `proc`; don't lift it out of loop.
             let subnet_id = it
             node.network.addValidator(