feat: renamed field status_change_delay to inactive_pending_duration in subscription params

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/subscription/v3/params.proto

@@ -9,12 +9,12 @@ option (gogoproto.equal_all) = false;
 option (gogoproto.goproto_getters_all) = false;
 
 message Params {
-  string staking_share = 1 [
-    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
-    (gogoproto.nullable) = false
-  ];
-  google.protobuf.Duration status_change_delay = 2 [
+  google.protobuf.Duration inactive_pending_duration = 1 [
     (gogoproto.nullable) = false,
     (gogoproto.stdduration) = true
   ];
+  string staking_share = 2 [
+    (gogoproto.customtype) = "cosmossdk.io/math.LegacyDec",
+    (gogoproto.nullable) = false
+  ];
 }

x/subscription/keeper/msg_handler.go

@@ -42,7 +42,7 @@ func (k *Keeper) HandleMsgCancelSubscription(ctx sdk.Context, msg *v3.MsgCancelS
 
 	// Clear renewal policy and mark subscription as inactive pending
 	subscription.RenewalPricePolicy = v1base.RenewalPricePolicyUnspecified
-	subscription.InactiveAt = k.GetInactiveAt(ctx)
+	subscription.InactiveAt = k.GetInactivePendingAt(ctx)
 	subscription.Status = v1base.StatusInactivePending
 	subscription.StatusAt = ctx.BlockTime()
 

x/subscription/keeper/params.go

@@ -30,19 +30,19 @@ func (k *Keeper) GetParams(ctx sdk.Context) (v v3.Params) {
 	return v
 }
 
+// InactivePendingDuration returns the inactive pending duration from the module's parameters.
+func (k *Keeper) InactivePendingDuration(ctx sdk.Context) time.Duration {
+	return k.GetParams(ctx).InactivePendingDuration
+}
+
 // StakingShare retrieves the staking share parameter from the module's parameters.
 func (k *Keeper) StakingShare(ctx sdk.Context) sdkmath.LegacyDec {
 	return k.GetParams(ctx).StakingShare
 }
 
-// StatusChangeDelay returns the delay for status changes from the module's parameters.
-func (k *Keeper) StatusChangeDelay(ctx sdk.Context) time.Duration {
-	return k.GetParams(ctx).StatusChangeDelay
-}
-
-// GetInactiveAt returns the inactive time by adding StatusChangeDelay to the current block time.
-func (k *Keeper) GetInactiveAt(ctx sdk.Context) time.Time {
-	d := k.StatusChangeDelay(ctx)
+// GetInactivePendingAt returns the inactive pending time by adding InactivePendingDuration to the current block time.
+func (k *Keeper) GetInactivePendingAt(ctx sdk.Context) time.Time {
+	d := k.InactivePendingDuration(ctx)
 
 	return ctx.BlockTime().Add(d)
 }

x/subscription/migrations/migrator.go

@@ -76,8 +76,8 @@ func (k *Migrator) deleteKeys(ctx sdk.Context, keyPrefix []byte) (keys [][]byte)
 
 func (k *Migrator) setParams(ctx sdk.Context) {
 	params := v3.Params{
-		StakingShare:      sdkmath.LegacyMustNewDecFromStr("0.2"),
-		StatusChangeDelay: 4 * time.Hour,
+		InactivePendingDuration: 4 * time.Hour,
+		StakingShare:            sdkmath.LegacyMustNewDecFromStr("0.2"),
 	}
 
 	k.subscription.SetParams(ctx, params)

x/subscription/types/v3/params.go

@@ -10,36 +10,36 @@ import (
 
 // Default parameter values for the Params struct.
 var (
-	DefaultStakingShare      = sdkmath.LegacyMustNewDecFromStr("0.1") // Default staking share: 0.1
-	DefaultStatusChangeDelay = 2 * time.Minute                        // Default delay before status change
+	DefaultInactivePendingDuration = 2 * time.Minute                        // Default inactive pending duration
+	DefaultStakingShare            = sdkmath.LegacyMustNewDecFromStr("0.1") // Default staking share: 0.1
 )
 
 // Validate checks whether the Params fields are valid according to defined rules.
 func (m *Params) Validate() error {
-	if err := validateStakingShare(m.StakingShare); err != nil {
-		return fmt.Errorf("invalid staking_share: %w", err)
+	if err := validateInactivePendingDuration(m.InactivePendingDuration); err != nil {
+		return fmt.Errorf("invalid inactive_pending_duration: %w", err)
 	}
 
-	if err := validateStatusChangeDelay(m.StatusChangeDelay); err != nil {
-		return fmt.Errorf("invalid status_change_delay: %w", err)
+	if err := validateStakingShare(m.StakingShare); err != nil {
+		return fmt.Errorf("invalid staking_share: %w", err)
 	}
 
 	return nil
 }
 
 // NewParams creates a new Params instance with custom values.
-func NewParams(stakingShare sdkmath.LegacyDec, statusChangeDelay time.Duration) Params {
+func NewParams(inactivePendingDuration time.Duration, stakingShare sdkmath.LegacyDec) Params {
 	return Params{
-		StakingShare:      stakingShare,
-		StatusChangeDelay: statusChangeDelay,
+		InactivePendingDuration: inactivePendingDuration,
+		StakingShare:            stakingShare,
 	}
 }
 
 // DefaultParams returns a Params struct initialized with default values.
 func DefaultParams() Params {
 	return NewParams(
+		DefaultInactivePendingDuration,
 		DefaultStakingShare,
-		DefaultStatusChangeDelay,
 	)
 }
 
@@ -63,8 +63,8 @@ func validateStakingShare(v sdkmath.LegacyDec) error {
 	return nil
 }
 
-// validateStatusChangeDelay checks that statusChangeDelay is a positive duration.
-func validateStatusChangeDelay(v time.Duration) error {
+// validateInactivePendingDuration checks that InactivePendingDuration is a positive duration.
+func validateInactivePendingDuration(v time.Duration) error {
 	if v == 0 {
 		return errors.New("value cannot be zero")
 	}