verify returns requestInfo

Signed-off-by: Hagar Meir <[email protected]>

Author: HagarMeir

examples/naive_chain/node.go

@@ -43,12 +43,12 @@ func (*Node) RequestID(req []byte) bft.RequestInfo {
 	}
 }
 
-func (*Node) VerifyProposal(proposal bft.Proposal, prevHeader []byte) error {
-	return nil
+func (*Node) VerifyProposal(proposal bft.Proposal, prevHeader []byte) ([]bft.RequestInfo, error) {
+	return nil, nil
 }
 
-func (*Node) VerifyRequest(val []byte) error {
-	return nil
+func (*Node) VerifyRequest(val []byte) (bft.RequestInfo, error) {
+	return bft.RequestInfo{}, nil
 }
 
 func (*Node) VerifyConsenterSig(_ bft.Signature, prop bft.Proposal) error {

internal/bft/controller.go

@@ -24,8 +24,8 @@ type Logger interface {
 
 //go:generate mockery -dir . -name Verifier -case underscore -output ./mocks/
 type Verifier interface {
-	VerifyProposal(proposal types.Proposal, prevHeader []byte) error
-	VerifyRequest(val []byte) error
+	VerifyProposal(proposal types.Proposal, prevHeader []byte) ([]types.RequestInfo, error)
+	VerifyRequest(val []byte) (types.RequestInfo, error)
 	VerifyConsenterSig(signature types.Signature, prop types.Proposal) error
 	VerificationSequence() uint64
 }
@@ -210,7 +210,7 @@ func (c *Controller) getNextBatch() [][]byte {
 		}
 		requests := c.Batcher.NextBatch()
 		for _, req := range requests {
-			err := c.Verifier.VerifyRequest(req)
+			_, err := c.Verifier.VerifyRequest(req) // TODO use returned request info
 			if err != nil {
 				c.Logger.Warnf("Ignoring bad request: %v, verifier error is: %v", req, err)
 				continue

internal/bft/controller_test.go

@@ -57,7 +57,7 @@ func TestQuorum(t *testing.T) {
 	for _, testCase := range quorums {
 		t.Run(fmt.Sprintf("%d nodes", testCase.N), func(t *testing.T) {
 			verifier := &mocks.Verifier{}
-			verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil)
+			verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil, nil)
 			comm := &mocks.Comm{}
 			comm.On("Broadcast", mock.Anything)
 			basicLog, err := zap.NewDevelopment()
@@ -117,8 +117,8 @@ func TestLeaderPropose(t *testing.T) {
 	batcher := &mocks.Batcher{}
 	batcher.On("NextBatch").Return([][]byte{req})
 	verifier := &mocks.Verifier{}
-	verifier.On("VerifyRequest", req).Return(nil)
-	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil)
+	verifier.On("VerifyRequest", req).Return(types.RequestInfo{}, nil)
+	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil, nil)
 	verifier.On("VerifyConsenterSig", mock.Anything, mock.Anything, mock.Anything).Return(nil)
 	assembler := &mocks.Assembler{}
 	assembler.On("AssembleProposal", mock.Anything, [][]byte{req}).Return(proposal, [][]byte{})
@@ -180,8 +180,8 @@ func TestLeaderChange(t *testing.T) {
 	batcher := &mocks.Batcher{}
 	batcher.On("NextBatch").Return([][]byte{req})
 	verifier := &mocks.Verifier{}
-	verifier.On("VerifyRequest", req).Return(nil)
-	verifier.On("VerifyProposal", proposal, mock.Anything).Return(nil)
+	verifier.On("VerifyRequest", req).Return(types.RequestInfo{}, nil)
+	verifier.On("VerifyProposal", proposal, mock.Anything).Return(nil, nil)
 	assembler := &mocks.Assembler{}
 	assembler.On("AssembleProposal", mock.Anything, [][]byte{req}).Return(proposal, [][]byte{})
 	comm := &mocks.Comm{}

internal/bft/mocks/verifier.go

@@ -254,7 +254,7 @@ func (v *View) processProposal() *types.Proposal {
 	case proposal = <-v.proposals:
 	}
 	// TODO think if there is any other validation the node should run on a proposal
-	err := v.Verifier.VerifyProposal(proposal, v.PrevHeader)
+	_, err := v.Verifier.VerifyProposal(proposal, v.PrevHeader) // TODO use returned request info
 	if err != nil {
 		v.Logger.Warnf("Received bad proposal from %d: %v", v.LeaderID, err)
 		v.FailureDetector.Complain()

internal/bft/view.go

@@ -176,7 +176,7 @@ func TestBadPrePrepare(t *testing.T) {
 
 	// check prePrepare with verifier returning error
 	verifier := &mocks.Verifier{}
-	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(errors.New(""))
+	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil, errors.New(""))
 	view.Verifier = verifier
 	end = view.Start()
 
@@ -224,7 +224,7 @@ func TestBadPrepare(t *testing.T) {
 		commWG.Done()
 	})
 	verifier := &mocks.Verifier{}
-	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil)
+	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil, nil)
 	signer := &mocks.Signer{}
 	signer.On("SignProposal", mock.Anything).Return(&types.Signature{
 		Id:    4,
@@ -306,7 +306,7 @@ func TestBadCommit(t *testing.T) {
 	comm := &mocks.Comm{}
 	comm.On("Broadcast", mock.Anything)
 	verifier := &mocks.Verifier{}
-	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil)
+	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil, nil)
 	verifier.On("VerifyConsenterSig", mock.Anything, mock.Anything, mock.Anything).Return(errors.New(""))
 	signer := &mocks.Signer{}
 	signer.On("SignProposal", mock.Anything).Return(&types.Signature{
@@ -369,7 +369,7 @@ func TestNormalPath(t *testing.T) {
 		decidedSigs <- sigs
 	})
 	verifier := &mocks.Verifier{}
-	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil)
+	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil, nil)
 	verifier.On("VerifyConsenterSig", mock.Anything, mock.Anything, mock.Anything).Return(nil)
 	signer := &mocks.Signer{}
 	signer.On("SignProposal", mock.Anything).Return(&types.Signature{
@@ -475,7 +475,7 @@ func TestTwoSequences(t *testing.T) {
 		decidedSigs <- sigs
 	})
 	verifier := &mocks.Verifier{}
-	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil)
+	verifier.On("VerifyProposal", mock.Anything, mock.Anything).Return(nil, nil)
 	verifier.On("VerifyConsenterSig", mock.Anything, mock.Anything, mock.Anything).Return(nil)
 	signer := &mocks.Signer{}
 	signer.On("SignProposal", mock.Anything).Return(&types.Signature{

internal/bft/view_test.go

@@ -35,8 +35,8 @@ type Signer interface {
 }
 
 type Verifier interface {
-	VerifyProposal(proposal bft.Proposal, prevHeader []byte) error
-	VerifyRequest(val []byte) error
+	VerifyProposal(proposal bft.Proposal, prevHeader []byte) ([]bft.RequestInfo, error)
+	VerifyRequest(val []byte) (bft.RequestInfo, error)
 	VerifyConsenterSig(signature bft.Signature, prop bft.Proposal) error
 	VerificationSequence() uint64
 }