fixes after review

multiversx · Apr 15, 2024 · 74a3d3f · 74a3d3f
1 parent 01443e4
commit 74a3d3f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 6 deletions.
diff --git a/cmd/sovereignnode/sovereignNodeRunner.go b/cmd/sovereignnode/sovereignNodeRunner.go
@@ -1681,8 +1681,6 @@ func (snr *sovereignNodeRunner) CreateArgsRunTypeComponents(coreComp mainFactory
 		return nil, err
 	}
 
-	topicsCheckerHandler := incomingHeader.NewTopicsChecker()
-
 	runTypeComponentsFactory, err := runType.NewRunTypeComponentsFactory(coreComp)
 	if err != nil {
 		return nil, fmt.Errorf("NewRunTypeComponentsFactory failed: %w", err)
@@ -1692,7 +1690,7 @@ func (snr *sovereignNodeRunner) CreateArgsRunTypeComponents(coreComp mainFactory
 		RunTypeComponentsFactory: runTypeComponentsFactory,
 		Config:                   *sovereignCfg,
 		DataCodec:                dataDecoderHandler,
-		TopicsChecker:            topicsCheckerHandler,
+		TopicsChecker:            incomingHeader.NewTopicsChecker(),
 	}, nil
 }
 

diff --git a/factory/processing/processComponents.go b/factory/processing/processComponents.go
@@ -2136,7 +2136,7 @@ func checkProcessComponentsArgs(args ProcessComponentsFactoryArgs) error {
 	if check.IfNil(args.RunTypeComponents.SCProcessorCreator()) {
 		return fmt.Errorf("%s: %w", baseErrMessage, errorsMx.ErrNilSCProcessorCreator)
 	}
-	// TODO make sure consensus model is correct on higher level
+	// TODO make sure consensus model is correct on higher level - task MX-15366
 	if args.RunTypeComponents.ConsensusModel() == consensus.ConsensusModelInvalid {
 		return fmt.Errorf("%s: %w", baseErrMessage, errorsMx.ErrInvalidConsensusModel)
 	}

diff --git a/factory/runType/runTypeComponentsHandler_test.go b/factory/runType/runTypeComponentsHandler_test.go
@@ -85,7 +85,7 @@ func TestManagedRunTypeComponents_Create(t *testing.T) {
 		require.NotNil(t, managedRunTypeComponents.AdditionalStorageServiceCreator())
 		require.NotNil(t, managedRunTypeComponents.SCProcessorCreator())
 		require.NotNil(t, managedRunTypeComponents.SCResultsPreProcessorCreator())
-		require.NotEqual(t, consensus.ConsensusModelInvalid, managedRunTypeComponents.ConsensusModel())
+		require.Equal(t, consensus.ConsensusModelV1, managedRunTypeComponents.ConsensusModel())
 		require.NotNil(t, managedRunTypeComponents.VmContainerMetaFactoryCreator())
 		require.NotNil(t, managedRunTypeComponents.VmContainerShardFactoryCreator())
 		require.NotNil(t, managedRunTypeComponents.AccountsCreator())

diff --git a/process/block/baseProcess_test.go b/process/block/baseProcess_test.go
@@ -846,7 +846,7 @@ func TestCheckProcessorNilParameters(t *testing.T) {
 }
 
 func getRunTypeComponentsMock() *mock.RunTypeComponentsStub {
-	rt := components.GetRunTypeComponents()
+	rt := mock.NewRunTypeComponentsStub()
 	return &mock.RunTypeComponentsStub{
 		AccountCreator: rt.AccountsCreator(),
 		DataCodec:      rt.DataDecoderHandler(),