change max supported feeds to uint64, supported feeds update interval to int64

Author: colmazia

benchmark/feeds_bench_test.go

@@ -140,7 +140,7 @@ func setupFeeds(ba *BenchmarkApp) error {
 	ba.CallBeginBlock()
 
 	feeds := []types.Feed{}
-	for i := int64(0); i < numFeeds; i++ {
+	for i := uint64(0); i < numFeeds; i++ {
 		feeds = append(feeds, types.Feed{
 			SignalID: fmt.Sprintf("signal.%d", i),
 			Interval: 60,

proto/feeds/v1beta1/params.proto

@@ -33,7 +33,7 @@ message Params {
   int64 power_step_threshold = 6;
 
   // MaxSupportedFeeds is the maximum number of feeds supported at a time.
-  int64 max_supported_feeds = 7;
+  uint64 max_supported_feeds = 7;
 
   // CooldownTime represents the duration (in seconds) during which validators are prohibited from sending new prices.
   int64 cooldown_time = 8;
@@ -45,5 +45,5 @@ message Params {
   int64 max_deviation_basis_point = 10;
 
   // SupportedFeedsUpdateInterval is the number of blocks after which the supported feeds will be re-calculated.
-  uint64 supported_feeds_update_interval = 11;
+  int64 supported_feeds_update_interval = 11;
 }

x/feeds/abci.go

@@ -9,7 +9,7 @@ import (
 // HandleEndBlock is a handler function for the EndBlock ABCI request.
 func HandleEndBlock(ctx sdk.Context, k keeper.Keeper) {
 	k.CalculatePrices(ctx)
-	if ctx.BlockHeight()%int64(k.GetParams(ctx).SupportedFeedsUpdateInterval) == 0 {
+	if ctx.BlockHeight()%k.GetParams(ctx).SupportedFeedsUpdateInterval == 0 {
 		feeds := k.CalculateNewSupportedFeeds(ctx)
 		k.SetSupportedFeeds(ctx, feeds)
 	}

x/feeds/keeper/keeper_signal.go

@@ -118,7 +118,7 @@ func (k Keeper) deleteSignalTotalPowerByPowerIndex(ctx sdk.Context, signalTotalP
 }
 
 // GetSignalTotalPowersByPower gets the current signal-total-power sorted by power-rank.
-func (k Keeper) GetSignalTotalPowersByPower(ctx sdk.Context, limit int64) []types.Signal {
+func (k Keeper) GetSignalTotalPowersByPower(ctx sdk.Context, limit uint64) []types.Signal {
 	signalTotalPowers := make([]types.Signal, limit)
 
 	iterator := k.SignalTotalPowersByPowerStoreIterator(ctx)

x/feeds/types/params.go

@@ -11,12 +11,12 @@ const (
 	DefaultMinInterval                   = int64(60)
 	DefaultMaxInterval                   = int64(3600)
 	DefaultPowerStepThreshold            = int64(1_000_000_000)
-	DefaultMaxSupportedFeeds             = int64(300)
+	DefaultMaxSupportedFeeds             = uint64(300)
 	DefaultCooldownTime                  = int64(30)
 	DefaultMinDeviationBasisPoint        = int64(50)
 	DefaultMaxDeviationBasisPoint        = int64(3000)
 	// estimated from block time of 3 seconds, aims for 1 day update
-	DefaultSupportedFeedsUpdateInterval = uint64(28800)
+	DefaultSupportedFeedsUpdateInterval = int64(28800)
 )
 
 // NewParams creates a new Params instance
@@ -27,11 +27,11 @@ func NewParams(
 	minInterval int64,
 	maxInterval int64,
 	powerStepThreshold int64,
-	maxSupportedFeeds int64,
+	maxSupportedFeeds uint64,
 	cooldownTime int64,
 	minDeviationBasisPoint int64,
 	maxDeviationBasisPoint int64,
-	supportedFeedsUpdateInterval uint64,
+	supportedFeedsUpdateInterval int64,
 ) Params {
 	return Params{
 		Admin:                         admin,
@@ -85,7 +85,7 @@ func (p Params) Validate() error {
 	if err := validateInt64("power threshold", true, p.PowerStepThreshold); err != nil {
 		return err
 	}
-	if err := validateInt64("max supported feeds", true, p.MaxSupportedFeeds); err != nil {
+	if err := validateUint64("max supported feeds", false, p.MaxSupportedFeeds); err != nil {
 		return err
 	}
 	if err := validateInt64("cooldown time", true, p.CooldownTime); err != nil {
@@ -97,7 +97,7 @@ func (p Params) Validate() error {
 	if err := validateInt64("max deviation basis point", true, p.MaxDeviationBasisPoint); err != nil {
 		return err
 	}
-	if err := validateUint64("supported feeds update interval", true, p.SupportedFeedsUpdateInterval); err != nil {
+	if err := validateInt64("supported feeds update interval", true, p.SupportedFeedsUpdateInterval); err != nil {
 		return err
 	}
 

x/feeds/types/params.pb.go

@@ -55,11 +55,6 @@ func TestParams_Validate(t *testing.T) {
 			params.PowerStepThreshold = -10 // Invalid value
 			return params
 		}(), fmt.Errorf("power threshold must be positive: -10")},
-		{"invalid MaxSupportedFeeds", func() types.Params {
-			params := types.DefaultParams()
-			params.MaxSupportedFeeds = 0 // Invalid value
-			return params
-		}(), fmt.Errorf("max supported feeds must be positive: 0")},
 		{"invalid CooldownTime", func() types.Params {
 			params := types.DefaultParams()
 			params.CooldownTime = -5 // Invalid value
@@ -90,6 +85,7 @@ func TestParams_Validate(t *testing.T) {
 				require.NoError(t, got)
 				return
 			}
+			require.Error(t, got)
 			require.Equal(t, tt.wantErr.Error(), got.Error())
 		})
 	}