Skip to content

Commit 833849f

Browse files
committed
fix: incorrect use sdk errors Wrapf method
1 parent 2ac025b commit 833849f

File tree

6 files changed

+19
-23
lines changed

6 files changed

+19
-23
lines changed

x/deposit/types/v1/deposit.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package v1
22

33
import (
44
"errors"
5+
"fmt"
56

6-
sdkerrors "cosmossdk.io/errors"
77
sdk "github.com/cosmos/cosmos-sdk/types"
88
)
99

@@ -13,7 +13,7 @@ func (m *Deposit) Validate() error {
1313
}
1414

1515
if _, err := sdk.AccAddressFromBech32(m.Address); err != nil {
16-
return sdkerrors.Wrapf(err, "invalid address %s", m.Address)
16+
return fmt.Errorf("invalid address %s: %w", m.Address, err)
1717
}
1818

1919
if m.Coins == nil {

x/provider/types/v2/provider.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import (
55
"fmt"
66
"net/url"
77

8-
sdkerrors "cosmossdk.io/errors"
9-
108
base "github.com/sentinel-official/sentinelhub/v12/types"
119
v1base "github.com/sentinel-official/sentinelhub/v12/types/v1"
1210
)
@@ -17,7 +15,7 @@ func (m *Provider) Validate() error {
1715
}
1816

1917
if _, err := base.ProvAddressFromBech32(m.Address); err != nil {
20-
return sdkerrors.Wrapf(err, "invalid address %s", m.Address)
18+
return fmt.Errorf("invalid address %s: %w", m.Address, err)
2119
}
2220

2321
if m.Name == "" {
@@ -38,7 +36,7 @@ func (m *Provider) Validate() error {
3836

3937
if m.Website != "" {
4038
if _, err := url.ParseRequestURI(m.Website); err != nil {
41-
return sdkerrors.Wrapf(err, "invalid website %s", m.Website)
39+
return fmt.Errorf("invalid website %s: %w", m.Website, err)
4240
}
4341
}
4442

x/subscription/types/v2/allocation.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ package v2
22

33
import (
44
"errors"
5+
"fmt"
56

6-
sdkerrors "cosmossdk.io/errors"
77
sdk "github.com/cosmos/cosmos-sdk/types"
88
)
99

@@ -13,7 +13,7 @@ func (m *Allocation) Validate() error {
1313
}
1414

1515
if _, err := sdk.AccAddressFromBech32(m.Address); err != nil {
16-
return sdkerrors.Wrapf(err, "invalid address %s", m.Address)
16+
return fmt.Errorf("invalid address %s: %w", m.Address, err)
1717
}
1818

1919
if m.GrantedBytes.IsNil() {

x/swap/types/v1/params.go

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"errors"
55
"fmt"
66

7-
sdkerrors "cosmossdk.io/errors"
87
sdk "github.com/cosmos/cosmos-sdk/types"
98
authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
109
paramstypes "github.com/cosmos/cosmos-sdk/x/params/types"
@@ -34,15 +33,15 @@ func (m *Params) Validate() error {
3433
}
3534

3635
if err := sdk.ValidateDenom(m.SwapDenom); err != nil {
37-
return sdkerrors.Wrapf(err, "invalid swap_denom %s", m.SwapDenom)
36+
return fmt.Errorf("invalid swap_denom %s: %w", m.SwapDenom, err)
3837
}
3938

4039
if m.ApproveBy == "" {
4140
return errors.New("approve_by cannot be empty")
4241
}
4342

4443
if _, err := sdk.AccAddressFromBech32(m.ApproveBy); err != nil {
45-
return sdkerrors.Wrapf(err, "invalid approve_by %s", m.ApproveBy)
44+
return fmt.Errorf("invalid approve_by %s: %w", m.ApproveBy, err)
4645
}
4746

4847
return nil
@@ -75,7 +74,7 @@ func (m *Params) ParamSetPairs() paramstypes.ParamSetPairs {
7574
return errors.New("value cannot be empty")
7675
}
7776
if err := sdk.ValidateDenom(value); err != nil {
78-
return sdkerrors.Wrapf(err, "invalid value %s", value)
77+
return fmt.Errorf("invalid value %s: %w", value, err)
7978
}
8079

8180
return nil
@@ -94,7 +93,7 @@ func (m *Params) ParamSetPairs() paramstypes.ParamSetPairs {
9493
return errors.New("value cannot be empty")
9594
}
9695
if _, err := sdk.AccAddressFromBech32(value); err != nil {
97-
return sdkerrors.Wrapf(err, "invalid value %s", value)
96+
return fmt.Errorf("invalid value %s: %w", value, err)
9897
}
9998

10099
return nil

x/swap/types/v1/swap.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ import (
44
"errors"
55
"fmt"
66

7-
sdkerrors "cosmossdk.io/errors"
87
sdk "github.com/cosmos/cosmos-sdk/types"
98

109
"github.com/sentinel-official/sentinelhub/v12/x/swap/types"
@@ -36,7 +35,7 @@ func (m *Swap) Validate() error {
3635
}
3736

3837
if _, err := sdk.AccAddressFromBech32(m.Receiver); err != nil {
39-
return sdkerrors.Wrapf(err, "invalid receiver %s", m.Receiver)
38+
return fmt.Errorf("invalid receiver %s: %w", m.Receiver, err)
4039
}
4140

4241
if m.Amount.IsNegative() {

x/vpn/types/v1/genesis.go

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package v1
22

33
import (
4-
sdkerrors "cosmossdk.io/errors"
4+
"fmt"
55

66
deposittypes "github.com/sentinel-official/sentinelhub/v12/x/deposit/types/v1"
77
leasetypes "github.com/sentinel-official/sentinelhub/v12/x/lease/types/v1"
@@ -46,31 +46,31 @@ func DefaultGenesisState() *GenesisState {
4646

4747
func (m *GenesisState) Validate() error {
4848
if err := deposittypes.ValidateGenesisState(m.Deposit); err != nil {
49-
return sdkerrors.Wrapf(err, "invalid deposit genesis state")
49+
return fmt.Errorf("invalid deposit genesis state: %w", err)
5050
}
5151

5252
if err := leasetypes.ValidateGenesis(m.Lease); err != nil {
53-
return sdkerrors.Wrapf(err, "invalid lease genesis state")
53+
return fmt.Errorf("invalid lease genesis state: %w", err)
5454
}
5555

5656
if err := nodetypes.ValidateGenesis(m.Node); err != nil {
57-
return sdkerrors.Wrapf(err, "invalid node genesis state")
57+
return fmt.Errorf("invalid node genesis state: %w", err)
5858
}
5959

6060
if err := plantypes.ValidateGenesis(m.Plan); err != nil {
61-
return sdkerrors.Wrapf(err, "invalid plan genesis state")
61+
return fmt.Errorf("invalid plan genesis state: %w", err)
6262
}
6363

6464
if err := providertypes.ValidateGenesis(m.Provider); err != nil {
65-
return sdkerrors.Wrapf(err, "invalid provider genesis state")
65+
return fmt.Errorf("invalid provider genesis state: %w", err)
6666
}
6767

6868
if err := sessiontypes.ValidateGenesis(m.Session); err != nil {
69-
return sdkerrors.Wrapf(err, "invalid session genesis state")
69+
return fmt.Errorf("invalid session genesis state: %w", err)
7070
}
7171

7272
if err := subscriptiontypes.ValidateGenesis(m.Subscription); err != nil {
73-
return sdkerrors.Wrapf(err, "invalid subscription genesis state")
73+
return fmt.Errorf("invalid subscription genesis state: %w", err)
7474
}
7575

7676
return nil

0 commit comments

Comments
 (0)