some fixes

Author: AdoAdoAdo

consensus/interface.go

@@ -208,3 +208,13 @@ type EquivalentProofsPool interface {
 	HasProof(shardID uint32, headerHash []byte) bool
 	IsInterfaceNil() bool
 }
+
+// ProofHandler defines the interface for a proof handler
+type ProofHandler interface {
+	GetPubKeysBitmap() []byte
+	GetAggregatedSignature() []byte
+	GetHeaderHash() []byte
+	GetHeaderEpoch() uint32
+	GetHeaderNonce() uint64
+	GetHeaderShardId() uint32
+}

consensus/spos/bls/v2/export_test.go

@@ -267,7 +267,7 @@ func (sr *subroundEndRound) CreateAndBroadcastProof(signature []byte, bitmap []b
 }
 
 // ReceivedProof calls the unexported receivedProof function
-func (sr *subroundEndRound) ReceivedProof(proof spos.ProofHandler) {
+func (sr *subroundEndRound) ReceivedProof(proof consensus.ProofHandler) {
 	sr.receivedProof(proof)
 }
 

consensus/spos/bls/v2/subroundEndRound.go

@@ -94,12 +94,12 @@ func checkNewSubroundEndRoundParams(
 	return err
 }
 
-func (sr *subroundEndRound) isProofForCurrentConsensus(proof spos.ProofHandler) bool {
+func (sr *subroundEndRound) isProofForCurrentConsensus(proof consensus.ProofHandler) bool {
 	return bytes.Equal(sr.GetData(), proof.GetHeaderHash())
 }
 
 // receivedProof method is called when a block header final info is received
-func (sr *subroundEndRound) receivedProof(proof spos.ProofHandler) {
+func (sr *subroundEndRound) receivedProof(proof consensus.ProofHandler) {
 	sr.mutProcessingEndRound.Lock()
 	defer sr.mutProcessingEndRound.Unlock()
 

consensus/spos/interface.go

@@ -105,7 +105,7 @@ type WorkerHandler interface {
 	// AddReceivedHeaderHandler adds a new handler function for a received header
 	AddReceivedHeaderHandler(handler func(data.HeaderHandler))
 	// AddReceivedProofHandler adds a new handler function for a received proof
-	AddReceivedProofHandler(handler func(ProofHandler))
+	AddReceivedProofHandler(handler func(consensus.ProofHandler))
 	// RemoveAllReceivedMessagesCalls removes all the functions handlers
 	RemoveAllReceivedMessagesCalls()
 	// ProcessReceivedMessage method redirects the received message to the channel which should handle it
@@ -259,13 +259,3 @@ type RoundThresholdHandler interface {
 	FallbackThreshold(subroundId int) int
 	SetFallbackThreshold(subroundId int, threshold int)
 }
-
-// ProofHandler defines the interface for a proof handler
-type ProofHandler interface {
-	GetPubKeysBitmap() []byte
-	GetAggregatedSignature() []byte
-	GetHeaderHash() []byte
-	GetHeaderEpoch() uint32
-	GetHeaderNonce() uint64
-	GetHeaderShardId() uint32
-}

consensus/spos/worker.go

@@ -73,7 +73,7 @@ type Worker struct {
 	receivedHeadersHandlers   []func(headerHandler data.HeaderHandler)
 	mutReceivedHeadersHandler sync.RWMutex
 
-	receivedProofHandler    []func(proofHandler ProofHandler)
+	receivedProofHandler    []func(proofHandler consensus.ProofHandler)
 	mutReceivedProofHandler sync.RWMutex
 
 	antifloodHandler consensus.P2PAntifloodHandler
@@ -311,7 +311,7 @@ func (wrk *Worker) AddReceivedHeaderHandler(handler func(data.HeaderHandler)) {
 }
 
 // AddReceivedProofHandler adds a new handler function for a received proof
-func (wrk *Worker) AddReceivedProofHandler(handler func(ProofHandler)) {
+func (wrk *Worker) AddReceivedProofHandler(handler func(proofHandler consensus.ProofHandler)) {
 	wrk.mutReceivedProofHandler.Lock()
 	wrk.receivedProofHandler = append(wrk.receivedProofHandler, handler)
 	wrk.mutReceivedProofHandler.Unlock()

factory/interface.go

@@ -21,7 +21,6 @@ import (
 	cryptoCommon "github.com/multiversx/mx-chain-go/common/crypto"
 	"github.com/multiversx/mx-chain-go/common/statistics"
 	"github.com/multiversx/mx-chain-go/consensus"
-	"github.com/multiversx/mx-chain-go/consensus/spos"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
 	"github.com/multiversx/mx-chain-go/dblookupext"
 	"github.com/multiversx/mx-chain-go/epochStart"
@@ -388,7 +387,7 @@ type ConsensusWorker interface {
 	// AddReceivedHeaderHandler adds a new handler function for a received header
 	AddReceivedHeaderHandler(handler func(data.HeaderHandler))
 	// AddReceivedProofHandler adds a new handler function for a received proof
-	AddReceivedProofHandler(handler func(proofHandler spos.ProofHandler))
+	AddReceivedProofHandler(handler func(proofHandler consensus.ProofHandler))
 	// RemoveAllReceivedMessagesCalls removes all the functions handlers
 	RemoveAllReceivedMessagesCalls()
 	// ProcessReceivedMessage method redirects the received message to the channel which should handle it

testscommon/consensus/sposWorkerMock.go

@@ -7,7 +7,6 @@ import (
 	"github.com/multiversx/mx-chain-core-go/data"
 
 	"github.com/multiversx/mx-chain-go/consensus"
-	"github.com/multiversx/mx-chain-go/consensus/spos"
 	"github.com/multiversx/mx-chain-go/p2p"
 )
 
@@ -18,7 +17,7 @@ type SposWorkerMock struct {
 		receivedMessageCall func(ctx context.Context, cnsDta *consensus.Message) bool,
 	)
 	AddReceivedHeaderHandlerCalled         func(handler func(data.HeaderHandler))
-	AddReceivedProofHandlerCalled          func(handler func(proofHandler spos.ProofHandler))
+	AddReceivedProofHandlerCalled          func(handler func(proofHandler consensus.ProofHandler))
 	RemoveAllReceivedMessagesCallsCalled   func()
 	ProcessReceivedMessageCalled           func(message p2p.MessageP2P) error
 	SendConsensusMessageCalled             func(cnsDta *consensus.Message) bool
@@ -48,7 +47,7 @@ func (sposWorkerMock *SposWorkerMock) AddReceivedHeaderHandler(handler func(data
 	}
 }
 
-func (sposWorkerMock *SposWorkerMock) AddReceivedProofHandler(handler func(proofHandler spos.ProofHandler)) {
+func (sposWorkerMock *SposWorkerMock) AddReceivedProofHandler(handler func(proofHandler consensus.ProofHandler)) {
 	if sposWorkerMock.AddReceivedProofHandlerCalled != nil {
 		sposWorkerMock.AddReceivedProofHandlerCalled(handler)
 	}