small fixes

Author: illia-malachyn

cmd/access/index/reporter.go

@@ -28,7 +28,6 @@ import (
 	stateSyncCommands "github.com/onflow/flow-go/admin/commands/state_synchronization"
 	storageCommands "github.com/onflow/flow-go/admin/commands/storage"
 	"github.com/onflow/flow-go/cmd"
-	"github.com/onflow/flow-go/cmd/access/index"
 	"github.com/onflow/flow-go/consensus"
 	"github.com/onflow/flow-go/consensus/hotstuff"
 	"github.com/onflow/flow-go/consensus/hotstuff/committees"
@@ -296,7 +295,6 @@ type FlowAccessNodeBuilder struct {
 	ScriptExecutor             *backend.ScriptExecutor
 	RegistersAsyncStore        *execution.RegistersAsyncStore
 	EventsIndex                *backend.EventsIndex
-	Reporter                   *index.Reporter
 	TxResultsIndex             *backend.TransactionResultsIndex
 	IndexerDependencies        *cmd.DependencyList
 	collectionExecutedMetric   module.CollectionExecutedMetric
@@ -874,11 +872,6 @@ func (builder *FlowAccessNodeBuilder) BuildExecutionSyncComponents() *FlowAccess
 					builder.programCacheSize > 0,
 				)
 
-				err = builder.Reporter.Initialize(builder.ExecutionIndexer)
-				if err != nil {
-					return nil, err
-				}
-
 				err = builder.ScriptExecutor.Initialize(builder.ExecutionIndexer, scripts)
 				if err != nil {
 					return nil, err
@@ -1651,7 +1644,11 @@ func (builder *FlowAccessNodeBuilder) Build() (cmd.Node, error) {
 		}).
 		Module("transaction result error messages storage", func(node *cmd.NodeConfig) error {
 			if builder.storeTxResultErrorMessages {
-				builder.Storage.TransactionResultErrorMessages = bstorage.NewTransactionResultErrorMessages(node.Metrics.Cache, node.DB, bstorage.DefaultCacheSize)
+				builder.Storage.TransactionResultErrorMessages = bstorage.NewTransactionResultErrorMessages(
+					node.Metrics.Cache,
+					node.DB,
+					bstorage.DefaultCacheSize,
+				)
 			}
 
 			return nil
@@ -1709,12 +1706,6 @@ func (builder *FlowAccessNodeBuilder) Build() (cmd.Node, error) {
 				return nil, fmt.Errorf("transaction result query mode 'compare' is not supported")
 			}
 
-			// If execution data syncing and indexing is disabled, pass nil indexReporter
-			var indexReporter state_synchronization.IndexReporter
-			if builder.executionDataSyncEnabled && builder.executionDataIndexingEnabled {
-				indexReporter = builder.Reporter
-			}
-
 			preferredENIdentifiers, err := commonrpc.IdentifierList(backendConfig.PreferredExecutionNodeIDs)
 			if err != nil {
 				return nil, fmt.Errorf("failed to convert node id string to Flow Identifier for preferred EN map: %w", err)
@@ -1760,7 +1751,6 @@ func (builder *FlowAccessNodeBuilder) Build() (cmd.Node, error) {
 				TxResultQueryMode:          txResultQueryMode,
 				TxResultsIndex:             builder.TxResultsIndex,
 				LastFullBlockHeight:        lastFullBlockHeight,
-				IndexReporter:              indexReporter,
 				ExecNodeIdentitiesProvider: builder.ExecNodeIdentitiesProvider,
 			})
 			if err != nil {

cmd/access/node_builder/access_node_builder.go

@@ -30,7 +30,6 @@ import (
 	"github.com/onflow/flow-go/admin/commands"
 	stateSyncCommands "github.com/onflow/flow-go/admin/commands/state_synchronization"
 	"github.com/onflow/flow-go/cmd"
-	"github.com/onflow/flow-go/cmd/access/index"
 	"github.com/onflow/flow-go/consensus"
 	"github.com/onflow/flow-go/consensus/hotstuff"
 	"github.com/onflow/flow-go/consensus/hotstuff/committees"
@@ -245,7 +244,6 @@ type ObserverServiceBuilder struct {
 	ExecutionDataStore      execution_data.ExecutionDataStore
 
 	RegistersAsyncStore *execution.RegistersAsyncStore
-	Reporter            *index.Reporter
 	EventsIndex         *backend.EventsIndex
 
 	// available until after the network has started. Hence, a factory function that needs to be called just before
@@ -1564,12 +1562,6 @@ func (builder *ObserverServiceBuilder) enqueueRPCServer() {
 			),
 		}
 
-		// If execution data syncing and indexing is disabled, pass nil indexReporter
-		var indexReporter state_synchronization.IndexReporter
-		if builder.executionDataSyncEnabled && builder.executionDataIndexingEnabled {
-			indexReporter = builder.Reporter
-		}
-
 		preferredENIdentifiers, err := commonrpc.IdentifierList(backendConfig.PreferredExecutionNodeIDs)
 		if err != nil {
 			return nil, fmt.Errorf("failed to convert node id string to Flow Identifier for preferred EN map: %w", err)
@@ -1604,7 +1596,6 @@ func (builder *ObserverServiceBuilder) enqueueRPCServer() {
 			Log:                        node.Logger,
 			SnapshotHistoryLimit:       backend.DefaultSnapshotHistoryLimit,
 			Communicator:               backend.NewNodeCommunicator(backendConfig.CircuitBreakerConfig.Enabled),
-			IndexReporter:              indexReporter,
 			ExecNodeIdentitiesProvider: execNodeIdentitiesProvider,
 		})
 		if err != nil {

cmd/observer/node_builder/observer_builder.go

@@ -148,7 +148,7 @@ clean-data:
 	rm -rf ./bootstrap
 	rm -rf ./trie
 	rm -rf ./profiler
-	rm -f ./targets.nodes.json
+	rm -rf ./targets.nodes.json
 	rm -f ./docker-compose.nodes.yml
 
 # deletes the stopped environment-clean container(s) - running this command inside another target doesn't delete the containers so it's isolated to run in a separate target