move enableStorehouse to caller

Author: zhangchiqing

cmd/execution_builder.go

@@ -883,14 +883,19 @@ func (exeNode *ExecutionNode) LoadStopControl(
 func (exeNode *ExecutionNode) LoadRegisterStore(
 	node *NodeConfig,
 ) error {
+	if !exeNode.exeConf.enableStorehouse {
+		node.Logger.Info().Msg("register store disabled")
+		exeNode.registerStore = nil
+		return nil
+	}
+
 	registerStore, closer, err := storehouse.LoadRegisterStore(
 		node.Logger,
 		node.State,
 		node.Storage.Headers,
 		node.ProtocolEvents,
 		node.LastFinalizedHeader.Height,
 		exeNode.collector,
-		exeNode.exeConf.enableStorehouse,
 		exeNode.exeConf.registerDir,
 		exeNode.exeConf.triedir,
 		exeNode.exeConf.importCheckpointWorkerCount,

engine/execution/storehouse/background_indexer_factory.go

@@ -39,43 +39,6 @@ type ImportRegistersFromCheckpoint func(logger zerolog.Logger, checkpointFile st
 // LoadRegisterStore creates and initializes a RegisterStore.
 // It handles opening the pebble database, bootstrapping if needed, and creating the RegisterStore.
 func LoadRegisterStore(
-	log zerolog.Logger,
-	state protocol.State,
-	headers storageerr.Headers,
-	protocolEvents *events.Distributor,
-	lastFinalizedHeight uint64,
-	collector module.ExecutionMetrics,
-	enableStorehouse bool,
-	registerDir string,
-	triedir string,
-	importCheckpointWorkerCount int,
-	importFunc ImportRegistersFromCheckpoint,
-) (
-	*RegisterStore,
-	io.Closer,
-	error,
-) {
-	if !enableStorehouse {
-		log.Info().Msg("register store disabled")
-		return nil, nil, nil
-	}
-	return loadRegisterStore(
-		log,
-		state,
-		headers,
-		protocolEvents,
-		lastFinalizedHeight,
-		collector,
-		registerDir,
-		triedir,
-		importCheckpointWorkerCount,
-		importFunc,
-	)
-}
-
-// loadRegisterStore is an internal function that creates and initializes a RegisterStore.
-// it is reused by both LoadRegisterStore and LoadBackgroundIndexerEngine.
-func loadRegisterStore(
 	log zerolog.Logger,
 	state protocol.State,
 	headers storageerr.Headers,
@@ -205,7 +168,7 @@ func LoadBackgroundIndexerEngine(
 	// and not block the component initialization
 	bootstrapper := func(ctx context.Context) (*BackgroundIndexer, io.Closer, error) {
 		// Load register store for background indexing
-		registerStore, closer, err := loadRegisterStore(
+		registerStore, closer, err := LoadRegisterStore(
 			log,
 			state,
 			headers,

engine/execution/storehouse/background_indexer_factory_test.go

@@ -35,47 +35,11 @@ import (
 	"github.com/onflow/flow-go/utils/unittest"
 )
 
-// TestLoadRegisterStore_Disabled tests that LoadRegisterStore returns nil when enableStorehouse is false
-func TestLoadRegisterStore_Disabled(t *testing.T) {
-	t.Parallel()
-
-	log := unittest.Logger()
-	state := protocolmock.NewState(t)
-	headers := storagemock.NewHeaders(t)
-	protocolEvents := events.NewDistributor()
-	lastFinalizedHeight := uint64(100)
-	collector := &metrics.NoopCollector{}
-	enableStorehouse := false
-	registerDir := t.TempDir()
-	triedir := t.TempDir()
-	importCheckpointWorkerCount := 1
-	var importFunc storehouse.ImportRegistersFromCheckpoint = nil
-
-	registerStore, closer, err := storehouse.LoadRegisterStore(
-		log,
-		state,
-		headers,
-		protocolEvents,
-		lastFinalizedHeight,
-		collector,
-		enableStorehouse,
-		registerDir,
-		triedir,
-		importCheckpointWorkerCount,
-		importFunc,
-	)
-
-	require.NoError(t, err)
-	require.Nil(t, registerStore)
-	require.Nil(t, closer)
-}
-
 // TestLoadBackgroundIndexerEngine_StorehouseEnabled tests that LoadBackgroundIndexerEngine returns nil when enableStorehouse is true
 func TestLoadBackgroundIndexerEngine_StorehouseEnabled(t *testing.T) {
 	t.Parallel()
 
 	log := unittest.Logger()
-	enableStorehouse := true
 	enableBackgroundStorehouseIndexing := true
 	state := protocolmock.NewState(t)
 	headers := storagemock.NewHeaders(t)
@@ -93,7 +57,6 @@ func TestLoadBackgroundIndexerEngine_StorehouseEnabled(t *testing.T) {
 	heightsPerSecond := uint64(10)
 	engine, created, err := storehouse.LoadBackgroundIndexerEngine(
 		log,
-		enableStorehouse,
 		enableBackgroundStorehouseIndexing,
 		state,
 		headers,
@@ -121,7 +84,6 @@ func TestLoadBackgroundIndexerEngine_BackgroundIndexingDisabled(t *testing.T) {
 	t.Parallel()
 
 	log := unittest.Logger()
-	enableStorehouse := false
 	enableBackgroundStorehouseIndexing := false
 	state := protocolmock.NewState(t)
 	headers := storagemock.NewHeaders(t)
@@ -139,7 +101,6 @@ func TestLoadBackgroundIndexerEngine_BackgroundIndexingDisabled(t *testing.T) {
 	heightsPerSecond := uint64(10)
 	engine, created, err := storehouse.LoadBackgroundIndexerEngine(
 		log,
-		enableStorehouse,
 		enableBackgroundStorehouseIndexing,
 		state,
 		headers,
@@ -173,7 +134,6 @@ func TestLoadBackgroundIndexerEngine_Bootstrap(t *testing.T) {
 	)
 
 	log := unittest.Logger()
-	enableStorehouse := false
 	enableBackgroundStorehouseIndexing := true
 
 	// Set up protocol state with finalized blocks
@@ -255,7 +215,6 @@ func TestLoadBackgroundIndexerEngine_Bootstrap(t *testing.T) {
 	// Create background indexer engine
 	engine, created, err := storehouse.LoadBackgroundIndexerEngine(
 		log,
-		enableStorehouse,
 		enableBackgroundStorehouseIndexing,
 		state,
 		headers,
@@ -321,7 +280,6 @@ func TestLoadBackgroundIndexerEngine_Bootstrap(t *testing.T) {
 		protocolEvents,
 		registerStoreStart,
 		collector,
-		true, // enableStorehouse
 		registerDir,
 		triedir,
 		importCheckpointWorkerCount,
@@ -356,7 +314,6 @@ func TestLoadBackgroundIndexerEngine_Indexing(t *testing.T) {
 	)
 
 	log := unittest.Logger()
-	enableStorehouse := false
 	enableBackgroundStorehouseIndexing := true
 
 	// Set up protocol state
@@ -503,7 +460,6 @@ func TestLoadBackgroundIndexerEngine_Indexing(t *testing.T) {
 	// Create background indexer engine
 	engine, created, err := storehouse.LoadBackgroundIndexerEngine(
 		log,
-		enableStorehouse,
 		enableBackgroundStorehouseIndexing,
 		state,
 		headers,
@@ -616,7 +572,6 @@ indexingComplete:
 		protocolEvents,
 		targetHeight, // Use targetHeight instead of registerStoreStart so FinalizedReader knows about all blocks
 		collector,
-		true, // enableStorehouse
 		registerDir,
 		triedir,
 		importCheckpointWorkerCount,