fix cluster tests

onflow · Mar 29, 2022 · d5bc29f · d5bc29f
1 parent 3cb260e
commit d5bc29f
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 14 deletions.
diff --git a/cmd/util/cmd/epochs/cmd/reset_test.go b/cmd/util/cmd/epochs/cmd/reset_test.go
@@ -30,7 +30,7 @@ func TestReset_LocalSnapshot(t *testing.T) {
 		unittest.RunWithTempDir(t, func(bootDir string) {
 
 			// create a root snapshot
-			rootSnapshot := unittest.RootSnapshotFixture(unittest.IdentityListFixture(10))
+			rootSnapshot := unittest.RootSnapshotFixture(unittest.IdentityListFixture(10, unittest.WithAllRoles()))
 
 			// write snapshot to correct path in bootDir
 			err := writeRootSnapshot(bootDir, rootSnapshot)
@@ -62,7 +62,7 @@ func TestReset_LocalSnapshot(t *testing.T) {
 		unittest.RunWithTempDir(t, func(bootDir string) {
 
 			// create a root snapshot
-			rootSnapshot := unittest.RootSnapshotFixture(unittest.IdentityListFixture(10))
+			rootSnapshot := unittest.RootSnapshotFixture(unittest.IdentityListFixture(10, unittest.WithAllRoles()))
 
 			// write snapshot to correct path in bootDir
 			err := writeRootSnapshot(bootDir, rootSnapshot)

diff --git a/engine/consensus/sealing/engine_test.go b/engine/consensus/sealing/engine_test.go
@@ -53,7 +53,7 @@ func (s *SealingEngineSuite) SetupTest() {
 		},
 	)
 
-	rootHeader, err := unittest.RootSnapshotFixture(unittest.IdentityListFixture(5)).Head()
+	rootHeader, err := unittest.RootSnapshotFixture(unittest.IdentityListFixture(5, unittest.WithAllRoles())).Head()
 	require.NoError(s.T(), err)
 
 	s.engine = &Engine{

diff --git a/model/flow/sealing_segment_test.go b/model/flow/sealing_segment_test.go
@@ -258,7 +258,7 @@ func (suite *SealingSegmentSuite) TestBuild_MultipleFinalBlockSeals() {
 // TestBuild_RootSegment tests we can build a valid root sealing segment.
 func (suite *SealingSegmentSuite) TestBuild_RootSegment() {
 
-	root, result, seal := unittest.BootstrapFixture(unittest.IdentityListFixture(5))
+	root, result, seal := unittest.BootstrapFixture(unittest.IdentityListFixture(5, unittest.WithAllRoles()))
 	suite.sealsByBlockID[root.ID()] = seal
 	suite.addResult(result)
 	err := suite.builder.AddBlock(root)
@@ -277,7 +277,7 @@ func (suite *SealingSegmentSuite) TestBuild_RootSegment() {
 // a single-block sealing segment with a block view not equal to 0.
 func (suite *SealingSegmentSuite) TestBuild_RootSegmentWrongView() {
 
-	root, result, seal := unittest.BootstrapFixture(unittest.IdentityListFixture(5))
+	root, result, seal := unittest.BootstrapFixture(unittest.IdentityListFixture(5, unittest.WithAllRoles()))
 	root.Header.View = 10 // invalid root block view
 	suite.sealsByBlockID[root.ID()] = seal
 	suite.addResult(result)

diff --git a/state/protocol/inmem/encodable_test.go b/state/protocol/inmem/encodable_test.go
@@ -17,7 +17,7 @@ import (
 // in particular with differing public key implementations
 func TestEncodeDecode(t *testing.T) {
 
-	participants := unittest.IdentityListFixture(10)
+	participants := unittest.IdentityListFixture(10, unittest.WithAllRoles())
 	// add a partner, which has its key represented as an encodable wrapper
 	// type rather than the direct crypto type
 	partner := unittest.IdentityFixture(unittest.WithKeys, func(identity *flow.Identity) {
@@ -41,7 +41,7 @@ func TestEncodeDecode(t *testing.T) {
 // TestStrippedEncodeDecode tests that the protocol state snapshot can be encoded to JSON skipping the network address
 // and decoded back successfully
 func TestStrippedEncodeDecode(t *testing.T) {
-	participants := unittest.IdentityListFixture(10)
+	participants := unittest.IdentityListFixture(10, unittest.WithAllRoles())
 	initialSnapshot := unittest.RootSnapshotFixture(participants)
 
 	// encode the snapshot

diff --git a/state/protocol/util_test.go b/state/protocol/util_test.go
@@ -12,14 +12,14 @@ import (
 
 func TestIsSporkRootSnapshot(t *testing.T) {
 	t.Run("spork root", func(t *testing.T) {
-		snapshot := unittest.RootSnapshotFixture(unittest.IdentityListFixture(10))
+		snapshot := unittest.RootSnapshotFixture(unittest.IdentityListFixture(10, unittest.WithAllRoles()))
 		isSporkRoot, err := protocol.IsSporkRootSnapshot(snapshot)
 		require.NoError(t, err)
 		assert.True(t, isSporkRoot)
 	})
 
 	t.Run("other snapshot", func(t *testing.T) {
-		snapshot := unittest.RootSnapshotFixture(unittest.IdentityListFixture(10))
+		snapshot := unittest.RootSnapshotFixture(unittest.IdentityListFixture(10, unittest.WithAllRoles()))
 		snapshot.Encodable().SealingSegment.Blocks = unittest.BlockFixtures(5)
 		isSporkRoot, err := protocol.IsSporkRootSnapshot(snapshot)
 		require.NoError(t, err)

diff --git a/utils/unittest/fixtures.go b/utils/unittest/fixtures.go
@@ -1035,11 +1035,6 @@ func IdentityListFixture(n int, opts ...func(*flow.Identity)) flow.IdentityList
 	for i := 0; i < n; i++ {
 		identity := IdentityFixture()
 		identity.Address = fmt.Sprintf("%x@flow.com:1234", identity.NodeID)
-		// ensure to have at least one collection node to create collection cluster
-		// otherwise, the assignment would have empty cluster
-		if i%4 == 3 {
-			identity.Role = flow.RoleCollection
-		}
 		for _, opt := range opts {
 			opt(identity)
 		}