Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Enable wastedassign linter & fix findings #13507

Merged
merged 2 commits into from Jan 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 0 additions & 1 deletion .golangci.yml
Expand Up @@ -80,7 +80,6 @@ linters:
- thelper
- unparam
- varnamelen
- wastedassign
- wrapcheck
- wsl

Expand Down
2 changes: 1 addition & 1 deletion beacon-chain/execution/block_reader.go
Expand Up @@ -113,7 +113,7 @@ func (s *Service) BlockByTimestamp(ctx context.Context, time uint64) (*types.Hea
cursorNum := big.NewInt(0).SetUint64(latestBlkHeight)
cursorTime := latestBlkTime

numOfBlocks := uint64(0)
var numOfBlocks uint64
estimatedBlk := cursorNum.Uint64()
maxTimeBuffer := searchThreshold * params.BeaconConfig().SecondsPerETH1Block
// Terminate if we can't find an acceptable block after
Expand Down
2 changes: 1 addition & 1 deletion beacon-chain/state/fieldtrie/field_trie.go
Expand Up @@ -60,7 +60,7 @@ func NewFieldTrie(field types.FieldIndex, fieldInfo types.DataType, elements int
if err := validateElements(field, fieldInfo, elements, length); err != nil {
return nil, err
}
numOfElems := 0
var numOfElems int
if val, ok := elements.(sliceAccessor); ok {
numOfElems = val.Len(val.State())
} else {
Expand Down
2 changes: 1 addition & 1 deletion beacon-chain/sync/rpc_status.go
Expand Up @@ -210,7 +210,7 @@ func (s *Service) statusRPCHandler(ctx context.Context, msg interface{}, stream
"error": err,
}).Debug("Invalid status message from peer")

respCode := byte(0)
var respCode byte
switch err {
case p2ptypes.ErrGeneric:
respCode = responseCodeServerError
Expand Down
7 changes: 3 additions & 4 deletions beacon-chain/sync/subscriber.go
Expand Up @@ -257,7 +257,8 @@ func (s *Service) subscribeWithBase(topic string, validator wrappedVal, handle s
func (s *Service) wrapAndReportValidation(topic string, v wrappedVal) (string, pubsub.ValidatorEx) {
return topic, func(ctx context.Context, pid peer.ID, msg *pubsub.Message) (res pubsub.ValidationResult) {
defer messagehandler.HandlePanic(ctx, msg)
res = pubsub.ValidationIgnore // Default: ignore any message that panics.
// Default: ignore any message that panics.
res = pubsub.ValidationIgnore // nolint:wastedassign
ctx, cancel := context.WithTimeout(ctx, pubsubMessageTimeout)
defer cancel()
messageReceivedCounter.WithLabelValues(topic).Inc()
Expand Down Expand Up @@ -781,10 +782,8 @@ func isDigestValid(digest [4]byte, genesis time.Time, genValRoot [32]byte) (bool
}

func agentString(pid peer.ID, hst host.Host) string {
agString := ""
ok := false
rawVersion, storeErr := hst.Peerstore().Get(pid, "AgentVersion")
agString, ok = rawVersion.(string)
agString, ok := rawVersion.(string)
if storeErr != nil || !ok {
agString = ""
}
Expand Down
1 change: 0 additions & 1 deletion container/doubly-linked-list/list.go
Expand Up @@ -94,7 +94,6 @@ func (l *List[T]) Remove(n *Node[T]) {
n.next.prev = n.prev
}
}
n = nil
l.len--
}

Expand Down
2 changes: 1 addition & 1 deletion testing/assertions/assertions.go
Expand Up @@ -52,7 +52,7 @@ func DeepEqual(loggerFn assertionLoggerFn, expected, actual interface{}, msg ...
if !isDeepEqual(expected, actual) {
errMsg := parseMsg("Values are not equal", msg...)
_, file, line, _ := runtime.Caller(2)
diff := ""
var diff string
if _, isProto := expected.(proto.Message); isProto {
diff = ProtobufPrettyDiff(expected, actual)
} else {
Expand Down
2 changes: 1 addition & 1 deletion testing/endtoend/evaluators/execution_engine.go
Expand Up @@ -83,7 +83,7 @@ func optimisticSyncEnabled(_ *types.EvaluationContext, conns ...*grpc.ClientConn
}

func retrieveHeadSlot(resp *beacon.GetBlockV2Response) (uint64, error) {
headSlot := uint64(0)
var headSlot uint64
var err error
switch resp.Version {
case version.String(version.Phase0):
Expand Down