Skip to content

Commit 234c521

Browse files
change types
1 parent 861bd93 commit 234c521

4 files changed

Lines changed: 21 additions & 14 deletions

File tree

x/resource/genesis.go

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,11 @@ func ExportGenesis(ctx sdk.Context, k keeper.Keeper) *types.GenesisState {
4141
}
4242

4343
// get fee params
44-
feeParams := k.GetParams(ctx)
44+
feeParams, err := k.GetParams(ctx)
45+
if err != nil {
46+
panic(fmt.Sprintln("Cannot get fee params: %s", err.Error()))
47+
48+
}
4549

4650
return &types.GenesisState{
4751
Resources: resourceList,

x/resource/ibc_module.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,10 @@ func (im IBCModule) OnChanOpenTry(
7878
counterpartyVersion string,
7979
) (string, error) {
8080
// Require portID is the portID module is bound to
81-
boundPort := im.keeper.GetPort(ctx)
81+
boundPort, err := im.keeper.GetPort(ctx)
82+
if err != nil {
83+
return "", err
84+
}
8285
if boundPort != portID {
8386
return "", errorsmod.Wrapf(porttypes.ErrInvalidPort, "invalid port: %s, expected %s", portID, boundPort)
8487
}

x/resource/keeper/keeper_param_change_proposal_test.go

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

33
import (
4+
sdkmath "cosmossdk.io/math"
45
"github.com/stretchr/testify/suite"
56

6-
tmproto "github.com/cometbft/cometbft/proto/tendermint/types"
7-
87
cheqdapp "github.com/cheqd/cheqd-node/app"
98
resourcetypes "github.com/cheqd/cheqd-node/x/resource/types"
109
sdk "github.com/cosmos/cosmos-sdk/types"
@@ -30,7 +29,7 @@ func (suite *HandlerTestSuite) SetupTest() error {
3029
if err != nil {
3130
return err
3231
}
33-
suite.ctx = suite.app.BaseApp.NewContext(false, tmproto.Header{})
32+
suite.ctx = suite.app.BaseApp.NewContext(false)
3433
suite.govHandler = params.NewParamChangeProposalHandler(suite.app.ParamsKeeper)
3534
return nil
3635
}
@@ -68,13 +67,14 @@ var _ = DescribeTable("Proposal Handler", func(testcase TestCaseKeeperProposal)
6867
}),
6968
func(handlerSuite *HandlerTestSuite) {
7069
expectedFeeParams := resourcetypes.FeeParams{
71-
Image: sdk.Coin{Denom: resourcetypes.BaseMinimalDenom, Amount: sdk.NewInt(10000000000)},
72-
Json: sdk.Coin{Denom: resourcetypes.BaseMinimalDenom, Amount: sdk.NewInt(4000000000)},
73-
Default: sdk.Coin{Denom: resourcetypes.BaseMinimalDenom, Amount: sdk.NewInt(2000000000)},
74-
BurnFactor: sdk.MustNewDecFromStr("0.600000000000000000"),
70+
Image: sdk.Coin{Denom: resourcetypes.BaseMinimalDenom, Amount: sdkmath.NewInt(10000000000)},
71+
Json: sdk.Coin{Denom: resourcetypes.BaseMinimalDenom, Amount: sdkmath.NewInt(4000000000)},
72+
Default: sdk.Coin{Denom: resourcetypes.BaseMinimalDenom, Amount: sdkmath.NewInt(2000000000)},
73+
BurnFactor: sdkmath.LegacyMustNewDecFromStr("0.600000000000000000"),
7574
}
7675

77-
feeParams := handlerSuite.app.ResourceKeeper.GetParams(handlerSuite.ctx)
76+
feeParams, err := handlerSuite.app.ResourceKeeper.GetParams(handlerSuite.ctx)
77+
Expect(err).To(BeNil())
7878

7979
Expect(expectedFeeParams).To(Equal(feeParams))
8080
},

x/resource/types/params.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ func ParamKeyTable() paramstypes.KeyTable {
2727
// )
2828

2929
// NewParams creates a new FeeParams object with specified parameters
30-
func NewParams(image, json, defaultFee sdk.Coin, burnFactor sdkmath.Dec) FeeParams {
30+
func NewParams(image, json, defaultFee sdk.Coin, burnFactor sdkmath.LegacyDec) FeeParams {
3131
return FeeParams{
3232
Image: image,
3333
Json: json,
@@ -61,7 +61,7 @@ func (tfp *FeeParams) ValidateBasic() error {
6161
return fmt.Errorf("invalid create resource default tx fee: %s", tfp.Json)
6262
}
6363

64-
if !tfp.BurnFactor.IsPositive() || tfp.BurnFactor.GTE(sdk.OneDec()) {
64+
if !tfp.BurnFactor.IsPositive() || tfp.BurnFactor.GTE(sdkmath.LegacyOneDec()) {
6565
return fmt.Errorf("invalid burn factor: %s", tfp.BurnFactor)
6666
}
6767

@@ -120,7 +120,7 @@ func validateDefault(i interface{}) error {
120120
}
121121

122122
func validateBurnFactor(i interface{}) error {
123-
v, ok := i.(sdk.Dec)
123+
v, ok := i.(sdkmath.LegacyDec)
124124
if !ok {
125125
return fmt.Errorf("invalid parameter type: %T", i)
126126
}
@@ -133,7 +133,7 @@ func validateBurnFactor(i interface{}) error {
133133
return fmt.Errorf("burn factor must not be negative: %s", v)
134134
}
135135

136-
if v.GTE(sdk.OneDec()) {
136+
if v.GTE(sdkmath.LegacyOneDec()) {
137137
return fmt.Errorf("burn factor must be less than 1: %s", v)
138138
}
139139

0 commit comments

Comments
 (0)