Skip to content

Commit 767e06b

Browse files
committed
fix: prices validation is node params
1 parent b0ad886 commit 767e06b

File tree

6 files changed

+9
-9
lines changed

6 files changed

+9
-9
lines changed

x/lease/keeper/abci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ func (k *Keeper) handleLeaseRenewals(ctx sdk.Context) {
142142
// Execute the handler to process the lease renewal
143143
resp, err := handler(cc, msg)
144144
if err != nil {
145-
k.Logger(cc).Error("Failed to handle lease renewal", "id", item.ID, "message", err)
145+
k.Logger(cc).Error("Failed to handle lease renewal", "id", item.ID, "msg", err)
146146
return false
147147
}
148148

x/lease/keeper/msg_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ func (k *Keeper) HandleMsgRenewLease(ctx sdk.Context, msg *v1.MsgRenewLeaseReque
114114
}
115115

116116
if err := lease.ValidateRenewalPolicies(price); err != nil {
117-
return nil, sdkerrors.Wrapf(types.ErrInvalidRenewalPolicy, err.Error())
117+
return nil, sdkerrors.Wrap(types.ErrInvalidRenewalPolicy, err.Error())
118118
}
119119

120120
refund := lease.RefundAmount()

x/node/types/v3/params.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -200,31 +200,31 @@ func validateActiveDuration(v interface{}) error {
200200
}
201201

202202
func validateMinGigabytePrices(v interface{}) error {
203-
value, ok := v.(v1base.Prices)
203+
value, ok := v.([]v1base.Price)
204204
if !ok {
205205
return fmt.Errorf("invalid parameter type %T", v)
206206
}
207207

208208
if value == nil {
209209
return nil
210210
}
211-
if !value.IsValid() {
211+
if !v1base.Prices(value).IsValid() {
212212
return fmt.Errorf("min_gigabyte_prices must be valid")
213213
}
214214

215215
return nil
216216
}
217217

218218
func validateMinHourlyPrices(v interface{}) error {
219-
value, ok := v.(v1base.Prices)
219+
value, ok := v.([]v1base.Price)
220220
if !ok {
221221
return fmt.Errorf("invalid parameter type %T", v)
222222
}
223223

224224
if value == nil {
225225
return nil
226226
}
227-
if !value.IsValid() {
227+
if !v1base.Prices(value).IsValid() {
228228
return fmt.Errorf("min_hourly_prices must be valid")
229229
}
230230

x/oracle/keeper/abci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ func (k *Keeper) BeginBlock(ctx sdk.Context) {
5353
// Send the GetProtoRevPool query packet over IBC.
5454
sequence, err := k.SendQueryPacket(ctx, channelCap, portID, channelID, uint64(timeout), req)
5555
if err != nil {
56-
k.Logger(ctx).Error("Failed to send query packet", "asset", item.Denom, "message", err)
56+
k.Logger(ctx).Error("Failed to send query packet", "asset", item.Denom, "msg", err)
5757
return false
5858
}
5959

x/subscription/keeper/abci.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func (k *Keeper) handleSubscriptionRenewals(ctx sdk.Context) {
116116
// Execute the handler to process the subscription renewal
117117
resp, err := handler(cc, msg)
118118
if err != nil {
119-
k.Logger(cc).Error("Failed to handle subscription renewal", "id", item.ID, "message", err)
119+
k.Logger(cc).Error("Failed to handle subscription renewal", "id", item.ID, "msg", err)
120120
return false
121121
}
122122

x/subscription/keeper/msg_handler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ func (k *Keeper) HandleMsgRenewSubscription(ctx sdk.Context, msg *v3.MsgRenewSub
8686
}
8787

8888
if err := subscription.ValidateRenewalPolicies(price); err != nil {
89-
return nil, sdkerrors.Wrapf(types.ErrInvalidRenewalPolicy, err.Error())
89+
return nil, sdkerrors.Wrap(types.ErrInvalidRenewalPolicy, err.Error())
9090
}
9191

9292
k.DeleteSubscriptionForInactiveAt(ctx, subscription.InactiveAt, subscription.ID)

0 commit comments

Comments
 (0)