Don't send more commits upon second triggering of prepare quorum (#322)

* hasQuorumBefore

* fix test

* tests.json

qbft/commit.go

@@ -59,24 +59,6 @@ func aggregateCommitMsgs(msgs []*SignedMessage, fullData []byte) (*SignedMessage
 	return ret, nil
 }
 
-// didSendCommitForHeightAndRound returns true if sent commit msg for specific Height and round
-/**
-!exists m :: && m in current.messagesReceived
-                            && m.Commit?
-                            && var uPayload := m.commitPayload.unsignedPayload;
-                            && uPayload.Height == |current.blockchain|
-                            && uPayload.round == current.round
-                            && recoverSignedCommitAuthor(m.commitPayload) == current.id
-*/
-func didSendCommitForHeightAndRound(state *State, commitMsgContainer *MsgContainer) bool {
-	for _, msg := range commitMsgContainer.MessagesForRound(state.Round) {
-		if msg.MatchedSigners([]types.OperatorID{state.Share.OperatorID}) {
-			return true
-		}
-	}
-	return false
-}
-
 // CreateCommit
 /**
 Commit(

qbft/instance.go

@@ -112,7 +112,7 @@ func (i *Instance) ProcessMsg(msg *SignedMessage) (decided bool, decidedValue []
 		case ProposalMsgType:
 			return i.uponProposal(msg, i.State.ProposeContainer)
 		case PrepareMsgType:
-			return i.uponPrepare(msg, i.State.PrepareContainer, i.State.CommitContainer)
+			return i.uponPrepare(msg, i.State.PrepareContainer)
 		case CommitMsgType:
 			decided, decidedValue, aggregatedCommit, err = i.UponCommit(msg, i.State.CommitContainer)
 			if decided {

qbft/prepare.go

@@ -8,10 +8,8 @@ import (
 
 // uponPrepare process prepare message
 // Assumes prepare message is valid!
-func (i *Instance) uponPrepare(
-	signedPrepare *SignedMessage,
-	prepareMsgContainer,
-	commitMsgContainer *MsgContainer) error {
+func (i *Instance) uponPrepare(signedPrepare *SignedMessage, prepareMsgContainer *MsgContainer) error {
+	hasQuorumBefore := HasQuorum(i.State.Share, prepareMsgContainer.MessagesForRound(i.State.Round))
 
 	addedMsg, err := prepareMsgContainer.AddFirstMsgForSignerAndRound(signedPrepare)
 	if err != nil {
@@ -21,12 +19,12 @@ func (i *Instance) uponPrepare(
 		return nil // uponPrepare was already called
 	}
 
-	if !HasQuorum(i.State.Share, prepareMsgContainer.MessagesForRound(i.State.Round)) {
-		return nil // no quorum yet
+	if hasQuorumBefore {
+		return nil // already moved to commit stage
 	}
 
-	if didSendCommitForHeightAndRound(i.State, commitMsgContainer) {
-		return nil // already moved to commit stage
+	if !HasQuorum(i.State.Share, prepareMsgContainer.MessagesForRound(i.State.Round)) {
+		return nil // no quorum yet
 	}
 
 	proposedRoot := i.State.ProposalAcceptedForCurrentRound.Message.Root

qbft/spectest/tests/prepare/prepare_quorum_triggered_twice_late_commit.go

@@ -32,8 +32,6 @@ func PrepareQuorumTriggeredTwiceLateCommit() tests.SpecTest {
 		OutputMessages: []*qbft.SignedMessage{
 			testingutils.TestingPrepareMessage(ks.Shares[1], 1),
 			testingutils.TestingCommitMessage(ks.Shares[1], 1),
-			// ISSUE 214: we should have only commit broadcasted
-			testingutils.TestingCommitMessage(ks.Shares[1], 1),
 		},
 	}
 }