re-enable SN epoch integration test

- fix a bug introduced in #3947,
  which resulted in some QCs being un-queriable

Author: jordanschalm

integration/tests/epochs/epoch_join_and_leave_sn_test.go

@@ -6,7 +6,6 @@ import (
 	"github.com/stretchr/testify/suite"
 
 	"github.com/onflow/flow-go/model/flow"
-	"github.com/onflow/flow-go/utils/unittest"
 )
 
 func TestEpochJoinAndLeaveSN(t *testing.T) {
@@ -20,6 +19,6 @@ type EpochJoinAndLeaveSNSuite struct {
 // TestEpochJoinAndLeaveSN should update consensus nodes and assert healthy network conditions
 // after the epoch transition completes. See health check function for details.
 func (s *EpochJoinAndLeaveSNSuite) TestEpochJoinAndLeaveSN() {
-	unittest.SkipUnless(s.T(), unittest.TEST_FLAKY, "fails on CI regularly")
+	//unittest.SkipUnless(s.T(), unittest.TEST_FLAKY, "fails on CI regularly")
 	s.runTestEpochJoinAndLeave(flow.RoleConsensus, s.assertNetworkHealthyAfterSNChange)
 }

integration/tests/epochs/suite.go

@@ -672,7 +672,7 @@ func (s *Suite) runTestEpochJoinAndLeave(role flow.Role, checkNetworkHealth node
 	s.TimedLogf("retrieved header after entering EpochSetup phase: root_height=%d, root_view=%d, segment_heights=[%d-%d], segment_views=[%d-%d]",
 		header.Height, header.View,
 		segment.Sealed().Header.Height, segment.Highest().Header.Height,
-		segment.Sealed().Header.View, segment.Highest().Header.Height)
+		segment.Sealed().Header.View, segment.Highest().Header.View)
 
 	testContainer.WriteRootSnapshot(rootSnapshot)
 	testContainer.Container.Start(s.ctx)

state/protocol/badger/state.go

@@ -194,11 +194,15 @@ func (state *State) bootstrapSealingSegment(segment *flow.SealingSegment, head *
 			height := block.Header.Height
 			err := state.blocks.StoreTx(block)(tx)
 			if err != nil {
-				return fmt.Errorf("could not insert root block: %w", err)
+				return fmt.Errorf("could not insert SealingSegment extra block: %w", err)
 			}
 			err = transaction.WithTx(operation.IndexBlockHeight(height, blockID))(tx)
 			if err != nil {
-				return fmt.Errorf("could not index root block segment (id=%x): %w", blockID, err)
+				return fmt.Errorf("could not index SealingSegment extra block (id=%x): %w", blockID, err)
+			}
+			err = state.qcs.StoreTx(block.Header.QuorumCertificate())(tx)
+			if err != nil {
+				return fmt.Errorf("could not store qc for SealingSegment extra block (id=%x): %w", blockID, err)
 			}
 		}
 
@@ -208,11 +212,15 @@ func (state *State) bootstrapSealingSegment(segment *flow.SealingSegment, head *
 
 			err := state.blocks.StoreTx(block)(tx)
 			if err != nil {
-				return fmt.Errorf("could not insert root block: %w", err)
+				return fmt.Errorf("could not insert SealingSegment block: %w", err)
 			}
 			err = transaction.WithTx(operation.IndexBlockHeight(height, blockID))(tx)
 			if err != nil {
-				return fmt.Errorf("could not index root block segment (id=%x): %w", blockID, err)
+				return fmt.Errorf("could not index SealingSegment block (id=%x): %w", blockID, err)
+			}
+			err = state.qcs.StoreTx(block.Header.QuorumCertificate())(tx)
+			if err != nil {
+				return fmt.Errorf("could not store qc for SealingSegment block (id=%x): %w", blockID, err)
 			}
 
 			// index the latest seal as of this block