revert back GossipTopics changes

StefanBratanov · Jul 3, 2023 · e3f1443 · e3f1443
1 parent 9c87726
commit e3f1443
Showing 1 changed file with 5 additions and 9 deletions.
diff --git a/...king/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/topics/GossipTopics.java b/...king/eth2/src/main/java/tech/pegasys/teku/networking/eth2/gossip/topics/GossipTopics.java
@@ -18,7 +18,6 @@
 import tech.pegasys.teku.infrastructure.bytes.Bytes4;
 import tech.pegasys.teku.networking.eth2.gossip.encoding.GossipEncoding;
 import tech.pegasys.teku.spec.Spec;
-import tech.pegasys.teku.spec.config.NetworkingSpecConfigDeneb;
 import tech.pegasys.teku.spec.constants.NetworkConstants;
 
 /**
@@ -74,14 +73,11 @@ public static Set<String> getAllTopics(
  for (int i = 0; i < NetworkConstants.SYNC_COMMITTEE_SUBNET_COUNT; i++) {
  topics.add(getSyncCommitteeSubnetTopic(forkDigest, i, gossipEncoding));
  }
- spec.getNetworkingConfigDeneb()
- .map(NetworkingSpecConfigDeneb::getBlobSidecarSubnetCount)
- .ifPresent(
- blobSidecarSubnetCount -> {
- for (int i = 0; i < blobSidecarSubnetCount; i++) {
- topics.add(getBlobSidecarSubnetTopic(forkDigest, i, gossipEncoding));
- }
- });
+ if (spec.getNetworkingConfigDeneb().isPresent()) {
+ for (int i = 0; i < spec.getNetworkingConfigDeneb().get().getBlobSidecarSubnetCount(); i++) {
+ topics.add(getBlobSidecarSubnetTopic(forkDigest, i, gossipEncoding));
+ }
+ }
  for (GossipTopicName topicName : GossipTopicName.values()) {
  topics.add(GossipTopics.getTopic(forkDigest, topicName, gossipEncoding));
  }