Merge pull request #1728 from ElrondNetwork/add-checks-for-epoch-star…

…t-config

Add checks for epoch start config when init bootstrap

cmd/node/config/config.toml

@@ -353,7 +353,7 @@
     # ShuffleBetweenShards enables the shuffling of validators between shards at the end of epoch
     ShuffleBetweenShards = false
     MinNumConnectedPeersToStart       = 2
-    MinNumOfPeersToConsiderBlockValid = 2 #TODO add tests for invalid values
+    MinNumOfPeersToConsiderBlockValid = 2
 
 # ResourceStats, if enabled, will output in a folder called "stats"
 # resource statistics. For example: number of active go routines, memory allocation, number of GC sweeps, etc.

epochStart/bootstrap/common.go

@@ -88,6 +88,12 @@ func checkArguments(args ArgsEpochStartBootstrap) error {
 	if check.IfNil(args.NodeShuffler) {
 		return fmt.Errorf("%s: %w", baseErrorMessage, epochStart.ErrNilShuffler)
 	}
+	if args.GeneralConfig.EpochStartConfig.MinNumOfPeersToConsiderBlockValid < minNumPeersToConsiderMetaBlockValid {
+		return fmt.Errorf("%s: %w", baseErrorMessage, epochStart.ErrNotEnoughNumOfPeersToConsiderBlockValid)
+	}
+	if args.GeneralConfig.EpochStartConfig.MinNumConnectedPeersToStart < minNumConnectedPeers {
+		return fmt.Errorf("%s: %w", baseErrorMessage, epochStart.ErrNotEnoughNumConnectedPeers)
+	}
 
 	return nil
 }

epochStart/bootstrap/epochStartMetaBlockProcessor.go

@@ -20,6 +20,8 @@ import (
 const durationBetweenChecks = 200 * time.Millisecond
 const durationBetweenReRequests = 1 * time.Second
 const durationBetweenCheckingNumConnectedPeers = 500 * time.Millisecond
+const minNumPeersToConsiderMetaBlockValid = 1
+const minNumConnectedPeers = 1
 
 var _ process.InterceptorProcessor = (*epochStartMetaBlockProcessor)(nil)
 
@@ -45,8 +47,8 @@ func NewEpochStartMetaBlockProcessor(
 	marshalizer marshal.Marshalizer,
 	hasher hashing.Hasher,
 	consensusPercentage uint8,
-	minNumConnectedPeers int,
-	minNumOfPeersToConsiderBlockValid int,
+	minNumConnectedPeersConfig int,
+	minNumOfPeersToConsiderBlockValidConfig int,
 ) (*epochStartMetaBlockProcessor, error) {
 	if check.IfNil(messenger) {
 		return nil, epochStart.ErrNilMessenger
@@ -63,10 +65,10 @@ func NewEpochStartMetaBlockProcessor(
 	if !(consensusPercentage > 0 && consensusPercentage <= 100) {
 		return nil, epochStart.ErrInvalidConsensusThreshold
 	}
-	if minNumConnectedPeers < 1 {
+	if minNumConnectedPeersConfig < minNumConnectedPeers {
 		return nil, epochStart.ErrNotEnoughNumConnectedPeers
 	}
-	if minNumOfPeersToConsiderBlockValid < 1 {
+	if minNumOfPeersToConsiderBlockValidConfig < minNumPeersToConsiderMetaBlockValid {
 		return nil, epochStart.ErrNotEnoughNumOfPeersToConsiderBlockValid
 	}
 
@@ -75,8 +77,8 @@ func NewEpochStartMetaBlockProcessor(
 		requestHandler:                    handler,
 		marshalizer:                       marshalizer,
 		hasher:                            hasher,
-		minNumConnectedPeers:              minNumConnectedPeers,
-		minNumOfPeersToConsiderBlockValid: minNumOfPeersToConsiderBlockValid,
+		minNumConnectedPeers:              minNumConnectedPeersConfig,
+		minNumOfPeersToConsiderBlockValid: minNumOfPeersToConsiderBlockValidConfig,
 		mutReceivedMetaBlocks:             sync.RWMutex{},
 		mapReceivedMetaBlocks:             make(map[string]*block.MetaBlock),
 		mapMetaBlocksFromPeers:            make(map[string][]p2p.PeerID),

epochStart/bootstrap/export_test.go

@@ -10,8 +10,10 @@ import (
 func getGeneralConfig() config.Config {
 	return config.Config{
 		EpochStartConfig: config.EpochStartConfig{
-			MinRoundsBetweenEpochs: 5,
-			RoundsPerEpoch:         10,
+			MinRoundsBetweenEpochs:            5,
+			RoundsPerEpoch:                    10,
+			MinNumOfPeersToConsiderBlockValid: 2,
+			MinNumConnectedPeersToStart:       2,
 		},
 		WhiteListPool: config.CacheConfig{
 			Size:   10000,

epochStart/bootstrap/process_test.go

@@ -131,13 +131,8 @@ func TestEpochStartBootstrap_Bootstrap(t *testing.T) {
 			return roundDuration
 		},
 	}
-	args.GeneralConfig = config.Config{
-		EpochStartConfig: config.EpochStartConfig{
-			RoundsPerEpoch: roundsPerEpoch,
-		},
-	}
 	args.GeneralConfig = getGeneralConfig()
-
+	args.GeneralConfig.EpochStartConfig.RoundsPerEpoch = roundsPerEpoch
 	epochStartProvider, _ := NewEpochStartBootstrap(args)
 
 	done := make(chan bool, 1)