FEAT: Integrate delegated+staked factory in runType comps

cmd/sovereignnode/sovereignNodeRunner.go

@@ -65,7 +65,6 @@ import (
 	"github.com/multiversx/mx-chain-go/health"
 	"github.com/multiversx/mx-chain-go/node"
 	"github.com/multiversx/mx-chain-go/node/metrics"
-	trieIteratorsFactory "github.com/multiversx/mx-chain-go/node/trieIterators/factory"
 	"github.com/multiversx/mx-chain-go/outport"
 	"github.com/multiversx/mx-chain-go/process"
 	"github.com/multiversx/mx-chain-go/process/block/sovereign/incomingHeader"
@@ -794,22 +793,19 @@ func (snr *sovereignNodeRunner) createApiFacade(
 	log.Debug("creating api resolver structure")
 
 	apiResolverArgs := &apiComp.ApiResolverArgs{
-		Configs:                        configs.Configs,
-		CoreComponents:                 nodeHandler.GetCoreComponents(),
-		DataComponents:                 nodeHandler.GetDataComponents(),
-		StateComponents:                nodeHandler.GetStateComponents(),
-		BootstrapComponents:            nodeHandler.GetBootstrapComponents(),
-		CryptoComponents:               nodeHandler.GetCryptoComponents(),
-		ProcessComponents:              nodeHandler.GetProcessComponents(),
-		StatusCoreComponents:           nodeHandler.GetStatusCoreComponents(),
-		GasScheduleNotifier:            gasScheduleNotifier,
-		Bootstrapper:                   nodeHandler.GetConsensusComponents().Bootstrapper(),
-		RunTypeComponents:              nodeHandler.GetRunTypeComponents(),
-		AllowVMQueriesChan:             allowVMQueriesChan,
-		StatusComponents:               nodeHandler.GetStatusComponents(),
-		DelegatedListFactoryHandler:    trieIteratorsFactory.NewSovereignDelegatedListProcessorFactory(),
-		DirectStakedListFactoryHandler: trieIteratorsFactory.NewSovereignDirectStakedListProcessorFactory(),
-		TotalStakedValueFactoryHandler: trieIteratorsFactory.NewSovereignTotalStakedValueProcessorFactory(),
+		Configs:              configs.Configs,
+		CoreComponents:       nodeHandler.GetCoreComponents(),
+		DataComponents:       nodeHandler.GetDataComponents(),
+		StateComponents:      nodeHandler.GetStateComponents(),
+		BootstrapComponents:  nodeHandler.GetBootstrapComponents(),
+		CryptoComponents:     nodeHandler.GetCryptoComponents(),
+		ProcessComponents:    nodeHandler.GetProcessComponents(),
+		StatusCoreComponents: nodeHandler.GetStatusCoreComponents(),
+		GasScheduleNotifier:  gasScheduleNotifier,
+		Bootstrapper:         nodeHandler.GetConsensusComponents().Bootstrapper(),
+		RunTypeComponents:    nodeHandler.GetRunTypeComponents(),
+		AllowVMQueriesChan:   allowVMQueriesChan,
+		StatusComponents:     nodeHandler.GetStatusComponents(),
 	}
 
 	apiResolver, err := apiComp.CreateApiResolver(apiResolverArgs)

factory/api/apiResolverFactory.go

@@ -32,7 +32,6 @@ import (
 	"github.com/multiversx/mx-chain-go/node/external/timemachine/fee"
 	"github.com/multiversx/mx-chain-go/node/external/transactionAPI"
 	"github.com/multiversx/mx-chain-go/node/trieIterators"
-	trieIteratorsFactory "github.com/multiversx/mx-chain-go/node/trieIterators/factory"
 	"github.com/multiversx/mx-chain-go/outport/process/alteredaccounts"
 	"github.com/multiversx/mx-chain-go/process"
 	"github.com/multiversx/mx-chain-go/process/coordinator"
@@ -58,23 +57,20 @@ var log = logger.GetOrCreate("factory")
 
 // ApiResolverArgs holds the argument needed to create an API resolver
 type ApiResolverArgs struct {
-	Configs                        *config.Configs
-	CoreComponents                 factory.CoreComponentsHolder
-	DataComponents                 factory.DataComponentsHolder
-	StateComponents                factory.StateComponentsHolder
-	BootstrapComponents            factory.BootstrapComponentsHolder
-	CryptoComponents               factory.CryptoComponentsHolder
-	ProcessComponents              factory.ProcessComponentsHolder
-	StatusCoreComponents           factory.StatusCoreComponentsHolder
-	StatusComponents               factory.StatusComponentsHolder
-	GasScheduleNotifier            common.GasScheduleNotifierAPI
-	Bootstrapper                   process.Bootstrapper
-	RunTypeComponents              factory.RunTypeComponentsHolder
-	AllowVMQueriesChan             chan struct{}
-	ProcessingMode                 common.NodeProcessingMode
-	DelegatedListFactoryHandler    trieIteratorsFactory.DelegatedListProcessorFactoryHandler
-	DirectStakedListFactoryHandler trieIteratorsFactory.DirectStakedListProcessorFactoryHandler
-	TotalStakedValueFactoryHandler trieIteratorsFactory.TotalStakedValueProcessorFactoryHandler
+	Configs              *config.Configs
+	CoreComponents       factory.CoreComponentsHolder
+	DataComponents       factory.DataComponentsHolder
+	StateComponents      factory.StateComponentsHolder
+	BootstrapComponents  factory.BootstrapComponentsHolder
+	CryptoComponents     factory.CryptoComponentsHolder
+	ProcessComponents    factory.ProcessComponentsHolder
+	StatusCoreComponents factory.StatusCoreComponentsHolder
+	StatusComponents     factory.StatusComponentsHolder
+	GasScheduleNotifier  common.GasScheduleNotifierAPI
+	Bootstrapper         process.Bootstrapper
+	RunTypeComponents    factory.RunTypeComponentsHolder
+	AllowVMQueriesChan   chan struct{}
+	ProcessingMode       common.NodeProcessingMode
 }
 
 type scQueryServiceArgs struct {
@@ -123,14 +119,13 @@ type scQueryElementArgs struct {
 func CreateApiResolver(args *ApiResolverArgs) (facade.ApiResolver, error) {
 	apiWorkingDir := filepath.Join(args.Configs.FlagsConfig.WorkingDir, common.TemporaryPath)
 
-	// TODO: MX-16228 Move all these 3 below in runTypeComp
-	if check.IfNilReflect(args.DelegatedListFactoryHandler) {
+	if check.IfNil(args.RunTypeComponents.DelegatedListFactoryHandler()) {
 		return nil, factory.ErrNilDelegatedListFactory
 	}
-	if check.IfNilReflect(args.DirectStakedListFactoryHandler) {
+	if check.IfNil(args.RunTypeComponents.DirectStakedListFactoryHandler()) {
 		return nil, factory.ErrNilDirectStakedListFactory
 	}
-	if check.IfNilReflect(args.TotalStakedValueFactoryHandler) {
+	if check.IfNil(args.RunTypeComponents.TotalStakedValueFactoryHandler()) {
 		return nil, factory.ErrNilTotalStakedValueFactory
 	}
 	if check.IfNil(args.RunTypeComponents.APIRewardsTxHandler()) {
@@ -217,17 +212,17 @@ func CreateApiResolver(args *ApiResolverArgs) (facade.ApiResolver, error) {
 		PublicKeyConverter: args.CoreComponents.AddressPubKeyConverter(),
 		QueryService:       scQueryService,
 	}
-	totalStakedValueHandler, err := args.TotalStakedValueFactoryHandler.CreateTotalStakedValueProcessorHandler(argsProcessors)
+	totalStakedValueHandler, err := args.RunTypeComponents.TotalStakedValueFactoryHandler().CreateTotalStakedValueProcessorHandler(argsProcessors)
 	if err != nil {
 		return nil, err
 	}
 
-	directStakedListHandler, err := args.DirectStakedListFactoryHandler.CreateDirectStakedListProcessorHandler(argsProcessors)
+	directStakedListHandler, err := args.RunTypeComponents.DirectStakedListFactoryHandler().CreateDirectStakedListProcessorHandler(argsProcessors)
 	if err != nil {
 		return nil, err
 	}
 
-	delegatedListHandler, err := args.DelegatedListFactoryHandler.CreateDelegatedListProcessorHandler(argsProcessors)
+	delegatedListHandler, err := args.RunTypeComponents.DelegatedListFactoryHandler().CreateDelegatedListProcessorHandler(argsProcessors)
 	if err != nil {
 		return nil, err
 	}

factory/api/apiResolverFactory_test.go

@@ -20,7 +20,6 @@ import (
 	"github.com/multiversx/mx-chain-go/factory/bootstrap"
 	"github.com/multiversx/mx-chain-go/factory/mock"
 	testsMocks "github.com/multiversx/mx-chain-go/integrationTests/mock"
-	trieIteratorsFactory "github.com/multiversx/mx-chain-go/node/trieIterators/factory"
 	"github.com/multiversx/mx-chain-go/process"
 	vmFactory "github.com/multiversx/mx-chain-go/process/factory"
 	"github.com/multiversx/mx-chain-go/process/sync/disabled"
@@ -123,10 +122,7 @@ func createMockArgs(t *testing.T) *api.ApiResolverArgs {
 		StatusComponents: &mainFactoryMocks.StatusComponentsStub{
 			ManagedPeersMonitorField: &testscommon.ManagedPeersMonitorStub{},
 		},
-		RunTypeComponents:              componentsMock.GetRunTypeComponents(),
-		DelegatedListFactoryHandler:    trieIteratorsFactory.NewDelegatedListProcessorFactory(),
-		DirectStakedListFactoryHandler: trieIteratorsFactory.NewDirectStakedListProcessorFactory(),
-		TotalStakedValueFactoryHandler: trieIteratorsFactory.NewTotalStakedListProcessorFactory(),
+		RunTypeComponents: componentsMock.GetRunTypeComponents(),
 	}
 }
 
@@ -321,7 +317,10 @@ func TestCreateApiResolver(t *testing.T) {
 		t.Parallel()
 
 		args := createMockArgs(t)
-		args.DelegatedListFactoryHandler = nil
+		runTypeComps := componentsMock.GetRunTypeComponents()
+		runTypeCompsStub := componentsMock.GetRunTypeComponentsStub(runTypeComps)
+		runTypeCompsStub.DelegatedListFactoryField = nil
+		args.RunTypeComponents = runTypeCompsStub
 		apiResolver, err := api.CreateApiResolver(args)
 		require.Equal(t, factoryErrors.ErrNilDelegatedListFactory, err)
 		require.True(t, check.IfNil(apiResolver))
@@ -330,7 +329,10 @@ func TestCreateApiResolver(t *testing.T) {
 		t.Parallel()
 
 		args := createMockArgs(t)
-		args.DirectStakedListFactoryHandler = nil
+		runTypeComps := componentsMock.GetRunTypeComponents()
+		runTypeCompsStub := componentsMock.GetRunTypeComponentsStub(runTypeComps)
+		runTypeCompsStub.DirectStakedListFactoryField = nil
+		args.RunTypeComponents = runTypeCompsStub
 		apiResolver, err := api.CreateApiResolver(args)
 		require.Equal(t, factoryErrors.ErrNilDirectStakedListFactory, err)
 		require.True(t, check.IfNil(apiResolver))
@@ -339,7 +341,10 @@ func TestCreateApiResolver(t *testing.T) {
 		t.Parallel()
 
 		args := createMockArgs(t)
-		args.TotalStakedValueFactoryHandler = nil
+		runTypeComps := componentsMock.GetRunTypeComponents()
+		runTypeCompsStub := componentsMock.GetRunTypeComponentsStub(runTypeComps)
+		runTypeCompsStub.TotalStakedValueFactoryField = nil
+		args.RunTypeComponents = runTypeCompsStub
 		apiResolver, err := api.CreateApiResolver(args)
 		require.Equal(t, factoryErrors.ErrNilTotalStakedValueFactory, err)
 		require.True(t, check.IfNil(apiResolver))

factory/interface.go

@@ -40,6 +40,7 @@ import (
 	heartbeatData "github.com/multiversx/mx-chain-go/heartbeat/data"
 	"github.com/multiversx/mx-chain-go/node/external"
 	"github.com/multiversx/mx-chain-go/node/external/transactionAPI"
+	trieIteratorsFactory "github.com/multiversx/mx-chain-go/node/trieIterators/factory"
 	"github.com/multiversx/mx-chain-go/ntp"
 	"github.com/multiversx/mx-chain-go/outport"
 	"github.com/multiversx/mx-chain-go/p2p"
@@ -644,6 +645,9 @@ type RunTypeComponentsHolder interface {
 	ValidatorAccountsSyncerFactoryHandler() syncerFactory.ValidatorAccountsSyncerFactoryHandler
 	ShardRequestersContainerCreatorHandler() storageRequestFactory.ShardRequestersContainerCreatorHandler
 	APIRewardsTxHandler() transactionAPI.APIRewardTxHandler
+	DelegatedListFactoryHandler() trieIteratorsFactory.DelegatedListProcessorFactoryHandler
+	DirectStakedListFactoryHandler() trieIteratorsFactory.DirectStakedListProcessorFactoryHandler
+	TotalStakedValueFactoryHandler() trieIteratorsFactory.TotalStakedValueProcessorFactoryHandler
 	Create() error
 	Close() error
 	CheckSubcomponents() error

factory/processing/processComponents_test.go

@@ -1127,6 +1127,9 @@ func getRunTypeComponents(rt runType.RunTypeComponentsHolder) *mainFactoryMocks.
 		ValidatorAccountsSyncerFactoryHandlerField:  rt.ValidatorAccountsSyncerFactoryHandler(),
 		ShardRequestersContainerCreatorHandlerField: rt.ShardRequestersContainerCreatorHandler(),
 		APIRewardsTxHandlerField:                    rt.APIRewardsTxHandler(),
+		DelegatedListFactoryField:                   rt.DelegatedListFactoryHandler(),
+		DirectStakedListFactoryField:                rt.DirectStakedListFactoryHandler(),
+		TotalStakedValueFactoryField:                rt.TotalStakedValueFactoryHandler(),
 	}
 }
 

factory/runType/runTypeComponents.go

@@ -27,6 +27,7 @@ import (
 	"github.com/multiversx/mx-chain-go/genesis/parsing"
 	processGenesis "github.com/multiversx/mx-chain-go/genesis/process"
 	"github.com/multiversx/mx-chain-go/node/external/transactionAPI"
+	trieIteratorsFactory "github.com/multiversx/mx-chain-go/node/trieIterators/factory"
 	"github.com/multiversx/mx-chain-go/process"
 	"github.com/multiversx/mx-chain-go/process/block"
 	processBlock "github.com/multiversx/mx-chain-go/process/block"
@@ -124,6 +125,9 @@ type runTypeComponents struct {
 	validatorAccountsSyncerFactoryHandler   syncerFactory.ValidatorAccountsSyncerFactoryHandler
 	shardRequestersContainerCreatorHandler  storageRequestFactory.ShardRequestersContainerCreatorHandler
 	apiRewardTxHandler                      transactionAPI.APIRewardTxHandler
+	delegatedListFactoryHandler             trieIteratorsFactory.DelegatedListProcessorFactoryHandler
+	directStakedListFactoryHandler          trieIteratorsFactory.DirectStakedListProcessorFactoryHandler
+	totalStakedValueFactoryHandler          trieIteratorsFactory.TotalStakedValueProcessorFactoryHandler
 }
 
 // NewRunTypeComponentsFactory will return a new instance of runTypeComponentsFactory
@@ -302,6 +306,9 @@ func (rcf *runTypeComponentsFactory) Create() (*runTypeComponents, error) {
 		validatorAccountsSyncerFactoryHandler:   syncerFactory.NewValidatorAccountsSyncerFactory(),
 		shardRequestersContainerCreatorHandler:  storageRequestFactory.NewShardRequestersContainerCreator(),
 		apiRewardTxHandler:                      apiRewardTxHandler,
+		delegatedListFactoryHandler:             trieIteratorsFactory.NewDelegatedListProcessorFactory(),
+		directStakedListFactoryHandler:          trieIteratorsFactory.NewDirectStakedListProcessorFactory(),
+		totalStakedValueFactoryHandler:          trieIteratorsFactory.NewTotalStakedListProcessorFactory(),
 	}, nil
 }
 

factory/runType/runTypeComponentsHandler.go

@@ -20,6 +20,7 @@ import (
 	"github.com/multiversx/mx-chain-go/genesis/checking"
 	processComp "github.com/multiversx/mx-chain-go/genesis/process"
 	"github.com/multiversx/mx-chain-go/node/external/transactionAPI"
+	trieIteratorsFactory "github.com/multiversx/mx-chain-go/node/trieIterators/factory"
 	"github.com/multiversx/mx-chain-go/process"
 	processBlock "github.com/multiversx/mx-chain-go/process/block"
 	"github.com/multiversx/mx-chain-go/process/block/preprocess"
@@ -843,6 +844,42 @@ func (mrc *managedRunTypeComponents) APIRewardsTxHandler() transactionAPI.APIRew
 	return mrc.runTypeComponents.apiRewardTxHandler
 }
 
+// DelegatedListFactoryHandler returns delegated list factory handler
+func (mrc *managedRunTypeComponents) DelegatedListFactoryHandler() trieIteratorsFactory.DelegatedListProcessorFactoryHandler {
+	mrc.mutRunTypeComponents.RLock()
+	defer mrc.mutRunTypeComponents.RUnlock()
+
+	if check.IfNil(mrc.runTypeComponents) {
+		return nil
+	}
+
+	return mrc.runTypeComponents.delegatedListFactoryHandler
+}
+
+// DirectStakedListFactoryHandler returns direct staked list factory handler
+func (mrc *managedRunTypeComponents) DirectStakedListFactoryHandler() trieIteratorsFactory.DirectStakedListProcessorFactoryHandler {
+	mrc.mutRunTypeComponents.RLock()
+	defer mrc.mutRunTypeComponents.RUnlock()
+
+	if check.IfNil(mrc.runTypeComponents) {
+		return nil
+	}
+
+	return mrc.runTypeComponents.directStakedListFactoryHandler
+}
+
+// TotalStakedValueFactoryHandler returns total staked value factory handler
+func (mrc *managedRunTypeComponents) TotalStakedValueFactoryHandler() trieIteratorsFactory.TotalStakedValueProcessorFactoryHandler {
+	mrc.mutRunTypeComponents.RLock()
+	defer mrc.mutRunTypeComponents.RUnlock()
+
+	if check.IfNil(mrc.runTypeComponents) {
+		return nil
+	}
+
+	return mrc.runTypeComponents.totalStakedValueFactoryHandler
+}
+
 // IsInterfaceNil returns true if the interface is nil
 func (mrc *managedRunTypeComponents) IsInterfaceNil() bool {
 	return mrc == nil

factory/runType/sovereignRunTypeComponents.go

@@ -24,6 +24,7 @@ import (
 	"github.com/multiversx/mx-chain-go/genesis/parsing"
 	processComp "github.com/multiversx/mx-chain-go/genesis/process"
 	"github.com/multiversx/mx-chain-go/node/external/transactionAPI"
+	trieIteratorsFactory "github.com/multiversx/mx-chain-go/node/trieIterators/factory"
 	"github.com/multiversx/mx-chain-go/process/block"
 	"github.com/multiversx/mx-chain-go/process/block/preprocess"
 	"github.com/multiversx/mx-chain-go/process/block/sovereign"
@@ -271,5 +272,8 @@ func (rcf *sovereignRunTypeComponentsFactory) Create() (*runTypeComponents, erro
 		validatorAccountsSyncerFactoryHandler:   syncerFactory.NewSovereignValidatorAccountsSyncerFactory(),
 		shardRequestersContainerCreatorHandler:  storageRequestFactory.NewSovereignShardRequestersContainerCreator(),
 		apiRewardTxHandler:                      apiRewardTxHandler,
+		delegatedListFactoryHandler:             trieIteratorsFactory.NewSovereignDelegatedListProcessorFactory(),
+		directStakedListFactoryHandler:          trieIteratorsFactory.NewSovereignDirectStakedListProcessorFactory(),
+		totalStakedValueFactoryHandler:          trieIteratorsFactory.NewSovereignTotalStakedValueProcessorFactory(),
 	}, nil
 }

node/chainSimulator/components/nodeFacade.go

@@ -14,7 +14,6 @@ import (
 	apiComp "github.com/multiversx/mx-chain-go/factory/api"
 	nodePack "github.com/multiversx/mx-chain-go/node"
 	"github.com/multiversx/mx-chain-go/node/metrics"
-	"github.com/multiversx/mx-chain-go/node/trieIterators/factory"
 	"github.com/multiversx/mx-chain-go/process/mock"
 
 	"github.com/multiversx/mx-chain-core-go/core"
@@ -61,13 +60,10 @@ func (node *testOnlyProcessingNode) createFacade(configs config.Configs, apiInte
 				return common.NsSynchronized
 			},
 		},
-		AllowVMQueriesChan:             allowVMQueriesChan,
-		StatusComponents:               node.StatusComponentsHolder,
-		ProcessingMode:                 common.GetNodeProcessingMode(configs.ImportDbConfig),
-		RunTypeComponents:              node.RunTypeComponents,
-		DelegatedListFactoryHandler:    factory.NewDelegatedListProcessorFactory(),
-		DirectStakedListFactoryHandler: factory.NewDirectStakedListProcessorFactory(),
-		TotalStakedValueFactoryHandler: factory.NewTotalStakedListProcessorFactory(),
+		AllowVMQueriesChan: allowVMQueriesChan,
+		StatusComponents:   node.StatusComponentsHolder,
+		ProcessingMode:     common.GetNodeProcessingMode(configs.ImportDbConfig),
+		RunTypeComponents:  node.RunTypeComponents,
 	}
 
 	apiResolver, err := apiComp.CreateApiResolver(apiResolverArgs)