LaconicNetwork/cosmos-sdk
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

refactor: remove aliases from types/math.go in evidence and feegrant (#15676)

Browse Source
This commit is contained in:
samricotta 2023-04-03 17:58:33 +02:00 committed by GitHub
parent c1974e4b3c
commit 448ffbc722
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
x/evidence/types/expected_keepers.go
View File

@ -1,9 +1,11 @@
package types
import (
context "context"
"context"
"time"
sdkmath "cosmossdk.io/math"
cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
sdk "github.com/cosmos/cosmos-sdk/types"
stakingtypes "github.com/cosmos/cosmos-sdk/x/staking/types"
@ -24,9 +26,9 @@ type (
IsTombstoned(sdk.Context, sdk.ConsAddress) bool
HasValidatorSigningInfo(sdk.Context, sdk.ConsAddress) bool
Tombstone(sdk.Context, sdk.ConsAddress)
Slash(sdk.Context, sdk.ConsAddress, sdk.Dec, int64, int64)
SlashWithInfractionReason(sdk.Context, sdk.ConsAddress, sdk.Dec, int64, int64, stakingtypes.Infraction)
SlashFractionDoubleSign(sdk.Context) sdk.Dec
Slash(sdk.Context, sdk.ConsAddress, sdkmath.LegacyDec, int64, int64)
SlashWithInfractionReason(sdk.Context, sdk.ConsAddress, sdkmath.LegacyDec, int64, int64, stakingtypes.Infraction)
SlashFractionDoubleSign(sdk.Context) sdkmath.LegacyDec
Jail(sdk.Context, sdk.ConsAddress)
JailUntil(sdk.Context, sdk.ConsAddress, time.Time)
}

27
x/feegrant/client/cli/tx_test.go
View File

@ -8,6 +8,7 @@ import (
"testing"
"time"
sdkmath "cosmossdk.io/math"
abci "github.com/cometbft/cometbft/abci/types"
rpcclientmock "github.com/cometbft/cometbft/rpc/client/mock"
"github.com/cosmos/gogoproto/proto"
@ -92,7 +93,7 @@ func (s *CLITestSuite) SetupSuite() {
s.createGrant(granter, grantee)
grant, err := feegrant.NewGrant(granter, grantee, &feegrant.BasicAllowance{
SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))),
SpendLimit: sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(100))),
})
s.Require().NoError(err)
@ -110,10 +111,10 @@ func (s *CLITestSuite) createGrant(granter, grantee sdk.Address) {
commonFlags := []string{
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(100))).String()),
}
fee := sdk.NewCoin("stake", sdk.NewInt(100))
fee := sdk.NewCoin("stake", sdkmath.NewInt(100))
args := append(
[]string{
@ -147,7 +148,7 @@ func (s *CLITestSuite) TestNewCmdFeeGrant() {
commonFlags := []string{
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(10))).String()),
}
testCases := []struct {
@ -434,7 +435,7 @@ func (s *CLITestSuite) TestNewCmdRevokeFeegrant() {
commonFlags := []string{
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(10))).String()),
}
addressCodec := codecaddress.NewBech32Codec("cosmos")
@ -533,10 +534,10 @@ func (s *CLITestSuite) TestTxWithFeeGrant() {
commonFlags := []string{
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(10))).String()),
}
fee := sdk.NewCoin("stake", sdk.NewInt(100))
fee := sdk.NewCoin("stake", sdkmath.NewInt(100))
args := append(
[]string{
@ -610,7 +611,7 @@ func (s *CLITestSuite) msgSubmitLegacyProposal(clientCtx client.Context, from, t
commonArgs := []string{
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(10))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(10))).String()),
}
args := append([]string{
@ -645,9 +646,9 @@ func (s *CLITestSuite) TestFilteredFeeAllowance() {
commonFlags := []string{
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(100))).String()),
}
spendLimit := sdk.NewCoin("stake", sdk.NewInt(1000))
spendLimit := sdk.NewCoin("stake", sdkmath.NewInt(1000))
allowMsgs := strings.Join([]string{sdk.MsgTypeURL(&govv1beta1.MsgSubmitProposal{}), sdk.MsgTypeURL(&govv1.MsgVoteWeighted{})}, ",")
@ -731,7 +732,7 @@ func (s *CLITestSuite) TestFilteredFeeAllowance() {
return s.msgSubmitLegacyProposal(s.baseCtx, grantee.String(),
"Text Proposal", "No desc", govv1beta1.ProposalTypeText,
fmt.Sprintf("--%s=%s", flags.FlagFeeGranter, granter.String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(100))).String()),
)
},
&sdk.TxResponse{},
@ -742,7 +743,7 @@ func (s *CLITestSuite) TestFilteredFeeAllowance() {
func() error {
return s.msgVote(s.baseCtx, grantee.String(), "0", "yes",
fmt.Sprintf("--%s=%s", flags.FlagFeeGranter, granter.String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(100))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(100))).String()),
)
},
&sdk.TxResponse{},
@ -787,7 +788,7 @@ func (s *CLITestSuite) msgVote(clientCtx client.Context, from, id, vote string,
commonArgs := []string{
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdk.NewInt(10))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(10))).String()),
}
args := append([]string{
id,

3
x/feegrant/keeper/keeper_test.go
View File

@ -6,6 +6,7 @@ import (
"github.com/golang/mock/gomock"
"github.com/stretchr/testify/suite"
sdkmath "cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/feegrant"
"cosmossdk.io/x/feegrant/keeper"
@ -62,7 +63,7 @@ func (suite *KeeperTestSuite) SetupTest() {
suite.feegrantKeeper = keeper.NewKeeper(encCfg.Codec, key, suite.accountKeeper)
suite.ctx = testCtx.Ctx
suite.msgSrvr = keeper.NewMsgServerImpl(suite.feegrantKeeper)
suite.atom = sdk.NewCoins(sdk.NewCoin("atom", sdk.NewInt(555)))
suite.atom = sdk.NewCoins(sdk.NewCoin("atom", sdkmath.NewInt(555)))
}
func (suite *KeeperTestSuite) TestKeeperCrud() {

3
x/feegrant/migrations/v2/store_test.go
View File

@ -4,6 +4,7 @@ import (
"testing"
"time"
sdkmath "cosmossdk.io/math"
"github.com/stretchr/testify/require"
storetypes "cosmossdk.io/store/types"
@ -27,7 +28,7 @@ func TestMigration(t *testing.T) {
granter2 := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address())
grantee2 := sdk.AccAddress(ed25519.GenPrivKey().PubKey().Address())
spendLimit := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(1000)))
spendLimit := sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(1000)))
now := ctx.BlockTime()
oneDay := now.AddDate(0, 0, 1)
twoDays := now.AddDate(0, 0, 2)

3
x/feegrant/module/abci_test.go
View File

@ -3,6 +3,7 @@ package module_test
import (
"testing"
sdkmath "cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
"cosmossdk.io/x/feegrant"
"cosmossdk.io/x/feegrant/keeper"
@ -29,7 +30,7 @@ func TestFeegrantPruning(t *testing.T) {
granter2 := addrs[1]
granter3 := addrs[2]
grantee := addrs[3]
spendLimit := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(1000)))
spendLimit := sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(1000)))
now := testCtx.Ctx.BlockTime()
oneDay := now.AddDate(0, 0, 1)

