fix cluster tests

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

Hide file tree

Showing 3 changed files with 4 additions and 9 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/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/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)
 		}