fixes after self review

factory/mock/testdata/sovereignNodesSetupMock.json

@@ -21,4 +21,4 @@
       "address": "erd10d2gufxesrp8g409tzxljlaefhs0rsgjle3l7nq38de59txxt8csj54cd3"
     }
   ]
-}
+}

factory/processing/blockProcessorCreator_test.go

@@ -143,6 +143,7 @@ func Test_newBlockProcessorCreatorForMeta(t *testing.T) {
 		coreComponents.EnableEpochsHandler(),
 	)
 	require.Nil(t, err)
+
 	stateComponents := &mock.StateComponentsHolderStub{
 		PeerAccountsCalled: func() state.AccountsAdapter {
 			return &stateMock.AccountsStub{

factory/processing/processComponents_test.go

@@ -1633,8 +1633,8 @@ func TestProcessComponentsFactory_Create(t *testing.T) {
 			}
 			return shardCoordinator.CurrentShard
 		}
-
 		fundGenesisWallets(t, processArgs)
+
 		pcf, _ := processComp.NewProcessComponentsFactory(processArgs)
 		require.NotNil(t, pcf)
 

factory/status/common.go

@@ -3,6 +3,7 @@ package status
 import (
 	nodeData "github.com/multiversx/mx-chain-core-go/data"
 	outportCore "github.com/multiversx/mx-chain-core-go/data/outport"
+
 	"github.com/multiversx/mx-chain-go/common"
 	"github.com/multiversx/mx-chain-go/epochStart"
 	"github.com/multiversx/mx-chain-go/epochStart/notifier"
@@ -31,6 +32,10 @@ func CreateSaveValidatorsPubKeysEventHandler(
 			Epoch:                  currentEpoch,
 		})
 
+		for _, key := range validatorsPubKeys {
+			log.Warn("validator", "key", key, "epoch", currentEpoch, "shardID", hdr.GetShardID())
+		}
+
 	}, func(_ nodeData.HeaderHandler) {}, common.IndexerOrder)
 
 	return subscribeHandler

factory/statusCore/statusCoreComponents_test.go

@@ -48,7 +48,7 @@ func TestNewStatusCoreComponentsFactory(t *testing.T) {
 		t.Parallel()
 
 		cfg := testscommon.GetGeneralConfig()
-		args := componentsMock.GetStatusCoreArgs(cfg, componentsMock.GetCoreComponents(cfg, componentsMock.GetRunTypeCoreComponents()))
+		args := componentsMock.GetStatusCoreArgs(cfg, componentsMock.GetCoreComponents(testscommon.GetGeneralConfig(), componentsMock.GetRunTypeCoreComponents()))
 		sccf, err := statusCore.NewStatusCoreComponentsFactory(args)
 		assert.Nil(t, err)
 		require.NotNil(t, sccf)

factory/vm/sovereignVmContainerShardCreator_test.go

@@ -14,7 +14,7 @@ import (
 	componentsMock "github.com/multiversx/mx-chain-go/testscommon/components"
 )
 
-func createRunTypeComponents() runType.RunTypeComponentsHolder {
+func createSovereignRunTypeComponents() runType.RunTypeComponentsHolder {
 	coreComp := componentsMock.GetSovereignCoreComponents(testscommon.GetGeneralConfig(), componentsMock.GetSovereignRunTypeCoreComponents())
 	cryptoComp := componentsMock.GetCryptoComponents(coreComp)
 
@@ -26,7 +26,7 @@ func TestNewSovereignVmContainerShardCreatorFactory(t *testing.T) {
 
 	t.Run("should work", func(t *testing.T) {
 		t.Parallel()
-		runTypeComponents := createRunTypeComponents()
+		runTypeComponents := createSovereignRunTypeComponents()
 		sovereignVmContainerShardFactory, err := vm.NewSovereignVmContainerShardFactory(runTypeComponents.VmContainerMetaFactoryCreator(), runTypeComponents.VmContainerShardFactoryCreator())
 		require.Nil(t, err)
 		require.False(t, sovereignVmContainerShardFactory.IsInterfaceNil())
@@ -35,7 +35,7 @@ func TestNewSovereignVmContainerShardCreatorFactory(t *testing.T) {
 	t.Run("nil vmContainerMetaFactory", func(t *testing.T) {
 		t.Parallel()
 
-		runTypeComponents := createRunTypeComponents()
+		runTypeComponents := createSovereignRunTypeComponents()
 		sovereignVmContainerShardFactory, err := vm.NewSovereignVmContainerShardFactory(nil, runTypeComponents.VmContainerShardFactoryCreator())
 		require.ErrorIs(t, err, vm.ErrNilVmContainerMetaCreator)
 		require.True(t, sovereignVmContainerShardFactory.IsInterfaceNil())
@@ -44,7 +44,7 @@ func TestNewSovereignVmContainerShardCreatorFactory(t *testing.T) {
 	t.Run("nil vmContainerShardFactory", func(t *testing.T) {
 		t.Parallel()
 
-		runTypeComponents := createRunTypeComponents()
+		runTypeComponents := createSovereignRunTypeComponents()
 		sovereignVmContainerShardFactory, err := vm.NewSovereignVmContainerShardFactory(runTypeComponents.VmContainerMetaFactoryCreator(), nil)
 		require.ErrorIs(t, err, vm.ErrNilVmContainerShardCreator)
 		require.True(t, sovereignVmContainerShardFactory.IsInterfaceNil())
@@ -57,7 +57,7 @@ func TestNewSovereignVmContainerShardFactory_CreateVmContainerFactoryShard(t *te
 		t.Skip("skipping test on arm64")
 	}
 
-	runTypeComponents := createRunTypeComponents()
+	runTypeComponents := createSovereignRunTypeComponents()
 	sovereignVmContainerShardFactory, err := vm.NewSovereignVmContainerShardFactory(runTypeComponents.VmContainerMetaFactoryCreator(), runTypeComponents.VmContainerShardFactoryCreator())
 	require.Nil(t, err)
 	require.False(t, sovereignVmContainerShardFactory.IsInterfaceNil())

integrationTests/multiShard/hardFork/hardFork_test.go

@@ -17,11 +17,10 @@ import (
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
-	mxFactory "github.com/multiversx/mx-chain-go/factory"
-
 	"github.com/multiversx/mx-chain-go/common/statistics/disabled"
 	"github.com/multiversx/mx-chain-go/config"
 	"github.com/multiversx/mx-chain-go/dataRetriever"
+	mxFactory "github.com/multiversx/mx-chain-go/factory"
 	"github.com/multiversx/mx-chain-go/genesis/process"
 	"github.com/multiversx/mx-chain-go/integrationTests"
 	"github.com/multiversx/mx-chain-go/integrationTests/mock"

node/nodeRunner.go

@@ -1112,6 +1112,7 @@ func (nr *nodeRunner) CreateManagedStatusComponents(
 		IsInImportMode:       isInImportMode,
 		StatusCoreComponents: managedStatusCoreComponents,
 		CryptoComponents:     cryptoComponents,
+		IsSovereign:          false,
 	}
 
 	statusComponentsFactory, err := statusComp.NewStatusComponentsFactory(statArgs)