From e01298bd08639837ed72b021fe43afc668977d9a Mon Sep 17 00:00:00 2001 From: Nishant Das Date: Fri, 12 Nov 2021 23:28:21 +0800 Subject: [PATCH] Remove Superflous Errors From Parameter Registration (#9894) --- beacon-chain/p2p/gossip_scoring_params.go | 50 +++++++++---------- .../p2p/gossip_scoring_params_test.go | 6 +-- 2 files changed, 27 insertions(+), 29 deletions(-) diff --git a/beacon-chain/p2p/gossip_scoring_params.go b/beacon-chain/p2p/gossip_scoring_params.go index b2c510ead..8ce3e692f 100644 --- a/beacon-chain/p2p/gossip_scoring_params.go +++ b/beacon-chain/p2p/gossip_scoring_params.go @@ -103,13 +103,13 @@ func (s *Service) topicScoreParams(topic string) (*pubsub.TopicScoreParams, erro case strings.Contains(topic, GossipBlockMessage): return defaultBlockTopicParams(), nil case strings.Contains(topic, GossipAggregateAndProofMessage): - return defaultAggregateTopicParams(activeValidators) + return defaultAggregateTopicParams(activeValidators), nil case strings.Contains(topic, GossipAttestationMessage): - return defaultAggregateSubnetTopicParams(activeValidators) + return defaultAggregateSubnetTopicParams(activeValidators), nil case strings.Contains(topic, GossipSyncCommitteeMessage): - return defaultSyncSubnetTopicParams(activeValidators) + return defaultSyncSubnetTopicParams(activeValidators), nil case strings.Contains(topic, GossipContributionAndProofMessage): - return defaultSyncContributionTopicParams() + return defaultSyncContributionTopicParams(), nil case strings.Contains(topic, GossipExitMessage): return defaultVoluntaryExitTopicParams(), nil case strings.Contains(topic, GossipProposerSlashingMessage): @@ -191,19 +191,19 @@ func defaultBlockTopicParams() *pubsub.TopicScoreParams { } } -func defaultAggregateTopicParams(activeValidators uint64) (*pubsub.TopicScoreParams, error) { +func defaultAggregateTopicParams(activeValidators uint64) *pubsub.TopicScoreParams { // Determine the expected message rate for the particular gossip topic. aggPerSlot := aggregatorsPerSlot(activeValidators) firstMessageCap, err := decayLimit(scoreDecay(1*oneEpochDuration()), float64(aggPerSlot*2/gossipSubD)) if err != nil { log.Warnf("skipping initializing topic scoring: %v", err) - return nil, nil + return nil } firstMessageWeight := maxFirstDeliveryScore / firstMessageCap meshThreshold, err := decayThreshold(scoreDecay(1*oneEpochDuration()), float64(aggPerSlot)/dampeningFactor) if err != nil { log.Warnf("skipping initializing topic scoring: %v", err) - return nil, nil + return nil } meshWeight := -scoreByWeight(aggregateWeight, meshThreshold) meshCap := 4 * meshThreshold @@ -230,22 +230,22 @@ func defaultAggregateTopicParams(activeValidators uint64) (*pubsub.TopicScorePar MeshFailurePenaltyDecay: scoreDecay(1 * oneEpochDuration()), InvalidMessageDeliveriesWeight: -maxScore() / aggregateWeight, InvalidMessageDeliveriesDecay: scoreDecay(invalidDecayPeriod), - }, nil + } } -func defaultSyncContributionTopicParams() (*pubsub.TopicScoreParams, error) { +func defaultSyncContributionTopicParams() *pubsub.TopicScoreParams { // Determine the expected message rate for the particular gossip topic. aggPerSlot := params.BeaconConfig().SyncCommitteeSubnetCount * params.BeaconConfig().TargetAggregatorsPerSyncSubcommittee firstMessageCap, err := decayLimit(scoreDecay(1*oneEpochDuration()), float64(aggPerSlot*2/gossipSubD)) if err != nil { log.Warnf("skipping initializing topic scoring: %v", err) - return nil, nil + return nil } firstMessageWeight := maxFirstDeliveryScore / firstMessageCap meshThreshold, err := decayThreshold(scoreDecay(1*oneEpochDuration()), float64(aggPerSlot)/dampeningFactor) if err != nil { log.Warnf("skipping initializing topic scoring: %v", err) - return nil, nil + return nil } meshWeight := -scoreByWeight(syncContributionWeight, meshThreshold) meshCap := 4 * meshThreshold @@ -272,23 +272,23 @@ func defaultSyncContributionTopicParams() (*pubsub.TopicScoreParams, error) { MeshFailurePenaltyDecay: scoreDecay(1 * oneEpochDuration()), InvalidMessageDeliveriesWeight: -maxScore() / syncContributionWeight, InvalidMessageDeliveriesDecay: scoreDecay(invalidDecayPeriod), - }, nil + } } -func defaultAggregateSubnetTopicParams(activeValidators uint64) (*pubsub.TopicScoreParams, error) { +func defaultAggregateSubnetTopicParams(activeValidators uint64) *pubsub.TopicScoreParams { subnetCount := params.BeaconNetworkConfig().AttestationSubnetCount // Get weight for each specific subnet. topicWeight := attestationTotalWeight / float64(subnetCount) subnetWeight := activeValidators / subnetCount if subnetWeight == 0 { log.Warn("Subnet weight is 0, skipping initializing topic scoring") - return nil, nil + return nil } // Determine the amount of validators expected in a subnet in a single slot. numPerSlot := time.Duration(subnetWeight / uint64(params.BeaconConfig().SlotsPerEpoch)) if numPerSlot == 0 { log.Warn("numPerSlot is 0, skipping initializing topic scoring") - return nil, nil + return nil } comsPerSlot := committeeCountPerSlot(activeValidators) exceedsThreshold := comsPerSlot >= 2*subnetCount/uint64(params.BeaconConfig().SlotsPerEpoch) @@ -301,20 +301,20 @@ func defaultAggregateSubnetTopicParams(activeValidators uint64) (*pubsub.TopicSc rate := numPerSlot * 2 / gossipSubD if rate == 0 { log.Warn("rate is 0, skipping initializing topic scoring") - return nil, nil + return nil } // Determine expected first deliveries based on the message rate. firstMessageCap, err := decayLimit(scoreDecay(firstDecay*oneEpochDuration()), float64(rate)) if err != nil { log.Warnf("skipping initializing topic scoring: %v", err) - return nil, nil + return nil } firstMessageWeight := maxFirstDeliveryScore / firstMessageCap // Determine expected mesh deliveries based on message rate applied with a dampening factor. meshThreshold, err := decayThreshold(scoreDecay(meshDecay*oneEpochDuration()), float64(numPerSlot)/dampeningFactor) if err != nil { log.Warnf("skipping initializing topic scoring: %v", err) - return nil, nil + return nil } meshWeight := -scoreByWeight(topicWeight, meshThreshold) meshCap := 4 * meshThreshold @@ -341,10 +341,10 @@ func defaultAggregateSubnetTopicParams(activeValidators uint64) (*pubsub.TopicSc MeshFailurePenaltyDecay: scoreDecay(meshDecay * oneEpochDuration()), InvalidMessageDeliveriesWeight: -maxScore() / topicWeight, InvalidMessageDeliveriesDecay: scoreDecay(invalidDecayPeriod), - }, nil + } } -func defaultSyncSubnetTopicParams(activeValidators uint64) (*pubsub.TopicScoreParams, error) { +func defaultSyncSubnetTopicParams(activeValidators uint64) *pubsub.TopicScoreParams { subnetCount := params.BeaconConfig().SyncCommitteeSubnetCount // Get weight for each specific subnet. topicWeight := syncCommitteesTotalWeight / float64(subnetCount) @@ -356,7 +356,7 @@ func defaultSyncSubnetTopicParams(activeValidators uint64) (*pubsub.TopicScorePa subnetWeight := activeValidators / subnetCount if subnetWeight == 0 { log.Warn("Subnet weight is 0, skipping initializing topic scoring") - return nil, nil + return nil } firstDecay := time.Duration(1) meshDecay := time.Duration(4) @@ -364,20 +364,20 @@ func defaultSyncSubnetTopicParams(activeValidators uint64) (*pubsub.TopicScorePa rate := subnetWeight * 2 / gossipSubD if rate == 0 { log.Warn("rate is 0, skipping initializing topic scoring") - return nil, nil + return nil } // Determine expected first deliveries based on the message rate. firstMessageCap, err := decayLimit(scoreDecay(firstDecay*oneEpochDuration()), float64(rate)) if err != nil { log.WithError(err).Warn("Skipping initializing topic scoring") - return nil, nil + return nil } firstMessageWeight := maxFirstDeliveryScore / firstMessageCap // Determine expected mesh deliveries based on message rate applied with a dampening factor. meshThreshold, err := decayThreshold(scoreDecay(meshDecay*oneEpochDuration()), float64(subnetWeight)/dampeningFactor) if err != nil { log.WithError(err).Warn("Skipping initializing topic scoring") - return nil, nil + return nil } meshWeight := -scoreByWeight(topicWeight, meshThreshold) meshCap := 4 * meshThreshold @@ -404,7 +404,7 @@ func defaultSyncSubnetTopicParams(activeValidators uint64) (*pubsub.TopicScorePa MeshFailurePenaltyDecay: scoreDecay(meshDecay * oneEpochDuration()), InvalidMessageDeliveriesWeight: -maxScore() / topicWeight, InvalidMessageDeliveriesDecay: scoreDecay(invalidDecayPeriod), - }, nil + } } func defaultAttesterSlashingTopicParams() *pubsub.TopicScoreParams { diff --git a/beacon-chain/p2p/gossip_scoring_params_test.go b/beacon-chain/p2p/gossip_scoring_params_test.go index 5a0a56a7e..e8ac1a721 100644 --- a/beacon-chain/p2p/gossip_scoring_params_test.go +++ b/beacon-chain/p2p/gossip_scoring_params_test.go @@ -68,11 +68,9 @@ func TestLoggingParameters(t *testing.T) { logGossipParameters("testing", &pubsub.TopicScoreParams{}) // Test out actual gossip parameters. logGossipParameters("testing", defaultBlockTopicParams()) - p, err := defaultAggregateSubnetTopicParams(10000) - assert.NoError(t, err) + p := defaultAggregateSubnetTopicParams(10000) logGossipParameters("testing", p) - p, err = defaultAggregateTopicParams(10000) - assert.NoError(t, err) + p = defaultAggregateTopicParams(10000) logGossipParameters("testing", p) logGossipParameters("testing", defaultAttesterSlashingTopicParams()) logGossipParameters("testing", defaultProposerSlashingTopicParams())