FEAT: Continue integration for MaxConsecutiveRoundsOfRatingDecrease into configs per round

Author: mariusmihaic

common/configs/consts.go

@@ -18,4 +18,5 @@ const (
 	defaultNumFloodingRoundsFastReacting          = 20
 	defaultNumFloodingRoundsSlowReacting          = 20
 	defaultNumFloodingRoundsOutOfSpecs            = 20
+	defaultMaxConsecutiveRoundsOfRatingDecrease   = 600
 )

common/configs/processConfigs.go

@@ -106,7 +106,7 @@ func checkConfigsByRound(configsByRound []config.ProcessConfigByRound) error {
 		}
 		err := checkRoundConfigValues(cfg)
 		if err != nil {
-			return err
+			return fmt.Errorf("%w in checkConfigsByRound for enable round: %d", err, cfg.EnableRound)
 		}
 
 		seen[cfg.EnableRound] = struct{}{}
@@ -141,6 +141,9 @@ func checkRoundConfigValues(cfg config.ProcessConfigByRound) error {
 		return fmt.Errorf("%w for NumFloodingRoundsOutOfSpecs, received %d, min expected %d",
 			process.ErrInvalidValue, cfg.NumFloodingRoundsOutOfSpecs, minFloodingRounds)
 	}
+	if cfg.MaxConsecutiveRoundsOfRatingDecrease == 0 {
+		return process.ErrZeroMaxConsecutiveRoundsOfRatingDecrease
+	}
 
 	return nil
 }

common/configs/processConfigs_test.go

@@ -21,6 +21,7 @@ func getConfigsByRound() []config.ProcessConfigByRound {
 			NumFloodingRoundsSlowReacting:          2,
 			NumFloodingRoundsFastReacting:          3,
 			NumFloodingRoundsOutOfSpecs:            4,
+			MaxConsecutiveRoundsOfRatingDecrease:   600,
 		},
 		{
 			EnableRound:                            1,
@@ -30,6 +31,7 @@ func getConfigsByRound() []config.ProcessConfigByRound {
 			NumFloodingRoundsSlowReacting:          20,
 			NumFloodingRoundsFastReacting:          30,
 			NumFloodingRoundsOutOfSpecs:            40,
+			MaxConsecutiveRoundsOfRatingDecrease:   6000,
 		},
 	}
 }
@@ -152,6 +154,20 @@ func TestNewProcessConfigsByEpoch(t *testing.T) {
 		require.True(t, strings.Contains(err.Error(), "NumFloodingRoundsOutOfSpecs"))
 	})
 
+	t.Run("should return error for invalid max consecutive rounds of rating decrease value", func(t *testing.T) {
+		t.Parallel()
+
+		confByEpoch := []config.ProcessConfigByEpoch{
+			{EnableEpoch: 0, MaxMetaNoncesBehind: 15},
+		}
+		confByRound := getConfigsByRound()
+		confByRound[0].MaxConsecutiveRoundsOfRatingDecrease = 0
+
+		pce, err := configs.NewProcessConfigsHandler(confByEpoch, confByRound, &epochNotifier.RoundNotifierStub{})
+		require.Nil(t, pce)
+		require.ErrorIs(t, err, process.ErrZeroMaxConsecutiveRoundsOfRatingDecrease)
+	})
+
 	t.Run("should work", func(t *testing.T) {
 		t.Parallel()
 
@@ -199,6 +215,7 @@ func TestProcessConfigsByEpoch_Getters(t *testing.T) {
 			NumFloodingRoundsSlowReacting:          2,
 			NumFloodingRoundsFastReacting:          3,
 			NumFloodingRoundsOutOfSpecs:            4,
+			MaxConsecutiveRoundsOfRatingDecrease:   600,
 		},
 		{EnableRound: 1,
 			MaxRoundsWithoutNewBlockReceived:       11,
@@ -209,6 +226,7 @@ func TestProcessConfigsByEpoch_Getters(t *testing.T) {
 			NumFloodingRoundsSlowReacting:          20,
 			NumFloodingRoundsFastReacting:          30,
 			NumFloodingRoundsOutOfSpecs:            40,
+			MaxConsecutiveRoundsOfRatingDecrease:   6000,
 		},
 	}
 

common/configs/vars.go

@@ -25,5 +25,11 @@ func initCfgVarMap() map[dto.ConfigVariable]configVariableHandler {
 			},
 			defaultValue: defaultNumFloodingRoundsOutOfSpecs,
 		},
+		dto.MaxConsecutiveRoundsOfRatingDecrease: {
+			valueSelector: func(cfg config.ProcessConfigByRound) uint64 {
+				return cfg.MaxConsecutiveRoundsOfRatingDecrease
+			},
+			defaultValue: defaultMaxConsecutiveRoundsOfRatingDecrease,
+		},
 	}
 }

