Simplify double signer evidence (#1812)

* Simplification

* Suppress linting error

consensus/polybft/slashing/double_signing_tracker.go

@@ -26,20 +26,11 @@ var (
 type SenderMessagesMap map[types.Address][]*ibftProto.Message
 type MessagesMap map[uint64]map[uint64]SenderMessagesMap
 
-type DoubleSignEvidences []*DoubleSignEvidence
+type DoubleSigners []types.Address
 
+//nolint:godox
 // TODO RLP serialize/deserialize methods, Equals method for validation, etc.
 
-type DoubleSignEvidence struct {
-	signer   types.Address
-	messages []*ibftProto.Message
-}
-
-func newDoubleSignEvidence(signer types.Address,
-	messages []*ibftProto.Message) *DoubleSignEvidence {
-	return &DoubleSignEvidence{signer: signer, messages: messages}
-}
-
 type Messages struct {
 	content MessagesMap
 	mux     sync.RWMutex
@@ -93,7 +84,7 @@ var _ DoubleSigningTracker = (*DoubleSigningTrackerImpl)(nil)
 
 type DoubleSigningTracker interface {
 	Handle(msg *ibftProto.Message)
-	GetEvidences(height uint64) []*DoubleSignEvidence
+	GetDoubleSigners(height uint64) DoubleSigners
 	PruneMsgsUntil(height uint64)
 	PostBlock(req *common.PostBlockRequest) error
 }
@@ -171,9 +162,9 @@ func (t *DoubleSigningTrackerImpl) PruneMsgsUntil(height uint64) {
 	}
 }
 
-// GetEvidences returns double signing evidences for the given height
-func (t *DoubleSigningTrackerImpl) GetEvidences(height uint64) []*DoubleSignEvidence {
-	evidences := []*DoubleSignEvidence{}
+// GetEvidences returns double signers for the given height
+func (t *DoubleSigningTrackerImpl) GetDoubleSigners(height uint64) DoubleSigners {
+	doubleSigners := make(DoubleSigners, 0)
 
 	for _, msgType := range t.msgsTypes {
 		msgs := t.resolveMessagesStorage(msgType)
@@ -194,19 +185,14 @@ func (t *DoubleSigningTrackerImpl) GetEvidences(height uint64) []*DoubleSignEvid
 					continue
 				}
 
-				evidence := newDoubleSignEvidence(address, []*ibftProto.Message{msgs[0]})
-				evidences = append(evidences, evidence)
-
-				for _, msg := range msgs[1:] {
-					evidence.messages = append(evidence.messages, msg)
-				}
+				doubleSigners = append(doubleSigners, address)
 			}
 		}
 
 		msgs.mux.Unlock()
 	}
 
-	return evidences
+	return doubleSigners
 }
 
 // PostBlock is used to populate all known validators

consensus/polybft/slashing/double_signing_tracker_test.go

@@ -342,7 +342,7 @@ func TestDoubleSigningTracker_PruneMsgsUntil(t *testing.T) {
 	}
 }
 
-func TestDoubleSigningTracker_GetEvidences(t *testing.T) {
+func TestDoubleSigningTracker_GetDoubleSigners(t *testing.T) {
 	t.Parallel()
 
 	const (
@@ -354,6 +354,7 @@ func TestDoubleSigningTracker_GetEvidences(t *testing.T) {
 	require.NoError(t, err)
 
 	key := wallet.NewKey(acc)
+	senderAddr := types.Address(key.Address())
 	view := &ibftProto.View{Height: 6, Round: 2}
 	tracker, err := NewDoubleSigningTracker(hclog.NewNullLogger(), &dummyValidatorsProvider{accounts: []*wallet.Account{acc}})
 	require.NoError(t, err)
@@ -375,21 +376,11 @@ func TestDoubleSigningTracker_GetEvidences(t *testing.T) {
 		tracker.Handle(msg)
 	}
 
-	evidences := tracker.GetEvidences(view.Height)
-	require.Len(t, evidences, 2)
+	doubleSigners := tracker.GetDoubleSigners(view.Height)
+	require.Len(t, doubleSigners, 2)
 
-	prepareEvidence := evidences[0]
-	require.Len(t, prepareEvidence.messages, len(prepareMessages))
-
-	commitEvidence := evidences[1]
-	require.Len(t, commitEvidence.messages, len(commitMessages))
-
-	for i, msg := range prepareMessages {
-		require.Equal(t, msg, prepareEvidence.messages[i])
-	}
-
-	for i, msg := range commitMessages {
-		require.Equal(t, msg, commitEvidence.messages[i])
+	for _, doubleSigner := range doubleSigners {
+		require.Equal(t, senderAddr, doubleSigner)
 	}
 }