external bv error log err->debug

flare-foundation · Dec 16, 2024 · 78b38a4 · 78b38a4
1 parent 23d9939
commit 78b38a4
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 11 deletions.
diff --git a/client/attestation/bitVotes/bitvote.go b/client/attestation/bitVotes/bitvote.go
@@ -12,7 +12,7 @@ const (
 )
 
 type BitVote struct {
-	Length    uint16 //number of attestations
+	Length    uint16 // number of attestations
 	BitVector *big.Int
 }
 

diff --git a/client/manager/manager.go b/client/manager/manager.go
@@ -92,7 +92,11 @@ func (m *Manager) Run(ctx context.Context) {
 
 		case bitVotesForRound := <-m.bitVotes:
 			for i := range bitVotesForRound.Messages {
-				err := m.OnBitVote(bitVotesForRound.Messages[i])
+				bitVoteErr, err := m.OnBitVote(bitVotesForRound.Messages[i])
+
+				if bitVoteErr != nil {
+					logger.Debug("bad bitVote: %s", bitVoteErr)
+				}
 				if err != nil {
 					logger.Errorf("bit vote error: %s", err)
 				}
@@ -157,26 +161,26 @@ func (m *Manager) GetOrCreateRound(roundID uint32) (*round.Round, error) {
 }
 
 // OnBitVote processes payload message that is assumed to be a bitVote and adds it to the correct round.
-func (m *Manager) OnBitVote(message payload.Message) error {
+func (m *Manager) OnBitVote(message payload.Message) (error, error) {
 	if message.Timestamp < timing.ChooseStartTimestamp(message.VotingRound) {
-		return fmt.Errorf("bitVote from %s for voting round %d too soon", message.From, message.VotingRound)
+		return fmt.Errorf("bitVote from %s for voting round %d too soon", message.From, message.VotingRound), nil
 	}
 
 	if message.Timestamp >= timing.ChooseEndTimestamp(message.VotingRound) {
-		return fmt.Errorf("bitVote from %s for voting round %d too late", message.From, message.VotingRound)
+		return fmt.Errorf("bitVote from %s for voting round %d too late", message.From, message.VotingRound), nil
 	}
 
 	round, err := m.GetOrCreateRound(message.VotingRound)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	err = round.ProcessBitVote(message)
 	if err != nil {
-		return fmt.Errorf("error processing bitVote from %s for voting round %d: %s", message.From, message.VotingRound, err)
+		return fmt.Errorf("error processing bitVote from %s for voting round %d: %s", message.From, message.VotingRound, err), nil
 	}
 
-	return nil
+	return nil, nil
 }
 
 // OnRequest processes the attestation request.

diff --git a/client/manager/manager_test.go b/client/manager/manager_test.go
@@ -130,12 +130,15 @@ func TestManagerMethods(t *testing.T) {
 		bitVoteMessageBadVoter,
 		bitVoteMessageWrongLength,
 	} {
-		err = mngr.OnBitVote(badBitVote)
-		require.Error(t, err, fmt.Sprintf("error in bad bitVote %d", i))
+		bverr, err := mngr.OnBitVote(badBitVote)
+		require.Error(t, bverr, fmt.Sprintf("error in bad bitVote %d", i))
+		require.NoError(t, err)
+
 	}
 	bitVoteMessageCorrect := bitVoteMessage
 	bitVoteMessageCorrect.Payload = []byte{0, 0}
-	err = mngr.OnBitVote(bitVoteMessageCorrect)
+	bverr, err := mngr.OnBitVote(bitVoteMessageCorrect)
+	require.NoError(t, bverr)
 	require.NoError(t, err)
 
 	_, ok := mngr.Rounds.Get(664111)