From e0fb5d95a6f84bc7ea045602eab8d82b2bfd6115 Mon Sep 17 00:00:00 2001
From: tersec <tersec@users.noreply.github.com>
Date: Fri, 4 Feb 2022 12:34:03 +0000
Subject: [PATCH] remove --subscribe-all{att,sync}nets (#3359)

---
 beacon_chain/conf.nim               | 15 +++------------
 beacon_chain/nimbus_beacon_node.nim |  5 ++---
 2 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/beacon_chain/conf.nim b/beacon_chain/conf.nim
index 2e2f93324..0aba0a70a 100644
--- a/beacon_chain/conf.nim
+++ b/beacon_chain/conf.nim
@@ -160,19 +160,9 @@ type
       desc: "Node agent string which is used as identifier in network"
       name: "agent-string" }: string
 
-    subscribeAllAttnets* {.
-      defaultValue: false,
-      desc: "Subscribe to all attestation subnet topics when gossiping"
-      name: "subscribe-all-attnets" }: bool
-
-    subscribeAllSyncnets* {.
-      defaultValue: false,
-      desc: "Subscribe to all sync subnet topics when gossiping"
-      name: "subscribe-all-syncnets" }: bool
-
     subscribeAllSubnets* {.
       defaultValue: false,
-      desc: "Subscribe to all subnet topics when gossiping; implies subscribe-all-attnets and subscribe-all-syncnets"
+      desc: "Subscribe to all subnet topics when gossiping"
       name: "subscribe-all-subnets" }: bool
 
     slashingDbKind* {.
@@ -262,7 +252,8 @@ type
         name: "graffiti" }: Option[GraffitiBytes]
 
       verifyFinalization* {.
-        desc: "Specify whether to verify finalization occurs on schedule, for testing"
+        hidden
+        desc: "Specify whether to verify finalization occurs on schedule (debug only)"
         defaultValue: false
         name: "verify-finalization" }: bool
 
diff --git a/beacon_chain/nimbus_beacon_node.nim b/beacon_chain/nimbus_beacon_node.nim
index f9754d8ee..3c2faec4f 100644
--- a/beacon_chain/nimbus_beacon_node.nim
+++ b/beacon_chain/nimbus_beacon_node.nim
@@ -543,8 +543,7 @@ proc init*(T: type BeaconNode,
     requestManager: RequestManager.init(network, blockVerifier),
     syncManager: syncManager,
     backfiller: backfiller,
-    actionTracker: ActionTracker.init(
-      rng, config.subscribeAllAttnets or config.subscribeAllSubnets),
+    actionTracker: ActionTracker.init(rng, config.subscribeAllSubnets),
     processor: processor,
     blockProcessor: blockProcessor,
     consensusManager: consensusManager,
@@ -725,7 +724,7 @@ proc removePhase0MessageHandlers(node: BeaconNode, forkDigest: ForkDigest) =
 
 func hasSyncPubKey(node: BeaconNode, epoch: Epoch): auto =
   # Only used to determine which gossip topics to which to subscribe
-  if node.config.subscribeAllSubnets or node.config.subscribeAllSyncnets:
+  if node.config.subscribeAllSubnets:
     (func(pubkey: ValidatorPubKey): bool {.closure.} = true)
   else:
     (func(pubkey: ValidatorPubKey): bool =