Merge branch 'feat/andromeda-fixes' into fix-proofs-pool-insert

Author: sstanculeanu

consensus/spos/bls/v2/errors.go

@@ -4,3 +4,6 @@ import "errors"
 
 // ErrNilSentSignatureTracker defines the error for setting a nil SentSignatureTracker
 var ErrNilSentSignatureTracker = errors.New("nil sent signature tracker")
+
+// ErrTimeOut signals that the time is out
+var ErrTimeOut = errors.New("time is out")

consensus/spos/bls/v2/export_test.go

@@ -362,6 +362,6 @@ func (sr *subroundEndRound) GetEquivalentProofSender() string {
 }
 
 // SendProof -
-func (sr *subroundEndRound) SendProof() {
-	_, _ = sr.sendProof()
+func (sr *subroundEndRound) SendProof() (bool, error) {
+	return sr.sendProof()
 }

consensus/spos/bls/v2/subroundEndRound.go

@@ -367,7 +367,7 @@ func (sr *subroundEndRound) sendProof() (bool, error) {
 		log.Debug("sendProof: time is out -> cancel broadcasting final info and header",
 			"round time stamp", roundHandler.TimeStamp(),
 			"current time", time.Now())
-		return false, err
+		return false, ErrTimeOut
 	}
 
 	// broadcast header proof

consensus/spos/bls/v2/subroundEndRound_test.go

@@ -2290,7 +2290,9 @@ func TestSubroundEndRound_SendProof(t *testing.T) {
 			},
 		}
 		container.SetBroadcastMessenger(bm)
-		sr.SendProof()
+		wasSent, err := sr.SendProof()
+		require.False(t, wasSent)
+		require.NoError(t, err)
 	})
 	t.Run("not enough signatures should not send proof", func(t *testing.T) {
 		t.Parallel()
@@ -2305,18 +2307,97 @@ func TestSubroundEndRound_SendProof(t *testing.T) {
 			},
 		}
 		container.SetBroadcastMessenger(bm)
-		sr.SendProof()
+		wasSent, err := sr.SendProof()
+		require.False(t, wasSent)
+		require.Error(t, err)
+	})
+	t.Run("signature aggregation failure should not send proof", func(t *testing.T) {
+		t.Parallel()
+
+		container := consensusMocks.InitConsensusCore()
+		sr := initSubroundEndRoundWithContainer(container, &statusHandler.AppStatusHandlerStub{})
+
+		bm := &consensusMocks.BroadcastMessengerMock{
+			BroadcastEquivalentProofCalled: func(proof data.HeaderProofHandler, pkBytes []byte) error {
+				require.Fail(t, "should have not been called")
+				return nil
+			},
+		}
+		container.SetBroadcastMessenger(bm)
+		signingHandler := &consensusMocks.SigningHandlerStub{
+			AggregateSigsCalled: func(bitmap []byte, epoch uint32) ([]byte, error) {
+				return nil, expectedErr
+			},
+		}
+		container.SetSigningHandler(signingHandler)
+
+		for _, pubKey := range sr.ConsensusGroup() {
+			_ = sr.SetJobDone(pubKey, bls.SrSignature, true)
+		}
+
+		wasSent, err := sr.SendProof()
+		require.False(t, wasSent)
+		require.Equal(t, expectedErr, err)
+	})
+	t.Run("no time left should not send proof", func(t *testing.T) {
+		t.Parallel()
+
+		container := consensusMocks.InitConsensusCore()
+		sr := initSubroundEndRoundWithContainer(container, &statusHandler.AppStatusHandlerStub{})
+
+		bm := &consensusMocks.BroadcastMessengerMock{
+			BroadcastEquivalentProofCalled: func(proof data.HeaderProofHandler, pkBytes []byte) error {
+				require.Fail(t, "should have not been called")
+				return nil
+			},
+		}
+		container.SetBroadcastMessenger(bm)
+		roundHandler := &consensusMocks.RoundHandlerMock{
+			RemainingTimeCalled: func(startTime time.Time, maxTime time.Duration) time.Duration {
+				return -1 // no time left
+			},
+		}
+		container.SetRoundHandler(roundHandler)
+
+		for _, pubKey := range sr.ConsensusGroup() {
+			_ = sr.SetJobDone(pubKey, bls.SrSignature, true)
+		}
+
+		wasSent, err := sr.SendProof()
+		require.False(t, wasSent)
+		require.Equal(t, v2.ErrTimeOut, err)
+	})
+	t.Run("broadcast failure should not send proof", func(t *testing.T) {
+		t.Parallel()
+
+		container := consensusMocks.InitConsensusCore()
+		sr := initSubroundEndRoundWithContainer(container, &statusHandler.AppStatusHandlerStub{})
+
+		bm := &consensusMocks.BroadcastMessengerMock{
+			BroadcastEquivalentProofCalled: func(proof data.HeaderProofHandler, pkBytes []byte) error {
+				return expectedErr
+			},
+		}
+		container.SetBroadcastMessenger(bm)
+
+		for _, pubKey := range sr.ConsensusGroup() {
+			_ = sr.SetJobDone(pubKey, bls.SrSignature, true)
+		}
+
+		wasSent, err := sr.SendProof()
+		require.False(t, wasSent)
+		require.Equal(t, expectedErr, err)
 	})
 	t.Run("should send", func(t *testing.T) {
 		t.Parallel()
 
 		container := consensusMocks.InitConsensusCore()
 		sr := initSubroundEndRoundWithContainer(container, &statusHandler.AppStatusHandlerStub{})
 
-		wasSent := false
+		wasBroadcastEquivalentProofCalled := false
 		bm := &consensusMocks.BroadcastMessengerMock{
 			BroadcastEquivalentProofCalled: func(proof data.HeaderProofHandler, pkBytes []byte) error {
-				wasSent = true
+				wasBroadcastEquivalentProofCalled = true
 				return nil
 			},
 		}
@@ -2326,7 +2407,9 @@ func TestSubroundEndRound_SendProof(t *testing.T) {
 			_ = sr.SetJobDone(pubKey, bls.SrSignature, true)
 		}
 
-		sr.SendProof()
+		wasSent, err := sr.SendProof()
 		require.True(t, wasSent)
+		require.NoError(t, err)
+		require.True(t, wasBroadcastEquivalentProofCalled)
 	})
 }