Skip to content

refactor: use slices.Equal to simplify code #627

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 4, 2025
+4 −17
Merged

refactor: use slices.Equal to simplify code #627

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 0 additions & 14 deletions internal/bft/util.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,20 +540,6 @@ func pruneBlacklist(prevBlacklist []uint64, preparesFrom map[uint64]*protos.Prep
return newBlackList
}

func equalIntLists(a, b []uint64) bool {
if len(a) != len(b) {
return false
}

for i := range len(a) {
if a[i] != b[i] {
return false
}
}

return true
}

func CommitSignaturesDigest(sigs []*protos.Signature) []byte {
if len(sigs) == 0 {
return nil
Expand Down
7 changes: 4 additions & 3 deletions internal/bft/view.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ import (
"bytes"
"errors"
"fmt"
"slices"
"sync"
"sync/atomic"
"time"
Expand Down Expand Up @@ -665,7 +666,7 @@ func (v *View) verifyBlacklist(prevCommitSignatures []*protos.Signature, currVer
v.Logger.Debugf("Previous proposal verification sequence: %d, current verification sequence: %d", prevPropRaw.VerificationSequence, currVerificationSeq)
if prevPropRaw.VerificationSequence != currVerificationSeq {
// If there has been a reconfiguration, black list should remain the same
if !equalIntLists(prevProposalMetadata.BlackList, pendingBlacklist) {
if !slices.Equal(prevProposalMetadata.BlackList, pendingBlacklist) {
return fmt.Errorf("blacklist changed (%v --> %v) during reconfiguration", prevProposalMetadata.BlackList, pendingBlacklist)
}
v.Logger.Infof("Skipping verifying prev commits due to verification sequence advancing from %d to %d",
Expand All @@ -675,7 +676,7 @@ func (v *View) verifyBlacklist(prevCommitSignatures []*protos.Signature, currVer

if v.MembershipNotifier != nil && v.MembershipNotifier.MembershipChange() {
// If there has been a membership change, black list should remain the same
if !equalIntLists(prevProposalMetadata.BlackList, pendingBlacklist) {
if !slices.Equal(prevProposalMetadata.BlackList, pendingBlacklist) {
return fmt.Errorf("blacklist changed (%v --> %v) during membership change", prevProposalMetadata.BlackList, pendingBlacklist)
}
v.Logger.Infof("Skipping verifying prev commits due to membership change")
Expand Down Expand Up @@ -708,7 +709,7 @@ func (v *View) verifyBlacklist(prevCommitSignatures []*protos.Signature, currVer
}

expectedBlacklist := blacklist.computeUpdate()
if !equalIntLists(pendingBlacklist, expectedBlacklist) {
if !slices.Equal(pendingBlacklist, expectedBlacklist) {
return fmt.Errorf("proposed blacklist %v differs from expected %v blacklist", pendingBlacklist, expectedBlacklist)
}

Expand Down