fixes after review

Author: ssd04

consensus/spos/bls/v2/subroundEndRound.go

@@ -988,11 +988,6 @@ func (sr *subroundEndRound) remainingTime() time.Duration {
 // If the signature is valid, then the jobDone map corresponding to the node which sent it,
 // is set on true for the subround Signature
 func (sr *subroundEndRound) receivedSignature(_ context.Context, cnsDta *consensus.Message) bool {
-	remainingTime := sr.remainingTime()
-	if remainingTime <= 0 {
-		return false
-	}
-
 	node := string(cnsDta.PubKey)
 	pkForLogs := core.GetTrimmedPk(hex.EncodeToString(cnsDta.PubKey))
 
@@ -1021,6 +1016,11 @@ func (sr *subroundEndRound) receivedSignature(_ context.Context, cnsDta *consens
 		return false
 	}
 
+	remainingTime := sr.remainingTime()
+	if remainingTime <= 0 {
+		return false
+	}
+
 	index, err := sr.ConsensusGroupIndex(node)
 	if err != nil {
 		log.Debug("receivedSignature.ConsensusGroupIndex",

consensus/spos/bls/v2/subroundSignature.go

@@ -267,9 +267,9 @@ func (sr *subroundSignature) doSignatureJobForManagedKeys(ctx context.Context) b
 	sigCtx, cancel := context.WithTimeout(ctx, timeLeft)
 	defer cancel()
 
-	isTimeLeft := sr.waitForSignatures(timeLeft)
-	if !isTimeLeft {
-		log.Debug("doSignatureJobForManagedKeys: timeout while sending signatures")
+	signaturesReady := sr.waitForSignatures(timeLeft)
+	if !signaturesReady {
+		log.Debug("doSignatureJobForManagedKeys: timeout while waiting for signatures to be created")
 		return false
 	}
 
@@ -384,7 +384,7 @@ func (sr *subroundSignature) doSignatureJobForSingleKey(ctx context.Context) boo
 	}
 
 	if !sr.isTimeLeft() {
-		log.Debug("doSignatureJobForSingleKey: timeout while handling single key singature")
+		log.Debug("doSignatureJobForSingleKey: timeout while handling single key signature")
 		return false
 	}
 

consensus/spos/bls/v2/subroundSignatureCompetingBlock_test.go

@@ -370,7 +370,7 @@ func TestWaitIfCompetingBlock_RecordSignedNonceCalledBeforeBroadcast(t *testing.
 	assert.True(t, recordCalled, "RecordSignedNonce should be called before broadcast")
 }
 
-func TestWaitIfCompetingBlockForNode_NoCompetingBlockForAnyKey(t *testing.T) {
+func TestWaitIfCompetingBlock_NoCompetingBlockForAnyKey(t *testing.T) {
 	t.Parallel()
 
 	sr := createSubroundSignatureForCompetingBlockTests(
@@ -387,7 +387,7 @@ func TestWaitIfCompetingBlockForNode_NoCompetingBlockForAnyKey(t *testing.T) {
 	assert.False(t, result, "should return false when no key has a competing block")
 }
 
-func TestWaitIfCompetingBlockForNode_SameHashForAllKeys(t *testing.T) {
+func TestWaitIfCompetingBlock_SameHashForAllKeys(t *testing.T) {
 	t.Parallel()
 
 	currentHash := []byte("current_hash")
@@ -405,7 +405,7 @@ func TestWaitIfCompetingBlockForNode_SameHashForAllKeys(t *testing.T) {
 	assert.False(t, result, "should return false when all keys signed the same hash")
 }
 
-func TestWaitIfCompetingBlockForNode_SelfKeyHasCompetingBlock(t *testing.T) {
+func TestWaitIfCompetingBlock_SelfKeyHasCompetingBlock(t *testing.T) {
 	container := consensusMocks.InitConsensusCore()
 	container.SetRoundHandler(&testscommon.RoundHandlerMock{
 		TimeDurationCalled: func() time.Duration {
@@ -465,7 +465,7 @@ func TestWaitIfCompetingBlockForNode_SelfKeyHasCompetingBlock(t *testing.T) {
 	assert.GreaterOrEqual(t, elapsed, 40*time.Millisecond, "should have waited for competing block delay")
 }
 
-func TestWaitIfCompetingBlockForNode_ManagedKeyHasCompetingBlock(t *testing.T) {
+func TestWaitIfCompetingBlock_ManagedKeyHasCompetingBlock(t *testing.T) {
 	container := consensusMocks.InitConsensusCore()
 	container.SetRoundHandler(&testscommon.RoundHandlerMock{
 		TimeDurationCalled: func() time.Duration {
@@ -538,10 +538,10 @@ func TestWaitIfCompetingBlockForNode_ManagedKeyHasCompetingBlock(t *testing.T) {
 	assert.GreaterOrEqual(t, elapsed, 40*time.Millisecond, "should have waited for competing block delay")
 }
 
-func TestWaitIfCompetingBlockForNode_WaitsOnceNotPerKey(t *testing.T) {
+func TestWaitIfCompetingBlock_WaitsOnceNotPerKey(t *testing.T) {
 	t.Parallel()
 
-	// This test verifies that waitIfCompetingBlockForNode returns after a single wait
+	// This test verifies that waitIfCompetingBlock returns after a single wait
 	// even when multiple keys have competing blocks - it should not wait per-key.
 	container := consensusMocks.InitConsensusCore()
 	container.SetRoundHandler(&testscommon.RoundHandlerMock{