misc adjustments

protocol/v2/qbft/instance/proposal.go

@@ -139,30 +139,6 @@ func isValidProposal(
 	return errors.New("proposal is not valid with current state")
 }
 
-func IsProposalJustification(
-	config qbft.IConfig,
-	committeeMember *spectypes.CommitteeMember,
-	roundChangeMsgs []*specqbft.ProcessingMessage,
-	prepareMsgs []*specqbft.ProcessingMessage,
-	height specqbft.Height,
-	round specqbft.Round,
-	fullData []byte,
-) error {
-	return isProposalJustification(
-		&specqbft.State{
-			CommitteeMember: committeeMember,
-			Height:          height,
-		},
-		config,
-		roundChangeMsgs,
-		prepareMsgs,
-		height,
-		round,
-		fullData,
-		func(data []byte) error { return nil },
-	)
-}
-
 // isProposalJustification returns nil if the proposal and round change messages are valid and justify a proposal message for the provided round, value and leader
 func isProposalJustification(
 	state *specqbft.State,
@@ -211,7 +187,6 @@ func isProposalJustification(
 		if !previouslyPrepared {
 			return nil
 		} else {
-
 			// check prepare quorum
 			if !specqbft.HasQuorum(state.CommitteeMember, prepareMsgs) {
 				return errors.New("prepares has no quorum")

protocol/v2/qbft/instance/round_change.go

@@ -52,7 +52,8 @@ func (i *Instance) uponRoundChange(
 		instanceStartValue,
 		msg,
 		roundChangeMsgContainer,
-		valCheck)
+		valCheck,
+	)
 	if err != nil {
 		return errors.Wrap(err, "could not get proposal justification for leading round")
 	}
@@ -145,10 +146,13 @@ func hasReceivedPartialQuorum(state *specqbft.State, roundChangeMsgContainer *sp
 	return specqbft.HasPartialQuorum(state.CommitteeMember, rc), rc
 }
 
-// hasReceivedProposalJustificationForLeadingRound returns
-// if first round or not received round change msgs with prepare justification - returns first rc msg in container and value to propose
-// if received round change msgs with prepare justification - returns the highest prepare justification round change msg and value to propose
-// (all the above considering the operator is a leader for the round
+// hasReceivedProposalJustificationForLeadingRound (if operator is a leader for the round):
+//   - if first round or not received round change msgs with prepare justification
+//     returns first round change msg in container and value to propose
+//   - if received round change msgs with prepare justification returns the highest
+//     prepare justification round change msg and value to propose
+//
+// If operator is not a leader for the round - return nil, nil, nil.
 func hasReceivedProposalJustificationForLeadingRound(
 	state *specqbft.State,
 	config qbft.IConfig,
@@ -164,7 +168,7 @@ func hasReceivedProposalJustificationForLeadingRound(
 	}
 
 	// Important!
-	// We iterate on all round chance msgs for liveliness in case the last round change msg is malicious.
+	// We iterate on all round change msgs for liveliness in case the last round change msg is malicious.
 	for _, containerRoundChangeMessage := range roundChanges {
 		// Chose proposal value.
 		// If justifiedRoundChangeMsg has no prepare justification chose state value
@@ -220,7 +224,8 @@ func isProposalJustificationForLeadingRound(
 		roundChangeJustifications,
 		roundChangeMsg.QBFTMessage.Round,
 		value,
-		valCheck); err != nil {
+		valCheck,
+	); err != nil {
 		return err
 	}
 
@@ -383,7 +388,7 @@ func highestPrepared(roundChanges []*specqbft.ProcessingMessage) (*specqbft.Proc
 	return ret, nil
 }
 
-// returns the min round number out of the signed round change messages and the current round
+// returns the min round number out of the signed round change messages
 func minRound(roundChangeMsgs []*specqbft.ProcessingMessage) specqbft.Round {
 	ret := specqbft.NoRound
 	for _, msg := range roundChangeMsgs {