chore: rename active_duration and status_change_delay parameter to status_timeout

Author: ironman0x7b2

Makefile

@@ -76,7 +76,7 @@ proto-gen:
 
 .PHONY: proto-lint
 proto-lint:
-	find proto -name *.proto -exec buf format -w {} \;
+	@find proto -name *.proto -exec buf format -w {} \;
 
 .PHONY: build-image
 build-image:

proto/sentinel/node/v3/params.proto

@@ -11,11 +11,11 @@ option (gogoproto.equal_all) = false;
 option (gogoproto.goproto_getters_all) = false;
 
 message Params {
-  google.protobuf.Duration active_duration = 1 [
+  cosmos.base.v1beta1.Coin deposit = 1 [(gogoproto.nullable) = false];
+  repeated sentinel.types.v1.Price min_gigabyte_prices = 2 [(gogoproto.nullable) = false];
+  repeated sentinel.types.v1.Price min_hourly_prices = 3 [(gogoproto.nullable) = false];
+  google.protobuf.Duration status_timeout = 4 [
     (gogoproto.nullable) = false,
     (gogoproto.stdduration) = true
   ];
-  cosmos.base.v1beta1.Coin deposit = 2 [(gogoproto.nullable) = false];
-  repeated sentinel.types.v1.Price min_gigabyte_prices = 3 [(gogoproto.nullable) = false];
-  repeated sentinel.types.v1.Price min_hourly_prices = 4 [(gogoproto.nullable) = false];
 }

proto/sentinel/session/v3/params.proto

@@ -18,7 +18,7 @@ message Params {
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
-  google.protobuf.Duration status_change_delay = 7 [
+  google.protobuf.Duration status_timeout = 7 [
     (gogoproto.nullable) = false,
     (gogoproto.stdduration) = true
   ];

proto/sentinel/subscription/v3/params.proto

@@ -13,7 +13,7 @@ message Params {
     (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
     (gogoproto.nullable) = false
   ];
-  google.protobuf.Duration status_change_delay = 2 [
+  google.protobuf.Duration status_timeout = 2 [
     (gogoproto.nullable) = false,
     (gogoproto.stdduration) = true
   ];

x/node/keeper/params.go

@@ -31,11 +31,6 @@ func (k *Keeper) GetParams(ctx sdk.Context) (v v3.Params) {
 	return v
 }
 
-// ActiveDuration retrieves the active duration parameter from the module's parameters.
-func (k *Keeper) ActiveDuration(ctx sdk.Context) time.Duration {
-	return k.GetParams(ctx).ActiveDuration
-}
-
 // Deposit retrieves the deposit parameter from the module's parameters.
 func (k *Keeper) Deposit(ctx sdk.Context) sdk.Coin {
 	return k.GetParams(ctx).Deposit
@@ -51,6 +46,11 @@ func (k *Keeper) MinHourlyPrices(ctx sdk.Context) v1base.Prices {
 	return k.GetParams(ctx).MinHourlyPrices
 }
 
+// StatusTimeout retrieves the status timeout parameter from the module's parameters.
+func (k *Keeper) StatusTimeout(ctx sdk.Context) time.Duration {
+	return k.GetParams(ctx).StatusTimeout
+}
+
 // ValidateGigabytePrices validates prices against the minimum gigabyte prices.
 func (k *Keeper) ValidateGigabytePrices(ctx sdk.Context, prices v1base.Prices) error {
 	minPrices := k.MinGigabytePrices(ctx)
@@ -65,9 +65,9 @@ func (k *Keeper) ValidateHourlyPrices(ctx sdk.Context, prices v1base.Prices) err
 	return validatePrices(prices, minPrices)
 }
 
-// GetInactiveAt returns the inactive time by adding ActiveDuration to the current block time.
+// GetInactiveAt returns the inactive time by adding StatusTimeout to the current block time.
 func (k *Keeper) GetInactiveAt(ctx sdk.Context) time.Time {
-	d := k.ActiveDuration(ctx)
+	d := k.StatusTimeout(ctx)
 
 	return ctx.BlockTime().Add(d)
 }

x/node/migrations/migrator.go

@@ -55,10 +55,10 @@ func (k *Migrator) deleteKeys(ctx sdk.Context, keyPrefix []byte) (keys [][]byte)
 
 func (k *Migrator) setParams(ctx sdk.Context) {
 	params := v3.Params{
-		ActiveDuration:    1 * time.Hour,
 		Deposit:           sdk.NewInt64Coin("udvpn", 0),
 		MinGigabytePrices: []v1.Price{}, // TODO: set min gigabyte prices
 		MinHourlyPrices:   []v1.Price{}, // TODO: set min hourly prices
+		StatusTimeout:     1 * time.Hour,
 	}
 
 	k.node.SetParams(ctx, params)

x/node/types/v3/params.go

@@ -12,9 +12,6 @@ import (
 )
 
 var (
-	// DefaultActiveDuration defines the default duration a node remains active after registration.
-	DefaultActiveDuration = 30 * time.Second
-
 	// DefaultDeposit defines the default amount of deposit required for a node.
 	DefaultDeposit = sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(10))
 
@@ -35,6 +32,9 @@ var (
 			QuoteValue: sdkmath.NewInt(10),
 		},
 	}
+
+	// DefaultStatusTimeout defines the default duration before a status is considered outdated.
+	DefaultStatusTimeout = 30 * time.Second
 )
 
 // GetMinGigabytePrices returns the minimum gigabyte prices configured in the parameters.
@@ -49,10 +49,6 @@ func (m *Params) GetMinHourlyPrices() v1base.Prices {
 
 // Validate validates all parameters to ensure they conform to expected rules.
 func (m *Params) Validate() error {
-	if err := validateActiveDuration(m.ActiveDuration); err != nil {
-		return fmt.Errorf("invalid active_duration: %w", err)
-	}
-
 	if err := validateDeposit(m.Deposit); err != nil {
 		return fmt.Errorf("invalid deposit: %w", err)
 	}
@@ -65,44 +61,35 @@ func (m *Params) Validate() error {
 		return fmt.Errorf("invalid min_hourly_prices: %w", err)
 	}
 
+	if err := validateStatusTimeout(m.StatusTimeout); err != nil {
+		return fmt.Errorf("invalid status_timeout: %w", err)
+	}
+
 	return nil
 }
 
 // NewParams creates a new Params instance with the provided values.
 func NewParams(
-	activeDuration time.Duration, deposit sdk.Coin, minGigabytePrices, minHourlyPrices v1base.Prices,
+	deposit sdk.Coin, minGigabytePrices, minHourlyPrices v1base.Prices, statusTimeout time.Duration,
 ) Params {
 	return Params{
-		ActiveDuration:    activeDuration,
 		Deposit:           deposit,
 		MinGigabytePrices: minGigabytePrices,
 		MinHourlyPrices:   minHourlyPrices,
+		StatusTimeout:     statusTimeout,
 	}
 }
 
 // DefaultParams returns the default parameters for the module.
 func DefaultParams() Params {
 	return NewParams(
-		DefaultActiveDuration,
 		DefaultDeposit,
 		DefaultMinGigabytePrices,
 		DefaultMinHourlyPrices,
+		DefaultStatusTimeout,
 	)
 }
 
-// validateActiveDuration checks that the active duration is greater than zero.
-func validateActiveDuration(v time.Duration) error {
-	if v == 0 {
-		return errors.New("value cannot be zero")
-	}
-
-	if v < 0 {
-		return errors.New("value cannot be negative")
-	}
-
-	return nil
-}
-
 // validateDeposit checks that the deposit is not nil, not negative, and valid.
 func validateDeposit(v sdk.Coin) error {
 	if v.IsNil() {
@@ -145,3 +132,16 @@ func validateMinHourlyPrices(v []v1base.Price) error {
 
 	return nil
 }
+
+// validateStatusTimeout checks that the status duration is greater than zero.
+func validateStatusTimeout(v time.Duration) error {
+	if v == 0 {
+		return errors.New("value cannot be zero")
+	}
+
+	if v < 0 {
+		return errors.New("value cannot be negative")
+	}
+
+	return nil
+}