Skip to content

Commit 2dee6c6

Browse files
authored
Revert "Get only valid blocks. (#4628)" (#4637)
This reverts commit f0dc999.
1 parent f0dc999 commit 2dee6c6

File tree

2 files changed

+3
-14
lines changed

2 files changed

+3
-14
lines changed

consensus/fbft_log.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -222,20 +222,11 @@ func (log *FBFTLog) GetMessagesByTypeSeqViewHash(typ msg_pb.MessageType, blockNu
222222
return found
223223
}
224224

225-
func (log *FBFTLog) all(filters []func(*FBFTMessage, *FBFTLog) bool, value *FBFTMessage) bool {
226-
for _, filter := range filters {
227-
if !filter(value, log) {
228-
return false
229-
}
230-
}
231-
return true
232-
}
233-
234225
// GetMessagesByTypeSeq returns pbft messages with matching type, blockNum
235-
func (log *FBFTLog) GetMessagesByTypeSeq(typ msg_pb.MessageType, blockNum uint64, filters ...func(message *FBFTMessage, log *FBFTLog) bool) []*FBFTMessage {
226+
func (log *FBFTLog) GetMessagesByTypeSeq(typ msg_pb.MessageType, blockNum uint64) []*FBFTMessage {
236227
var found []*FBFTMessage
237228
for _, msg := range log.messages {
238-
if msg.MessageType == typ && msg.BlockNum == blockNum && msg.Verified && log.all(filters, msg) {
229+
if msg.MessageType == typ && msg.BlockNum == blockNum && msg.Verified {
239230
found = append(found, msg)
240231
}
241232
}

consensus/view_change_msg.go

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ func (consensus *Consensus) constructViewChangeMessage(priKey *bls.PrivateKeyWra
3333
}
3434

3535
preparedMsgs := consensus.fBFTLog.GetMessagesByTypeSeq(
36-
msg_pb.MessageType_PREPARED, consensus.getBlockNum(), func(message *FBFTMessage, log *FBFTLog) bool {
37-
return log.IsBlockVerified(message.BlockHash)
38-
},
36+
msg_pb.MessageType_PREPARED, consensus.getBlockNum(),
3937
)
4038
preparedMsg := consensus.fBFTLog.FindMessageByMaxViewID(preparedMsgs)
4139

0 commit comments

Comments
 (0)