fix after review

Author: sstanculeanu

consensus/spos/consensusState.go

@@ -48,19 +48,23 @@ type ConsensusState struct {
 	*roundStatus
 
 	mutState sync.RWMutex
+
+	redundancyHandler consensus.NodeRedundancyHandler
 }
 
 // NewConsensusState creates a new ConsensusState object
 func NewConsensusState(
 	roundConsensus *roundConsensus,
 	roundThreshold *roundThreshold,
 	roundStatus *roundStatus,
+	redundancyHandler consensus.NodeRedundancyHandler,
 ) *ConsensusState {
 
 	cns := ConsensusState{
-		roundConsensus: roundConsensus,
-		roundThreshold: roundThreshold,
-		roundStatus:    roundStatus,
+		roundConsensus:    roundConsensus,
+		roundThreshold:    roundThreshold,
+		roundStatus:       roundStatus,
+		redundancyHandler: redundancyHandler,
 	}
 
 	cns.ResetConsensusState()
@@ -266,7 +270,7 @@ func (cns *ConsensusState) CanDoSubroundJob(currentSubroundId int) bool {
 // CanProcessReceivedMessage method returns true if the message received can be processed and false otherwise
 func (cns *ConsensusState) CanProcessReceivedMessage(cnsDta *consensus.Message, currentRoundIndex int64,
 	currentSubroundId int) bool {
-	if cns.IsNodeSelf(string(cnsDta.PubKey)) {
+	if cns.IsNodeSelf(string(cnsDta.PubKey)) && ShouldConsiderSelfKeyInConsensus(cns.redundancyHandler) {
 		return false
 	}
 

consensus/spos/consensusState_test.go

@@ -10,6 +10,7 @@ import (
 	p2pMessage "github.com/multiversx/mx-chain-communication-go/p2p/message"
 	"github.com/multiversx/mx-chain-core-go/core"
 	"github.com/multiversx/mx-chain-core-go/data/block"
+	"github.com/multiversx/mx-chain-go/consensus/mock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
@@ -58,6 +59,7 @@ func internalInitConsensusStateWithKeysHandler(keysHandler consensus.KeysHandler
 		rcns,
 		rthr,
 		rstatus,
+		&mock.NodeRedundancyHandlerStub{},
 	)
 
 	return cns
@@ -423,11 +425,52 @@ func TestConsensusState_CanProcessReceivedMessageShouldReturnFalseWhenMessageIsR
 func TestConsensusState_CanProcessReceivedMessageShouldReturnFalseWhenMessageIsReceivedForOtherRound(t *testing.T) {
 	t.Parallel()
 
-	cns := internalInitConsensusState()
+	eligibleList := []string{"1", "2", "3"}
+
+	eligibleNodesPubKeys := make(map[string]struct{})
+	for _, key := range eligibleList {
+		eligibleNodesPubKeys[key] = struct{}{}
+	}
+
+	rcns, _ := spos.NewRoundConsensus(
+		eligibleNodesPubKeys,
+		3,
+		"2",
+		&testscommon.KeysHandlerStub{},
+	)
+
+	rcns.SetConsensusGroup(eligibleList)
+	rcns.SetLeader(eligibleList[0])
+	rcns.ResetRoundState()
+
+	rthr := spos.NewRoundThreshold()
+
+	rthr.SetThreshold(bls.SrBlock, 1)
+	rthr.SetThreshold(bls.SrSignature, 3)
+	rthr.SetFallbackThreshold(bls.SrBlock, 1)
+	rthr.SetFallbackThreshold(bls.SrSignature, 2)
+
+	rstatus := spos.NewRoundStatus()
+	rstatus.ResetRoundStatus()
+
+	// force backup case for coverage
+	cns := spos.NewConsensusState(
+		rcns,
+		rthr,
+		rstatus,
+		&mock.NodeRedundancyHandlerStub{
+			IsRedundancyNodeCalled: func() bool {
+				return true
+			},
+			IsMainMachineActiveCalled: func() bool {
+				return false
+			},
+		},
+	)
 
 	cnsDta := &consensus.Message{
 		RoundIndex: 0,
-		PubKey:     []byte("1"),
+		PubKey:     []byte(cns.SelfPubKey()),
 	}
 
 	assert.False(t, cns.CanProcessReceivedMessage(cnsDta, 1, bls.SrBlock))

consensus/spos/subround_test.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-go/consensus/mock"
 	"github.com/multiversx/mx-chain-go/testscommon/enableEpochsHandlerMock"
 
 	"github.com/stretchr/testify/assert"
@@ -88,6 +89,7 @@ func initConsensusState() *spos.ConsensusState {
 		rcns,
 		rthr,
 		rstatus,
+		&mock.NodeRedundancyHandlerStub{},
 	)
 
 	cns.Data = []byte("X")

factory/consensus/consensusComponents.go

@@ -420,7 +420,9 @@ func (ccf *consensusComponentsFactory) createConsensusState(epoch uint32, consen
 	consensusState := spos.NewConsensusState(
 		roundConsensus,
 		roundThreshold,
-		roundStatus)
+		roundStatus,
+		ccf.processComponents.NodeRedundancyHandler(),
+	)
 
 	return consensusState, nil
 }
@@ -775,6 +777,9 @@ func checkArgs(args ConsensusComponentsFactoryArgs) error {
 	if check.IfNil(args.ProcessComponents.HardforkTrigger()) {
 		return errors.ErrNilHardforkTrigger
 	}
+	if check.IfNil(args.ProcessComponents.NodeRedundancyHandler()) {
+		return errors.ErrNilNodeRedundancyHandler
+	}
 	if check.IfNil(args.StateComponents) {
 		return errors.ErrNilStateComponentsHolder
 	}

factory/consensus/consensusComponents_test.go

@@ -351,6 +351,22 @@ func TestNewConsensusComponentsFactory(t *testing.T) {
 		require.Nil(t, ccf)
 		require.Equal(t, errorsMx.ErrNilRoundHandler, err)
 	})
+	t.Run("nil NodeRedundancyHandler should error", func(t *testing.T) {
+		t.Parallel()
+
+		args := createMockConsensusComponentsFactoryArgs()
+		args.ProcessComponents = &testsMocks.ProcessComponentsStub{
+			NodesCoord:                    &shardingMocks.NodesCoordinatorMock{},
+			ShardCoord:                    &testscommon.ShardsCoordinatorMock{},
+			RoundHandlerField:             &testscommon.RoundHandlerMock{},
+			HardforkTriggerField:          &testscommon.HardforkTriggerStub{},
+			NodeRedundancyHandlerInternal: nil,
+		}
+		ccf, err := consensusComp.NewConsensusComponentsFactory(args)
+
+		require.Nil(t, ccf)
+		require.Equal(t, errorsMx.ErrNilNodeRedundancyHandler, err)
+	})
 	t.Run("nil HardforkTrigger should error", func(t *testing.T) {
 		t.Parallel()
 

testscommon/consensus/initializers/initializers.go

@@ -2,6 +2,7 @@ package initializers
 
 import (
 	crypto "github.com/multiversx/mx-chain-crypto-go"
+	"github.com/multiversx/mx-chain-go/consensus/mock"
 	"golang.org/x/exp/slices"
 
 	"github.com/multiversx/mx-chain-go/consensus"
@@ -90,6 +91,7 @@ func InitConsensusStateWithArgsVerifySignature(keysHandler consensus.KeysHandler
 		rcns,
 		rthr,
 		rstatus,
+		&mock.NodeRedundancyHandlerStub{},
 	)
 	cns.Data = []byte("X")
 	cns.SetRoundIndex(0)
@@ -148,6 +150,7 @@ func createConsensusStateWithNodes(eligibleNodesPubKeys map[string]struct{}, con
 		rcns,
 		rthr,
 		rstatus,
+		&mock.NodeRedundancyHandlerStub{},
 	)
 
 	cns.Data = []byte("X")