lint fix

0xPolygon · Jun 20, 2024 · 81c6e03 · 81c6e03
1 parent 4166f42
commit 81c6e03
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 17 deletions.
diff --git a/core/helpers_test.go b/core/helpers_test.go
@@ -184,7 +184,7 @@ func (c *cluster) runSequences(ctx context.Context, height uint64) error {
 			// wait for the worker threads to return
 			<-sequenceDone
 
-			return errors.New("timeout")
+			return errors.New("timeout") //nolint:err113
 		}
 	}
 

diff --git a/core/mock_test.go b/core/mock_test.go
@@ -532,10 +532,7 @@ func (m *mockCluster) awaitNCompletions(
 	for {
 		select {
 		case <-ctx.Done():
-			return fmt.Errorf(
-				"await exceeded timeout for %d nodes",
-				count,
-			)
+			return fmt.Errorf("await exceeded timeout for %d nodes", count) //nolint:err113
 		default:
 			if m.wg.getDone() >= count {
 				return nil

diff --git a/core/rapid_test.go b/core/rapid_test.go
@@ -358,11 +358,14 @@ func TestProperty(t *testing.T) {
 			// Make sure we have inserted blocks >= quorum per round.
 			lastRound := setup.lastRound(height)
 			badNodes := lastRound.badNodes()
+
 			var proposalsNumber int
+
 			for nodeID, proposalMap := range insertedProposals.proposals {
 				if nodeID >= int(badNodes) {
 					// Only one inserted block per valid round
 					assert.LessOrEqual(t, len(proposalMap), 1)
+
 					proposalsNumber++
 
 					// Make sure inserted block value is correct

diff --git a/messages/helpers.go b/messages/helpers.go
@@ -36,7 +36,10 @@ func ExtractCommittedSeals(commitMessages []*proto.IbftMessage) ([]*CommittedSea
 
 // ExtractCommittedSeal extracts the committed seal from the passed in message
 func ExtractCommittedSeal(commitMessage *proto.IbftMessage) *CommittedSeal {
-	commitData, _ := commitMessage.Payload.(*proto.IbftMessage_CommitData)
+	commitData, ok := commitMessage.Payload.(*proto.IbftMessage_CommitData)
+	if !ok {
+		return nil
+	}
 
 	return &CommittedSeal{
 		Signer:    commitMessage.From,
@@ -50,7 +53,10 @@ func ExtractCommitHash(commitMessage *proto.IbftMessage) []byte {
 		return nil
 	}
 
-	commitData, _ := commitMessage.Payload.(*proto.IbftMessage_CommitData)
+	commitData, ok := commitMessage.Payload.(*proto.IbftMessage_CommitData)
+	if !ok {
+		return nil
+	}
 
 	return commitData.CommitData.ProposalHash
 }
@@ -61,7 +67,10 @@ func ExtractProposal(proposalMessage *proto.IbftMessage) *proto.Proposal {
 		return nil
 	}
 
-	preprepareData, _ := proposalMessage.Payload.(*proto.IbftMessage_PreprepareData)
+	preprepareData, ok := proposalMessage.Payload.(*proto.IbftMessage_PreprepareData)
+	if !ok {
+		return nil
+	}
 
 	return preprepareData.PreprepareData.Proposal
 }
@@ -72,7 +81,10 @@ func ExtractProposalHash(proposalMessage *proto.IbftMessage) []byte {
 		return nil
 	}
 
-	preprepareData, _ := proposalMessage.Payload.(*proto.IbftMessage_PreprepareData)
+	preprepareData, ok := proposalMessage.Payload.(*proto.IbftMessage_PreprepareData)
+	if !ok {
+		return nil
+	}
 
 	return preprepareData.PreprepareData.ProposalHash
 }
@@ -83,7 +95,10 @@ func ExtractRoundChangeCertificate(proposalMessage *proto.IbftMessage) *proto.Ro
 		return nil
 	}
 
-	preprepareData, _ := proposalMessage.Payload.(*proto.IbftMessage_PreprepareData)
+	preprepareData, ok := proposalMessage.Payload.(*proto.IbftMessage_PreprepareData)
+	if !ok {
+		return nil
+	}
 
 	return preprepareData.PreprepareData.Certificate
 }
@@ -94,7 +109,10 @@ func ExtractPrepareHash(prepareMessage *proto.IbftMessage) []byte {
 		return nil
 	}
 
-	prepareData, _ := prepareMessage.Payload.(*proto.IbftMessage_PrepareData)
+	prepareData, ok := prepareMessage.Payload.(*proto.IbftMessage_PrepareData)
+	if !ok {
+		return nil
+	}
 
 	return prepareData.PrepareData.ProposalHash
 }
@@ -105,7 +123,10 @@ func ExtractLatestPC(roundChangeMessage *proto.IbftMessage) *proto.PreparedCerti
 		return nil
 	}
 
-	rcData, _ := roundChangeMessage.Payload.(*proto.IbftMessage_RoundChangeData)
+	rcData, ok := roundChangeMessage.Payload.(*proto.IbftMessage_RoundChangeData)
+	if !ok {
+		return nil
+	}
 
 	return rcData.RoundChangeData.LatestPreparedCertificate
 }
@@ -116,7 +137,10 @@ func ExtractLastPreparedProposal(roundChangeMessage *proto.IbftMessage) *proto.P
 		return nil
 	}
 
-	rcData, _ := roundChangeMessage.Payload.(*proto.IbftMessage_RoundChangeData)
+	rcData, ok := roundChangeMessage.Payload.(*proto.IbftMessage_RoundChangeData)
+	if !ok {
+		return nil
+	}
 
 	return rcData.RoundChangeData.LastPreparedProposal
 }

diff --git a/messages/helpers_test.go b/messages/helpers_test.go
@@ -180,8 +180,6 @@ func TestMessages_ExtractProposal(t *testing.T) {
 func TestMessages_ExtractProposalHash(t *testing.T) {
 	t.Parallel()
 
-	proposalHash := []byte("proposal hash")
-
 	testTable := []struct {
 		name                 string
 		expectedProposalHash []byte

diff --git a/messages/proto/helper.go b/messages/proto/helper.go
@@ -1,11 +1,21 @@
 // Package proto defines the code for protocol buffer
 package proto
 
-import "google.golang.org/protobuf/proto"
+import (
+	"errors"
+
+	"google.golang.org/protobuf/proto"
+)
+
+var errNotIbftMessage = errors.New("not an Ibft message")
 
 // PayloadNoSig returns marshaled message without signature
 func (m *IbftMessage) PayloadNoSig() ([]byte, error) {
-	mm, _ := proto.Clone(m).(*IbftMessage)
+	mm, ok := proto.Clone(m).(*IbftMessage)
+	if !ok {
+		return nil, errNotIbftMessage
+	}
+
 	mm.Signature = nil
 
 	raw, err := proto.Marshal(mm)