mirror/prysm-pulse
1
0
Fork 0
mirror of https://gitlab.com/pulsechaincom/prysm-pulse.git synced 2024-12-25 04:47:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove Unusued Base Parameter in SubscribeWithBase (#7608)

Browse Source 
* remove base in sub with base param

* refactor subscribeWithBase signature
This commit is contained in:
Raul Jordan 2020-10-22 11:56:24 -05:00 committed by GitHub
parent 7131cd991c
commit 13af8a7a37
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
beacon-chain/sync/subscriber.go
View File

@ -79,11 +79,10 @@ func (s *Service) subscribe(topic string, validator pubsub.ValidatorEx, handle s
if base == nil {
panic(fmt.Sprintf("%s is not mapped to any message in GossipTopicMappings", topic))
}
return s.subscribeWithBase(base, s.addDigestToTopic(topic), validator, handle)
return s.subscribeWithBase(s.addDigestToTopic(topic), validator, handle)
}
// TODO(7437): Refactor this method to remove unused arg "base".
func (s *Service) subscribeWithBase(base proto.Message, topic string, validator pubsub.ValidatorEx, handle subHandler) *pubsub.Subscription {
func (s *Service) subscribeWithBase(topic string, validator pubsub.ValidatorEx, handle subHandler) *pubsub.Subscription {
topic += s.p2p.Encoding().ProtocolSuffix()
log := log.WithField("topic", topic)
@ -190,7 +189,7 @@ func (s *Service) subscribeStaticWithSubnets(topic string, validator pubsub.Vali
panic(fmt.Sprintf("%s is not mapped to any message in GossipTopicMappings", topic))
}
for i := uint64(0); i < params.BeaconNetworkConfig().AttestationSubnetCount; i++ {
s.subscribeWithBase(base, s.addDigestAndIndexToTopic(topic, i), validator, handle)
s.subscribeWithBase(s.addDigestAndIndexToTopic(topic, i), validator, handle)
}
genesis := s.chain.GenesisTime()
ticker := slotutil.GetSlotTicker(genesis, params.BeaconConfig().SecondsPerSlot)
@ -268,7 +267,7 @@ func (s *Service) subscribeDynamicWithSubnets(
// subscribe desired aggregator subnets.
for _, idx := range wantedSubs {
s.subscribeAggregatorSubnet(subscriptions, idx, base, digest, validate, handle)
s.subscribeAggregatorSubnet(subscriptions, idx, digest, validate, handle)
}
// find desired subs for attesters
attesterSubs := s.attesterSubnetIndices(currentSlot)
@ -303,15 +302,20 @@ func (s *Service) reValidateSubscriptions(subscriptions map[uint64]*pubsub.Subsc
}
// subscribe missing subnets for our aggregators.
func (s *Service) subscribeAggregatorSubnet(subscriptions map[uint64]*pubsub.Subscription, idx uint64,
base proto.Message, digest [4]byte, validate pubsub.ValidatorEx, handle subHandler) {
func (s *Service) subscribeAggregatorSubnet(
subscriptions map[uint64]*pubsub.Subscription,
idx uint64,
digest [4]byte,
validate pubsub.ValidatorEx,
handle subHandler,
) {
// do not subscribe if we have no peers in the same
// subnet
topic := p2p.GossipTypeMapping[reflect.TypeOf(&pb.Attestation{})]
subnetTopic := fmt.Sprintf(topic, digest, idx)
// check if subscription exists and if not subscribe the relevant subnet.
if _, exists := subscriptions[idx]; !exists {
subscriptions[idx] = s.subscribeWithBase(base, subnetTopic, validate, handle)
subscriptions[idx] = s.subscribeWithBase(subnetTopic, validate, handle)
}
if !s.validPeersExist(subnetTopic, idx) {
log.Debugf("No peers found subscribed to attestation gossip subnet with "+