fix: rename incorrect methods for hours and gigabytes

Author: ironman0x7b2

x/lease/types/v1/lease.go

@@ -18,25 +18,25 @@ func (m *Lease) DepositAmount() sdk.Coin {
 	return sdk.Coin{Denom: m.Price.Denom, Amount: amount}
 }
 
-// GetHours returns the duration the lease has been used in time.Duration.
-func (m *Lease) GetHours() time.Duration {
+// GetDuration returns the duration the lease has been used in time.Duration.
+func (m *Lease) GetDuration() time.Duration {
 	return time.Duration(m.Hours) * time.Hour
 }
 
-// GetMaxHours returns the total maximum duration of the lease in time.Duration.
-func (m *Lease) GetMaxHours() time.Duration {
+// GetMaxDuration returns the total maximum duration of the lease in time.Duration.
+func (m *Lease) GetMaxDuration() time.Duration {
 	return time.Duration(m.MaxHours) * time.Hour
 }
 
 // InactiveAt returns the time when the lease becomes inactive,.
 func (m *Lease) InactiveAt() time.Time {
-	return m.StartAt.Add(m.GetMaxHours())
+	return m.StartAt.Add(m.GetMaxDuration())
 }
 
 // PayoutAt returns the time when the lease's payout should occur.
 func (m *Lease) PayoutAt() time.Time {
 	if m.Hours < m.MaxHours {
-		return m.StartAt.Add(m.GetHours())
+		return m.StartAt.Add(m.GetDuration())
 	}
 
 	return time.Time{}

x/node/keeper/msg_handler.go

@@ -264,9 +264,9 @@ func (k *Keeper) HandleMsgStartSession(ctx sdk.Context, msg *v3.MsgStartSessionR
 			NodeAddress:   nodeAddr.String(),
 			DownloadBytes: sdkmath.ZeroInt(),
 			UploadBytes:   sdkmath.ZeroInt(),
-			MaxBytes:      msg.GetGigabytes(),
+			MaxBytes:      msg.GetBytes(),
 			Duration:      0,
-			MaxDuration:   msg.GetHours(),
+			MaxDuration:   msg.GetDuration(),
 			Status:        v1base.StatusActive,
 			InactiveAt:    inactiveAt,
 			StartAt:       ctx.BlockTime(),

x/node/types/v3/msg.go

@@ -179,13 +179,13 @@ func NewMsgStartSessionRequest(from sdk.AccAddress, nodeAddr base.NodeAddress, g
 	}
 }
 
-// GetGigabytes returns the total data usage in bytes for MsgStartSessionRequest.
-func (m *MsgStartSessionRequest) GetGigabytes() sdkmath.Int {
+// GetBytes returns the total data usage in bytes for MsgStartSessionRequest.
+func (m *MsgStartSessionRequest) GetBytes() sdkmath.Int {
 	return base.Gigabyte.MulRaw(m.Gigabytes)
 }
 
-// GetHours returns the session duration in time.Duration from MsgStartSessionRequest.
-func (m *MsgStartSessionRequest) GetHours() time.Duration {
+// GetDuration returns the session duration in time.Duration from MsgStartSessionRequest.
+func (m *MsgStartSessionRequest) GetDuration() time.Duration {
 	return time.Duration(m.Hours) * time.Hour
 }
 

x/plan/types/v3/plan.go

@@ -11,13 +11,13 @@ import (
 	v1base "github.com/sentinel-official/sentinelhub/v12/types/v1"
 )
 
-// GetGigabytes returns the plan's bandwidth as sdkmath.Int in bytes.
-func (m *Plan) GetGigabytes() sdkmath.Int {
+// GetBytes returns the plan's bandwidth as sdkmath.Int in bytes.
+func (m *Plan) GetBytes() sdkmath.Int {
 	return base.Gigabyte.MulRaw(m.Gigabytes)
 }
 
-// GetHours returns the plan's duration as a time.Duration value.
-func (m *Plan) GetHours() time.Duration {
+// GetDuration returns the plan's duration as a time.Duration value.
+func (m *Plan) GetDuration() time.Duration {
 	return time.Duration(m.Hours) * time.Hour
 }
 

x/subscription/keeper/msg_handler.go

@@ -139,7 +139,7 @@ func (k *Keeper) HandleMsgRenewSubscription(ctx sdk.Context, msg *v3.MsgRenewSub
 	}
 
 	// Construct the renewed subscription with updated times and pricing
-	inactiveAt := ctx.BlockTime().Add(plan.GetHours())
+	inactiveAt := ctx.BlockTime().Add(plan.GetDuration())
 	subscription = v3.Subscription{
 		ID:                 subscription.ID,
 		AccAddress:         subscription.AccAddress,
@@ -324,7 +324,7 @@ func (k *Keeper) HandleMsgStartSubscription(ctx sdk.Context, msg *v3.MsgStartSub
 
 	// Build the subscription object with a new ID
 	count := k.GetSubscriptionCount(ctx)
-	inactiveAt := ctx.BlockTime().Add(plan.GetHours())
+	inactiveAt := ctx.BlockTime().Add(plan.GetDuration())
 	subscription := v3.Subscription{
 		ID:                 count + 1,
 		AccAddress:         accAddr.String(),
@@ -382,7 +382,7 @@ func (k *Keeper) HandleMsgStartSubscription(ctx sdk.Context, msg *v3.MsgStartSub
 	alloc := v2.Allocation{
 		ID:            subscription.ID,
 		Address:       subscription.AccAddress,
-		GrantedBytes:  plan.GetGigabytes(),
+		GrantedBytes:  plan.GetBytes(),
 		UtilisedBytes: sdkmath.ZeroInt(),
 	}