Merge pull request #6153 from multiversx/feat/refactor-runtype-compon…

…ents

Feat/refactor runtype components

cmd/sovereignnode/dataCodec/dataCodec_test.go

@@ -13,7 +13,7 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
-func createDataCodec() SovereignDataDecoder {
+func createDataCodec() SovereignDataCodec {
 	codec := abi.NewDefaultCodec()
 	args := ArgsDataCodec{
 		Serializer: abi.NewSerializer(codec),

cmd/sovereignnode/dataCodec/interface.go

@@ -27,8 +27,8 @@ type OperationDataEncoder interface {
 	SerializeOperation(operation sovereign.Operation) ([]byte, error)
 }
 
-// SovereignDataDecoder is the interface for serializing/deserializing data
-type SovereignDataDecoder interface {
+// SovereignDataCodec is the interface for serializing/deserializing data
+type SovereignDataCodec interface {
 	SerializeEventData(eventData sovereign.EventData) ([]byte, error)
 	DeserializeEventData(data []byte) (*sovereign.EventData, error)
 	SerializeTokenData(tokenData sovereign.EsdtTokenData) ([]byte, error)

cmd/sovereignnode/incomingHeader/incomingEventsProcessor.go

@@ -58,7 +58,7 @@ type eventsResult struct {
 type incomingEventsProcessor struct {
 	marshaller    marshal.Marshalizer
 	hasher        hashing.Hasher
-	dataCodec     dataCodec.SovereignDataDecoder
+	dataCodec     dataCodec.SovereignDataCodec
 	topicsChecker TopicsChecker
 }
 

cmd/sovereignnode/incomingHeader/incomingHeaderProcessor.go

@@ -3,9 +3,9 @@ package incomingHeader
 import (
 	"encoding/hex"
 
+	sovereignBlock "github.com/multiversx/mx-chain-go/dataRetriever/dataPool/sovereign"
 	"github.com/multiversx/mx-chain-go/errors"
 	"github.com/multiversx/mx-chain-go/process"
-	"github.com/multiversx/mx-chain-go/process/block"
 	"github.com/multiversx/mx-chain-go/sovereignnode/dataCodec"
 
 	"github.com/multiversx/mx-chain-core-go/core"
@@ -22,12 +22,12 @@ var log = logger.GetOrCreate("headerSubscriber")
 // ArgsIncomingHeaderProcessor is a struct placeholder for args needed to create a new incoming header processor
 type ArgsIncomingHeaderProcessor struct {
 	HeadersPool                     HeadersPool
-	OutGoingOperationsPool          block.OutGoingOperationsPool
+	OutGoingOperationsPool          sovereignBlock.OutGoingOperationsPool
 	TxPool                          TransactionPool
 	Marshaller                      marshal.Marshalizer
 	Hasher                          hashing.Hasher
 	MainChainNotarizationStartRound uint64
-	DataCodec                       dataCodec.SovereignDataDecoder
+	DataCodec                       dataCodec.SovereignDataCodec
 	TopicsChecker                   TopicsChecker
 }
 
@@ -36,7 +36,7 @@ type incomingHeaderProcessor struct {
 	extendedHeaderProc *extendedHeaderProcessor
 
 	txPool                          TransactionPool
-	outGoingPool                    block.OutGoingOperationsPool
+	outGoingPool                    sovereignBlock.OutGoingOperationsPool
 	mainChainNotarizationStartRound uint64
 }
 

common/disabled/outGoingOperationPool.go

@@ -0,0 +1,39 @@
+package disabled
+
+import (
+	"github.com/multiversx/mx-chain-core-go/data/sovereign"
+)
+
+type outGoingOperationsPool struct {
+}
+
+// NewDisabledOutGoingOperationPool -
+func NewDisabledOutGoingOperationPool() *outGoingOperationsPool {
+	return &outGoingOperationsPool{}
+}
+
+// Add -
+func (op *outGoingOperationsPool) Add(_ *sovereign.BridgeOutGoingData) {}
+
+// Get -
+func (op *outGoingOperationsPool) Get(_ []byte) *sovereign.BridgeOutGoingData {
+	return &sovereign.BridgeOutGoingData{}
+}
+
+// Delete -
+func (op *outGoingOperationsPool) Delete(_ []byte) {}
+
+// ConfirmOperation -
+func (op *outGoingOperationsPool) ConfirmOperation(_ []byte, _ []byte) error {
+	return nil
+}
+
+// GetUnconfirmedOperations -
+func (op *outGoingOperationsPool) GetUnconfirmedOperations() []*sovereign.BridgeOutGoingData {
+	return make([]*sovereign.BridgeOutGoingData, 0)
+}
+
+// IsInterfaceNil checks if the underlying pointer is nil
+func (op *outGoingOperationsPool) IsInterfaceNil() bool {
+	return op == nil
+}

common/runType/runTypeComponentsHelper.go

@@ -0,0 +1,24 @@
+package runType
+
+import (
+	"github.com/multiversx/mx-chain-go/genesis"
+	"github.com/multiversx/mx-chain-go/genesis/data"
+
+	"github.com/multiversx/mx-chain-core-go/core"
+)
+
+// ReadInitialAccounts returns the genesis accounts from a file
+func ReadInitialAccounts(filePath string) ([]genesis.InitialAccountHandler, error) {
+	initialAccounts := make([]*data.InitialAccount, 0)
+	err := core.LoadJsonFile(&initialAccounts, filePath)
+	if err != nil {
+		return nil, err
+	}
+
+	var accounts []genesis.InitialAccountHandler
+	for _, ia := range initialAccounts {
+		accounts = append(accounts, ia)
+	}
+
+	return accounts, nil
+}

common/runType/runTypeComponentsHelper_test.go

@@ -0,0 +1,32 @@
+package runType
+
+import (
+	"math/big"
+	"testing"
+
+	"github.com/stretchr/testify/require"
+)
+
+func TestReadInitialAccounts(t *testing.T) {
+	t.Parallel()
+
+	t.Run("empty path should error", func(t *testing.T) {
+		accounts, err := ReadInitialAccounts("")
+		require.Nil(t, accounts)
+		require.Error(t, err)
+	})
+	t.Run("should work", func(t *testing.T) {
+		accounts, err := ReadInitialAccounts("../../genesis/process/testdata/genesisTest1.json")
+		require.Nil(t, err)
+		require.NotNil(t, accounts)
+		require.True(t, len(accounts) > 0)
+		require.Equal(t, "a00102030405060708090001020304050607080900010203040506070809000a", accounts[0].GetAddress())
+		require.Equal(t, "b00102030405060708090001020304050607080900010203040506070809000b", accounts[1].GetAddress())
+		require.Equal(t, "c00102030405060708090001020304050607080900010203040506070809000c", accounts[2].GetAddress())
+		require.Equal(t, big.NewInt(10000), accounts[2].GetSupply())
+		require.Equal(t, big.NewInt(0), accounts[2].GetBalanceValue())
+		require.Equal(t, big.NewInt(0), accounts[2].GetStakingValue())
+		require.Equal(t, "00000000000000000500f080f48551abf03e12e27e20d9f077abedffdccc0102", accounts[2].GetDelegationHandler().GetAddress())
+		require.Equal(t, big.NewInt(10000), accounts[2].GetDelegationHandler().GetValue())
+	})
+}

consensus/spos/bls/interface.go

@@ -3,10 +3,11 @@ package bls
 import (
 	"context"
 
-	"github.com/multiversx/mx-chain-core-go/data"
-	"github.com/multiversx/mx-chain-core-go/data/sovereign"
 	"github.com/multiversx/mx-chain-go/consensus"
 	"github.com/multiversx/mx-chain-go/consensus/spos"
+
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/sovereign"
 )
 
 // SubRoundStartExtraSignersHolder manages extra signers during start subround in a consensus process
@@ -60,3 +61,12 @@ type BridgeOperationsHandler interface {
 	Send(ctx context.Context, data *sovereign.BridgeOperations) (*sovereign.BridgeOperationsResponse, error)
 	IsInterfaceNil() bool
 }
+
+// OutGoingOperationsPool defines the behavior of a timed cache for outgoing operations
+type OutGoingOperationsPool interface {
+	Add(data *sovereign.BridgeOutGoingData)
+	Get(hash []byte) *sovereign.BridgeOutGoingData
+	Delete(hash []byte)
+	GetUnconfirmedOperations() []*sovereign.BridgeOutGoingData
+	IsInterfaceNil() bool
+}

consensus/spos/bls/sovereignSubRoundEnd.go

@@ -5,24 +5,24 @@ import (
 	"encoding/hex"
 	"fmt"
 
+	"github.com/multiversx/mx-chain-go/consensus/spos"
+	"github.com/multiversx/mx-chain-go/errors"
+
 	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/multiversx/mx-chain-core-go/data"
 	"github.com/multiversx/mx-chain-core-go/data/sovereign"
-	"github.com/multiversx/mx-chain-go/consensus/spos"
-	"github.com/multiversx/mx-chain-go/errors"
-	"github.com/multiversx/mx-chain-go/process/block"
 )
 
 type sovereignSubRoundEnd struct {
 	*subroundEndRoundV2
-	outGoingOperationsPool block.OutGoingOperationsPool
+	outGoingOperationsPool OutGoingOperationsPool
 	bridgeOpHandler        BridgeOperationsHandler
 }
 
 // NewSovereignSubRoundEndRound creates a new sovereign end subround
 func NewSovereignSubRoundEndRound(
 	subRoundEnd *subroundEndRoundV2,
-	outGoingOperationsPool block.OutGoingOperationsPool,
+	outGoingOperationsPool OutGoingOperationsPool,
 	bridgeOpHandler BridgeOperationsHandler,
 ) (*sovereignSubRoundEnd, error) {
 	if check.IfNil(subRoundEnd) {

consensus/spos/bls/sovereignSubRoundEndCreator.go

@@ -2,19 +2,19 @@ package bls
 
 import (
 	"github.com/multiversx/mx-chain-core-go/core/check"
+
 	"github.com/multiversx/mx-chain-go/consensus/spos"
 	"github.com/multiversx/mx-chain-go/errors"
-	"github.com/multiversx/mx-chain-go/process/block"
 )
 
 type sovereignSubRoundEndCreator struct {
-	outGoingOperationsPool block.OutGoingOperationsPool
+	outGoingOperationsPool OutGoingOperationsPool
 	bridgeOpHandler        BridgeOperationsHandler
 }
 
 // NewSovereignSubRoundEndCreator creates a new sovereign subround end factory
 func NewSovereignSubRoundEndCreator(
-	outGoingOperationsPool block.OutGoingOperationsPool,
+	outGoingOperationsPool OutGoingOperationsPool,
 	bridgeOpHandler BridgeOperationsHandler,
 ) (*sovereignSubRoundEndCreator, error) {
 	if check.IfNil(outGoingOperationsPool) {

consensus/spos/bls/sovereignSubRoundEnd_test.go

@@ -6,18 +6,19 @@ import (
 	"testing"
 	"time"
 
-	"github.com/multiversx/mx-chain-core-go/data"
-	"github.com/multiversx/mx-chain-core-go/data/block"
-	sovCore "github.com/multiversx/mx-chain-core-go/data/sovereign"
 	"github.com/multiversx/mx-chain-go/consensus"
 	"github.com/multiversx/mx-chain-go/consensus/mock"
 	"github.com/multiversx/mx-chain-go/consensus/spos"
 	"github.com/multiversx/mx-chain-go/consensus/spos/bls"
+	sovereignBlock "github.com/multiversx/mx-chain-go/dataRetriever/dataPool/sovereign"
 	"github.com/multiversx/mx-chain-go/errors"
-	sovBlock "github.com/multiversx/mx-chain-go/process/block"
 	"github.com/multiversx/mx-chain-go/testscommon/enableEpochsHandlerMock"
 	"github.com/multiversx/mx-chain-go/testscommon/sovereign"
 	"github.com/multiversx/mx-chain-go/testscommon/statusHandler"
+
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
+	sovCore "github.com/multiversx/mx-chain-core-go/data/sovereign"
 	"github.com/stretchr/testify/require"
 )
 
@@ -27,7 +28,7 @@ type sovEndRoundHandler interface {
 }
 
 func createSovSubRoundEndWithSelfLeader(
-	pool sovBlock.OutGoingOperationsPool,
+	pool sovereignBlock.OutGoingOperationsPool,
 	bridgeHandler bls.BridgeOperationsHandler,
 	header data.HeaderHandler,
 ) sovEndRoundHandler {
@@ -45,7 +46,7 @@ func createSovSubRoundEndWithSelfLeader(
 }
 
 func createSovSubRoundEndWithParticipant(
-	pool sovBlock.OutGoingOperationsPool,
+	pool sovereignBlock.OutGoingOperationsPool,
 	bridgeHandler bls.BridgeOperationsHandler,
 	header data.HeaderHandler,
 ) sovEndRoundHandler {

dataRetriever/dataPool/sovereign/interface.go

@@ -0,0 +1,15 @@
+package sovereign
+
+import (
+	sovereignCore "github.com/multiversx/mx-chain-core-go/data/sovereign"
+)
+
+// OutGoingOperationsPool defines the behavior of a timed cache for outgoing operations
+type OutGoingOperationsPool interface {
+	Add(data *sovereignCore.BridgeOutGoingData)
+	Get(hash []byte) *sovereignCore.BridgeOutGoingData
+	Delete(hash []byte)
+	GetUnconfirmedOperations() []*sovereignCore.BridgeOutGoingData
+	ConfirmOperation(hashOfHashes []byte, hash []byte) error
+	IsInterfaceNil() bool
+}

epochStart/bootstrap/common.go

@@ -3,11 +3,12 @@ package bootstrap
 import (
 	"fmt"
 
-	"github.com/multiversx/mx-chain-core-go/core/check"
 	"github.com/multiversx/mx-chain-go/common/statistics"
 	"github.com/multiversx/mx-chain-go/epochStart"
 	"github.com/multiversx/mx-chain-go/errors"
 	"github.com/multiversx/mx-chain-go/sharding/nodesCoordinator"
+
+	"github.com/multiversx/mx-chain-core-go/core/check"
 )
 
 const baseErrorMessage = "error with epoch start bootstrapper arguments"
@@ -124,15 +125,21 @@ func checkArguments(args ArgsEpochStartBootstrap) error {
 	if check.IfNil(args.NodesCoordinatorRegistryFactory) {
 		return fmt.Errorf("%s: %w", baseErrorMessage, nodesCoordinator.ErrNilNodesCoordinatorRegistryFactory)
 	}
-	if check.IfNil(args.NodesCoordinatorWithRaterFactory) {
-		return fmt.Errorf("%s: %w", baseErrorMessage, errors.ErrNilNodesCoordinatorFactory)
+	if check.IfNil(args.RunTypeComponents) {
+		return fmt.Errorf("%s: %w", baseErrorMessage, errors.ErrNilRunTypeComponents)
 	}
-	if check.IfNil(args.ShardCoordinatorFactory) {
+	if check.IfNil(args.RunTypeComponents.ShardCoordinatorCreator()) {
 		return fmt.Errorf("%s: %w", baseErrorMessage, errors.ErrNilShardCoordinatorFactory)
 	}
-	if check.IfNil(args.AdditionalStorageServiceCreator) {
+	if check.IfNil(args.RunTypeComponents.AdditionalStorageServiceCreator()) {
 		return fmt.Errorf("%s: %w", baseErrorMessage, errors.ErrNilAdditionalStorageServiceCreator)
 	}
+	if check.IfNil(args.RunTypeComponents.NodesCoordinatorWithRaterCreator()) {
+		return fmt.Errorf("%s: %w", baseErrorMessage, errors.ErrNilNodesCoordinatorFactory)
+	}
+	if check.IfNil(args.RunTypeComponents.RequestHandlerCreator()) {
+		return fmt.Errorf("%s: %w", baseErrorMessage, errors.ErrNilRequestHandlerCreator)
+	}
 
 	return nil
 }

epochStart/bootstrap/epochStartBootstrapperFactory_test.go

@@ -3,16 +3,12 @@ package bootstrap
 import (
 	"testing"
 
-	"github.com/multiversx/mx-chain-core-go/core"
-	"github.com/multiversx/mx-chain-core-go/core/versioning"
-	"github.com/multiversx/mx-chain-core-go/data"
-	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/multiversx/mx-chain-go/common/statistics/disabled"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/epochStart/bootstrap/types"
 	"github.com/multiversx/mx-chain-go/epochStart/mock"
+	processMocks "github.com/multiversx/mx-chain-go/process/mock"
 	"github.com/multiversx/mx-chain-go/sharding"
-	"github.com/multiversx/mx-chain-go/sharding/nodesCoordinator"
 	"github.com/multiversx/mx-chain-go/testscommon"
 	"github.com/multiversx/mx-chain-go/testscommon/cryptoMocks"
 	"github.com/multiversx/mx-chain-go/testscommon/economicsmocks"
@@ -26,6 +22,11 @@ import (
 	"github.com/multiversx/mx-chain-go/testscommon/shardingMocks"
 	statusHandlerMock "github.com/multiversx/mx-chain-go/testscommon/statusHandler"
 	storageMocks "github.com/multiversx/mx-chain-go/testscommon/storage"
+
+	"github.com/multiversx/mx-chain-core-go/core"
+	"github.com/multiversx/mx-chain-core-go/core/versioning"
+	"github.com/multiversx/mx-chain-core-go/data"
+	"github.com/multiversx/mx-chain-core-go/data/block"
 	"github.com/stretchr/testify/require"
 )
 
@@ -215,11 +216,9 @@ func getDefaultArgs() ArgsEpochStartBootstrap {
 		FlagsConfig: config.ContextFlagsConfig{
 			ForceStartFromNetwork: false,
 		},
-		TrieSyncStatisticsProvider:       &testscommon.SizeSyncStatisticsHandlerStub{},
-		AdditionalStorageServiceCreator:  &testscommon.AdditionalStorageServiceFactoryMock{},
-		NodesCoordinatorWithRaterFactory: nodesCoordinator.NewIndexHashedNodesCoordinatorWithRaterFactory(),
-		ShardCoordinatorFactory:          sharding.NewMultiShardCoordinatorFactory(),
-		StateStatsHandler:                disabled.NewStateStatistics(),
-		NodesCoordinatorRegistryFactory:  &shardingMocks.NodesCoordinatorRegistryFactoryMock{},
+		TrieSyncStatisticsProvider:      &testscommon.SizeSyncStatisticsHandlerStub{},
+		RunTypeComponents:               processMocks.NewRunTypeComponentsStub(),
+		StateStatsHandler:               disabled.NewStateStatistics(),
+		NodesCoordinatorRegistryFactory: &shardingMocks.NodesCoordinatorRegistryFactoryMock{},
 	}
 }