3
x/feegrant/simulation/decoder_test.go
View File

@ -6,6 +6,7 @@ import (
"github.com/stretchr/testify/require"
sdkmath "cosmossdk.io/math"
"cosmossdk.io/x/feegrant"
"cosmossdk.io/x/feegrant/module"
"cosmossdk.io/x/feegrant/simulation"
@ -27,7 +28,7 @@ func TestDecodeStore(t *testing.T) {
dec := simulation.NewDecodeStore(cdc)
grant, err := feegrant.NewGrant(granterAddr, granteeAddr, &feegrant.BasicAllowance{
SpendLimit: sdk.NewCoins(sdk.NewCoin("foo", sdk.NewInt(100))),
SpendLimit: sdk.NewCoins(sdk.NewCoin("foo", sdkmath.NewInt(100))),
})
require.NoError(t, err)

5
x/feegrant/simulation/genesis.go
View File

@ -4,6 +4,7 @@ import (
"math/rand"
"time"
sdkmath "cosmossdk.io/math"
"cosmossdk.io/x/feegrant"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
@ -23,8 +24,8 @@ func genFeeGrants(r *rand.Rand, accounts []simtypes.Account) []feegrant.Grant {
func generateRandomAllowances(granter, grantee sdk.AccAddress, r *rand.Rand) feegrant.Grant {
allowances := make([]feegrant.Grant, 3)
spendLimit := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(100)))
periodSpendLimit := sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(10)))
spendLimit := sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(100)))
periodSpendLimit := sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(10)))
basic := feegrant.BasicAllowance{
SpendLimit: spendLimit,