@@ -180,15 +180,13 @@ private boolean fulfillProposalRule3(ProposalMessage proposalMessage) {
180
180
boolean proposalExists = messageLog .getProposals ().getOrDefault (proposalMessage .getBlock (), new ArrayList <>()).stream ()
181
181
.filter (proposal -> proposal .getHeight () == height )
182
182
.filter (proposal -> proposal .getRound () == proposalMessage .getRound ())
183
- .filter (proposal -> proposal .getRound () == this .round )
184
183
.filter (proposal -> proposal .getReplicaId ().equals (proposer (height , proposalMessage .getRound ())))
185
184
.count () >= 1 ;
186
185
187
186
// AND 2f + 1 ⟨PRECOMMIT, hp, r, id(v)⟩
188
187
boolean enoughPrecommits = messageLog .getPrecommits ().getOrDefault (proposalMessage .getBlock (), new ArrayList <>()).stream ()
189
188
.filter (precommit -> precommit .getHeight () == height )
190
189
.filter (precommit -> precommit .getRound () == proposalMessage .getRound ())
191
- .filter (precommit -> precommit .getRound () == this .round )
192
190
.count () >= 2 * tolerance + 1 ;
193
191
194
192
// while decisionp[hp] = nil
@@ -538,13 +536,11 @@ protected void handlePrecommit(PrecommitMessage precommitMessage) {
538
536
private boolean fulfillProposalPrecommitRule (PrecommitMessage precommitMessage ) {
539
537
boolean enoughPrecommits = messageLog .getPrecommits ().getOrDefault (precommitMessage .getBlock (), new ArrayList <>()).stream ()
540
538
.filter (precommit -> precommit .getHeight () == this .height )
541
- .filter (precommit -> precommit .getRound () == this .round )
542
539
.count () >= 2 * tolerance + 1 ;
543
540
544
541
boolean proposalExists = messageLog .getProposals ().getOrDefault (precommitMessage .getBlock (), new ArrayList <>()).stream ()
545
542
.filter (proposal -> proposal .getHeight () == this .getHeight ())
546
543
.filter (proposal -> proposal .getRound () == precommitMessage .getRound ())
547
- .filter (proposal -> proposal .getRound () == this .round )
548
544
.filter (proposal -> proposal .getReplicaId ().equals (proposer (precommitMessage .getHeight (), precommitMessage .getRound ())))
549
545
.count () >= 1 ;
550
546
@@ -650,15 +646,8 @@ protected boolean validateMessage(MessagePayload message) {
650
646
651
647
// Check that the message height matches the current height
652
648
if (message instanceof GenericMessage ) {
653
- if (((GenericMessage ) message ).getHeight () < height || ((GenericMessage ) message ).getRound () < round ) {
654
- log .warning ("Message height or round mismatch: " + ((GenericMessage ) message ).getHeight ());
655
- return true ;
656
- }
657
- if (((GenericMessage ) message ).getAuthor ().equals (this .getId ())) {
658
- if (message instanceof ProposalMessage ) {
659
- log .warning ("Can accept proposals from itself: " + ((GenericMessage ) message ).getRound ());
660
- return false ;
661
- }
649
+ if (((GenericMessage ) message ).getHeight () < height ) {
650
+ log .warning ("Message height mismatch: " + ((GenericMessage ) message ).getHeight ());
662
651
return true ;
663
652
}
664
653
}
0 commit comments