FIX: After review

factory/runType/sovereignRunTypeComponents.go

@@ -123,7 +123,7 @@ func (rcf *sovereignRunTypeComponentsFactory) Create() (*runTypeComponents, erro
 		return nil, fmt.Errorf("sovereignRunTypeComponentsFactory - NewSovereignSmartContractResultPreProcessorFactory failed: %w", err)
 	}
 
-	sovVMContextCreator := systemSmartContracts.NewSystemVMEEICreator()
+	sovVMContextCreator := systemSmartContracts.NewOneShardSystemVMEEICreator()
 	rtc.vmContainerMetaFactory, err = factoryVm.NewVmContainerMetaFactory(sovBlockChainHookHandlerFactory, sovVMContextCreator)
 	if err != nil {
 		return nil, fmt.Errorf("sovereignRunTypeComponentsFactory - NewVmContainerMetaFactory failed: %w", err)

vm/systemSmartContracts/systemVMEEI.go → vm/systemSmartContracts/oneShardSystemVMEEI.go

@@ -8,27 +8,28 @@ import (
 	"github.com/multiversx/mx-chain-go/vm"
 )
 
-type systemVMEEI struct {
+type oneShardSystemVMEEI struct {
 	vm.ContextHandler
 }
 
-// NewSystemVMEEI creates a new system vm eei context, mainly used for now in sovereign chain
-func NewSystemVMEEI(vmContext vm.ContextHandler) (*systemVMEEI, error) {
+// NewOneShardSystemVMEEI creates a new system vm eei context, mainly used for now in sovereign chain
+func NewOneShardSystemVMEEI(vmContext vm.ContextHandler) (*oneShardSystemVMEEI, error) {
 	if check.IfNil(vmContext) {
 		return nil, vm.ErrNilSystemEnvironmentInterface
 	}
 
-	return &systemVMEEI{
+	return &oneShardSystemVMEEI{
 		vmContext,
 	}, nil
 }
 
 // SendGlobalSettingToAll handles sending global settings information
-func (sovHost *systemVMEEI) SendGlobalSettingToAll(sender []byte, input []byte) error {
+func (sovHost *oneShardSystemVMEEI) SendGlobalSettingToAll(sender []byte, input []byte) error {
+	// TODO: MX-15470 remove sameShard check from ProcessBuiltInFunction
 	return sovHost.ProcessBuiltInFunction(core.SystemAccountAddress, sender, big.NewInt(0), input, 0)
 }
 
 // IsInterfaceNil checks if the underlying pointer is nil
-func (sovHost *systemVMEEI) IsInterfaceNil() bool {
+func (sovHost *oneShardSystemVMEEI) IsInterfaceNil() bool {
 	return sovHost == nil
 }

vm/systemSmartContracts/oneShardSystemVMEEICreator.go

@@ -0,0 +1,26 @@
+package systemSmartContracts
+
+import "github.com/multiversx/mx-chain-go/vm"
+
+type oneShardSystemVMEEICreator struct {
+}
+
+// NewOneShardSystemVMEEICreator creates a system vm eei creator
+func NewOneShardSystemVMEEICreator() *oneShardSystemVMEEICreator {
+	return &oneShardSystemVMEEICreator{}
+}
+
+// CreateVmContext creates vm context for single shard chains
+func (vcc *oneShardSystemVMEEICreator) CreateVmContext(args VMContextArgs) (vm.ContextHandler, error) {
+	vmCtxt, err := NewVMContext(args)
+	if err != nil {
+		return nil, err
+	}
+
+	return NewOneShardSystemVMEEI(vmCtxt)
+}
+
+// IsInterfaceNil checks if the underlying pointer is nil
+func (vcc *oneShardSystemVMEEICreator) IsInterfaceNil() bool {
+	return vcc == nil
+}

vm/systemSmartContracts/systemVMEEICreator_test.go → vm/systemSmartContracts/oneShardSystemVMEEICreator_test.go

@@ -9,15 +9,15 @@ import (
 )
 
 func TestSovereignVMContextCreator_CreateVmContext(t *testing.T) {
-	sovCtxCreator := NewSystemVMEEICreator()
+	sovCtxCreator := NewOneShardSystemVMEEICreator()
 	require.False(t, sovCtxCreator.IsInterfaceNil())
 	require.Implements(t, new(VMContextCreatorHandler), sovCtxCreator)
 
 	t.Run("should work", func(t *testing.T) {
 		args := createArgsVMContext()
 		sovCtx, err := sovCtxCreator.CreateVmContext(args)
 		require.Nil(t, err)
-		require.Equal(t, "*systemSmartContracts.systemVMEEI", fmt.Sprintf("%T", sovCtx))
+		require.Equal(t, "*systemSmartContracts.oneShardSystemVMEEI", fmt.Sprintf("%T", sovCtx))
 	})
 
 	t.Run("invalid args, should return error", func(t *testing.T) {

vm/systemSmartContracts/systemVMEEI_test.go → vm/systemSmartContracts/oneShardSystemVMEEI_test.go

@@ -14,12 +14,12 @@ func TestNewSovereignVMContext(t *testing.T) {
 	t.Parallel()
 
 	t.Run("should work", func(t *testing.T) {
-		sovVM, err := NewSystemVMEEI(&mock.SystemEIStub{})
+		sovVM, err := NewOneShardSystemVMEEI(&mock.SystemEIStub{})
 		require.Nil(t, err)
 		require.False(t, sovVM.IsInterfaceNil())
 	})
 	t.Run("nil vm context input, should return error", func(t *testing.T) {
-		sovVM, err := NewSystemVMEEI(nil)
+		sovVM, err := NewOneShardSystemVMEEI(nil)
 		require.Equal(t, vm.ErrNilSystemEnvironmentInterface, err)
 		require.Nil(t, sovVM)
 	})
@@ -44,7 +44,7 @@ func TestSovereignVMContext_SendGlobalSettingToAll(t *testing.T) {
 		},
 	}
 
-	sovVM, _ := NewSystemVMEEI(vmCtx)
+	sovVM, _ := NewOneShardSystemVMEEI(vmCtx)
 	err := sovVM.SendGlobalSettingToAll(expectedSender, expectedInput)
 	require.Nil(t, err)
 	require.True(t, wasProcessBuiltInCalled)