config/config.go

@@ -396,7 +396,7 @@ type ProcessConfigByRound struct {
 	NumFloodingRoundsSlowReacting uint32
 	NumFloodingRoundsOutOfSpecs   uint32
 
-	MaxConsecutiveRoundsOfRatingDecrease uint32
+	MaxConsecutiveRoundsOfRatingDecrease uint64
 }
 
 // GeneralSettingsConfig will hold the general settings for a node

integrationTests/testProcessorNode.go

@@ -180,6 +180,7 @@ var TestProcessConfigsHandler, _ = configs.NewProcessConfigsHandler([]config.Pro
 			NumFloodingRoundsSlowReacting:          20,
 			NumFloodingRoundsFastReacting:          30,
 			NumFloodingRoundsOutOfSpecs:            40,
+			MaxConsecutiveRoundsOfRatingDecrease:   600,
 		},
 	},
 	forking.NewGenericRoundNotifier(),

node/chainSimulator/components/coreComponents_test.go

@@ -73,6 +73,7 @@ func createArgsCoreComponentsHolder() ArgsCoreComponentsHolder {
 						NumFloodingRoundsSlowReacting:          20,
 						NumFloodingRoundsFastReacting:          30,
 						NumFloodingRoundsOutOfSpecs:            40,
+						MaxConsecutiveRoundsOfRatingDecrease:   600,
 					},
 				},
 				EpochStartConfigsByEpoch: []config.EpochStartConfigByEpoch{

process/block/export_test.go

@@ -163,6 +163,7 @@ func NewShardProcessorEmptyWith3shards(
 				NumFloodingRoundsSlowReacting:          20,
 				NumFloodingRoundsFastReacting:          30,
 				NumFloodingRoundsOutOfSpecs:            40,
+				MaxConsecutiveRoundsOfRatingDecrease:   600,
 			},
 		},
 		&epochNotifier.RoundNotifierStub{},

process/peer/process.go

@@ -111,10 +111,6 @@ func NewValidatorStatisticsProcessor(arguments ArgValidatorStatisticsProcessor)
 	if arguments.MaxComputableRounds == 0 {
 		return nil, process.ErrZeroMaxComputableRounds
 	}
-	// TODO: Here
-	//if arguments.MaxConsecutiveRoundsOfRatingDecrease == 0 {
-	//	return nil, process.ErrZeroMaxConsecutiveRoundsOfRatingDecrease
-	//}
 	if check.IfNil(arguments.Rater) {
 		return nil, process.ErrNilRater
 	}

process/track/baseBlockTrack_test.go

@@ -151,6 +151,7 @@ func CreateShardTrackerMockArguments() track.ArgShardTracker {
 				NumFloodingRoundsSlowReacting:          20,
 				NumFloodingRoundsFastReacting:          30,
 				NumFloodingRoundsOutOfSpecs:            40,
+				MaxConsecutiveRoundsOfRatingDecrease:   600,
 			},
 		},
 		&epochNotifier.RoundNotifierStub{},