Updated identities ordering for some tests. Changed how root QC are v…

…alidated
onflow · Oct 4, 2023 · 3dd3c4d · 3dd3c4d
1 parent fe04abc
commit 3dd3c4d
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/consensus/follower_test.go b/consensus/follower_test.go
@@ -16,6 +16,7 @@ import (
 	mockhotstuff "github.com/onflow/flow-go/consensus/hotstuff/mocks"
 	"github.com/onflow/flow-go/consensus/hotstuff/model"
 	"github.com/onflow/flow-go/model/flow"
+	"github.com/onflow/flow-go/model/flow/order"
 	"github.com/onflow/flow-go/module/irrecoverable"
 	"github.com/onflow/flow-go/module/metrics"
 	mockmodule "github.com/onflow/flow-go/module/mock"
@@ -75,7 +76,7 @@ type HotStuffFollowerSuite struct {
 // SetupTest initializes all the components needed for the Follower.
 // The follower itself is instantiated in method BeforeTest
 func (s *HotStuffFollowerSuite) SetupTest() {
-	identities := unittest.IdentityListFixture(4, unittest.WithRole(flow.RoleConsensus))
+	identities := unittest.IdentityListFixture(4, unittest.WithRole(flow.RoleConsensus)).Sort(order.Canonical[flow.Identity])
 	s.mockConsensus = &MockConsensus{identities: identities}
 
 	// mock storage headers

diff --git a/consensus/hotstuff/signature/packer_test.go b/consensus/hotstuff/signature/packer_test.go
@@ -12,6 +12,7 @@ import (
 	"github.com/onflow/flow-go/consensus/hotstuff/mocks"
 	"github.com/onflow/flow-go/consensus/hotstuff/model"
 	"github.com/onflow/flow-go/model/flow"
+	"github.com/onflow/flow-go/model/flow/order"
 	"github.com/onflow/flow-go/module/signature"
 	"github.com/onflow/flow-go/utils/unittest"
 )
@@ -54,7 +55,7 @@ func makeBlockSigData(committee flow.IdentitySkeletonList) *hotstuff.BlockSignat
 // aggregated random beacon sigs are from [D,F]
 func TestPackUnpack(t *testing.T) {
 	// prepare data for testing
-	committee := unittest.IdentityListFixture(6, unittest.WithRole(flow.RoleConsensus)).ToSkeleton()
+	committee := unittest.IdentityListFixture(6, unittest.WithRole(flow.RoleConsensus)).Sort(order.Canonical[flow.Identity]).ToSkeleton()
 	view := rand.Uint64()
 	blockSigData := makeBlockSigData(committee)
 

diff --git a/consensus/hotstuff/validator/validator_test.go b/consensus/hotstuff/validator/validator_test.go
@@ -19,6 +19,7 @@ import (
 	"github.com/onflow/flow-go/consensus/hotstuff/model"
 	"github.com/onflow/flow-go/model/flow"
 	"github.com/onflow/flow-go/model/flow/filter"
+	"github.com/onflow/flow-go/model/flow/order"
 	"github.com/onflow/flow-go/utils/unittest"
 )
 
@@ -46,7 +47,7 @@ type ProposalSuite struct {
 func (ps *ProposalSuite) SetupTest() {
 	// the leader is a random node for now
 	ps.finalized = uint64(rand.Uint32() + 1)
-	ps.participants = unittest.IdentityListFixture(8, unittest.WithRole(flow.RoleConsensus))
+	ps.participants = unittest.IdentityListFixture(8, unittest.WithRole(flow.RoleConsensus)).Sort(order.Canonical[flow.Identity])
 	ps.leader = &ps.participants[0].IdentitySkeleton
 
 	// the parent is the last finalized block, followed directly by a block from the leader
@@ -584,7 +585,7 @@ func (qs *QCSuite) SetupTest() {
 	qs.participants = unittest.IdentityListFixture(10,
 		unittest.WithRole(flow.RoleConsensus),
 		unittest.WithWeight(1),
-	).ToSkeleton()
+	).Sort(order.Canonical[flow.Identity]).ToSkeleton()
 
 	// signers are a qualified majority at 7
 	qs.signers = qs.participants[:7]
@@ -742,7 +743,7 @@ func (s *TCSuite) SetupTest() {
 	s.participants = unittest.IdentityListFixture(10,
 		unittest.WithRole(flow.RoleConsensus),
 		unittest.WithWeight(1),
-	).ToSkeleton()
+	).Sort(order.Canonical[flow.Identity]).ToSkeleton()
 
 	// signers are a qualified majority at 7
 	s.signers = s.participants[:7]

diff --git a/module/signature/signer_indices_test.go b/module/signature/signer_indices_test.go
@@ -23,7 +23,7 @@ import (
 //  2. for the decoding step, we offer an optimized convenience function to directly
 //     decode to full identities: Indices --decode--> Identities
 func TestEncodeDecodeIdentities(t *testing.T) {
-	canonicalIdentities := unittest.IdentityListFixture(20).ToSkeleton()
+	canonicalIdentities := unittest.IdentityListFixture(20).Sort(order.Canonical[flow.Identity]).ToSkeleton()
 	canonicalIdentifiers := canonicalIdentities.NodeIDs()
 	for s := 0; s < 20; s++ {
 		for e := s; e < 20; e++ {

diff --git a/state/protocol/badger/validity.go b/state/protocol/badger/validity.go
@@ -305,7 +305,7 @@ func IsValidRootSnapshotQCs(snap protocol.Snapshot) error {
 // validateRootQC performs validation of root QC
 // Returns nil on success
 func validateRootQC(snap protocol.Snapshot) error {
-	identities, err := snap.Identities(filter.Adapt(filter.IsAllowedConsensusCommitteeMember))
+	identities, err := snap.Identities(filter.IsVotingConsensusCommitteeMember)
 	if err != nil {
 		return fmt.Errorf("could not get root snapshot identities: %w", err)
 	}