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

refactor: remove aliases from types/math.go in bank module (#15671)

Browse Source
This commit is contained in:
samricotta 2023-04-03 14:53:24 +02:00 committed by GitHub
parent 521aa4bfdd
commit a2cde56e17
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 63 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x/bank/app_test.go
View File

@ -3,6 +3,7 @@ package bank_test
import (
"testing"
sdkmath "cosmossdk.io/math"
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@ -360,7 +361,7 @@ func TestMsgSetSendEnabled(t *testing.T) {
[]sdk.Msg{
types.NewMsgSetSendEnabled(govAddr, nil, nil),
},
sdk.Coins{{Denom: "foocoin", Amount: sdk.NewInt(5)}},
sdk.Coins{{Denom: "foocoin", Amount: sdkmath.NewInt(5)}},
addr1Str,
"set default send enabled to true",
"Change send enabled",
@ -372,7 +373,7 @@ func TestMsgSetSendEnabled(t *testing.T) {
[]sdk.Msg{
types.NewMsgSetSendEnabled(govAddr, []*types.SendEnabled{{Denom: "bad coin name!", Enabled: true}}, nil),
},
sdk.Coins{{Denom: "foocoin", Amount: sdk.NewInt(5)}},
sdk.Coins{{Denom: "foocoin", Amount: sdkmath.NewInt(5)}},
addr1Str,
"set default send enabled to true",
"Change send enabled",

3
x/bank/client/cli/tx.go
View File

@ -3,6 +3,7 @@ package cli
import (
"fmt"
sdkmath "cosmossdk.io/math"
"github.com/spf13/cobra"
"github.com/cosmos/cosmos-sdk/client"
@ -104,7 +105,7 @@ When using '--dry-run' a key name cannot be used, only a bech32 address.
return err
}
totalAddrs := sdk.NewInt(int64(len(args) - 2))
totalAddrs := sdkmath.NewInt(int64(len(args) - 2))
// coins to be received by the addresses
sendCoins := coins
if split {

26
x/bank/client/cli/tx_test.go
View File

@ -5,6 +5,8 @@ import (
"fmt"
"io"
sdkmath "cosmossdk.io/math"
"github.com/cosmos/cosmos-sdk/client"
"github.com/cosmos/cosmos-sdk/client/flags"
svrcmd "github.com/cosmos/cosmos-sdk/server/cmd"
@ -22,7 +24,7 @@ func (s *CLITestSuite) TestSendTxCmd() {
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("photon", sdk.NewInt(10))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("photon", sdkmath.NewInt(10))).String()),
fmt.Sprintf("--%s=test-chain", flags.FlagChainID),
}
@ -42,8 +44,8 @@ func (s *CLITestSuite) TestSendTxCmd() {
accounts[0].Address,
accounts[0].Address,
sdk.NewCoins(
sdk.NewCoin("stake", sdk.NewInt(10)),
sdk.NewCoin("photon", sdk.NewInt(40)),
sdk.NewCoin("stake", sdkmath.NewInt(10)),
sdk.NewCoin("photon", sdkmath.NewInt(40)),
),
extraArgs,
false,
@ -56,8 +58,8 @@ func (s *CLITestSuite) TestSendTxCmd() {
accounts[0].Address,
sdk.AccAddress{},
sdk.NewCoins(
sdk.NewCoin("stake", sdk.NewInt(10)),
sdk.NewCoin("photon", sdk.NewInt(40)),
sdk.NewCoin("stake", sdkmath.NewInt(10)),
sdk.NewCoin("photon", sdkmath.NewInt(40)),
),
extraArgs,
true,
@ -105,7 +107,7 @@ func (s *CLITestSuite) TestMultiSendTxCmd() {
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=true", flags.FlagSkipConfirmation),
fmt.Sprintf("--%s=%s", flags.FlagBroadcastMode, flags.BroadcastSync),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("photon", sdk.NewInt(10))).String()),
fmt.Sprintf("--%s=%s", flags.FlagFees, sdk.NewCoins(sdk.NewCoin("photon", sdkmath.NewInt(10))).String()),
fmt.Sprintf("--%s=test-chain", flags.FlagChainID),
}
@ -129,8 +131,8 @@ func (s *CLITestSuite) TestMultiSendTxCmd() {
accounts[2].Address.String(),
},
sdk.NewCoins(
sdk.NewCoin("stake", sdk.NewInt(10)),
sdk.NewCoin("photon", sdk.NewInt(40)),
sdk.NewCoin("stake", sdkmath.NewInt(10)),
sdk.NewCoin("photon", sdkmath.NewInt(40)),
),
extraArgs,
false,
@ -146,8 +148,8 @@ func (s *CLITestSuite) TestMultiSendTxCmd() {
accounts[2].Address.String(),
},
sdk.NewCoins(
sdk.NewCoin("stake", sdk.NewInt(10)),
sdk.NewCoin("photon", sdk.NewInt(40)),
sdk.NewCoin("stake", sdkmath.NewInt(10)),
sdk.NewCoin("photon", sdkmath.NewInt(40)),
),
extraArgs,
true,
@ -163,8 +165,8 @@ func (s *CLITestSuite) TestMultiSendTxCmd() {
"bar",
},
sdk.NewCoins(
sdk.NewCoin("stake", sdk.NewInt(10)),
sdk.NewCoin("photon", sdk.NewInt(40)),
sdk.NewCoin("stake", sdkmath.NewInt(10)),
sdk.NewCoin("photon", sdkmath.NewInt(40)),
),
extraArgs,
true,

12
x/bank/keeper/genesis_test.go
View File

@ -1,6 +1,8 @@
package keeper_test
import (
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/query"
"github.com/cosmos/cosmos-sdk/x/bank/types"
@ -77,11 +79,11 @@ func (suite *KeeperTestSuite) TestTotalSupply() {
// Prepare some test data.
defaultGenesis := types.DefaultGenesisState()
balances := []types.Balance{
{Coins: sdk.NewCoins(sdk.NewCoin("foocoin", sdk.NewInt(1))), Address: "cosmos1f9xjhxm0plzrh9cskf4qee4pc2xwp0n0556gh0"},
{Coins: sdk.NewCoins(sdk.NewCoin("barcoin", sdk.NewInt(1))), Address: "cosmos1t5u0jfg3ljsjrh2m9e47d4ny2hea7eehxrzdgd"},
{Coins: sdk.NewCoins(sdk.NewCoin("foocoin", sdk.NewInt(10)), sdk.NewCoin("barcoin", sdk.NewInt(20))), Address: "cosmos1m3h30wlvsf8llruxtpukdvsy0km2kum8g38c8q"},
{Coins: sdk.NewCoins(sdk.NewCoin("foocoin", sdkmath.NewInt(1))), Address: "cosmos1f9xjhxm0plzrh9cskf4qee4pc2xwp0n0556gh0"},
{Coins: sdk.NewCoins(sdk.NewCoin("barcoin", sdkmath.NewInt(1))), Address: "cosmos1t5u0jfg3ljsjrh2m9e47d4ny2hea7eehxrzdgd"},
{Coins: sdk.NewCoins(sdk.NewCoin("foocoin", sdkmath.NewInt(10)), sdk.NewCoin("barcoin", sdkmath.NewInt(20))), Address: "cosmos1m3h30wlvsf8llruxtpukdvsy0km2kum8g38c8q"},
}
totalSupply := sdk.NewCoins(sdk.NewCoin("foocoin", sdk.NewInt(11)), sdk.NewCoin("barcoin", sdk.NewInt(21)))
totalSupply := sdk.NewCoins(sdk.NewCoin("foocoin", sdkmath.NewInt(11)), sdk.NewCoin("barcoin", sdkmath.NewInt(21)))
genesisSupply, _, err := suite.bankKeeper.GetPaginatedTotalSupply(suite.ctx, &query.PageRequest{Limit: query.MaxLimit})
suite.Require().NoError(err)
@ -95,7 +97,7 @@ func (suite *KeeperTestSuite) TestTotalSupply() {
}{
{
"calculation NOT matching genesis Supply field",
types.NewGenesisState(defaultGenesis.Params, balances, sdk.NewCoins(sdk.NewCoin("wrongcoin", sdk.NewInt(1))), defaultGenesis.DenomMetadata, defaultGenesis.SendEnabled),
types.NewGenesisState(defaultGenesis.Params, balances, sdk.NewCoins(sdk.NewCoin("wrongcoin", sdkmath.NewInt(1))), defaultGenesis.DenomMetadata, defaultGenesis.SendEnabled),
nil, true, "genesis supply is incorrect, expected 1wrongcoin, got 21barcoin,11foocoin",
},
{

8
x/bank/keeper/keeper_test.go
View File

@ -377,7 +377,7 @@ func (suite *KeeperTestSuite) TestSupply_MintCoins() {
require.Panics(func() { _ = keeper.MintCoins(ctx, authtypes.Burner, initCoins) }, "invalid permission") //nolint:errcheck // we're testing for a panic, not an error
suite.mockMintCoins(minterAcc)
require.Error(keeper.MintCoins(ctx, authtypes.Minter, sdk.Coins{sdk.Coin{Denom: "denom", Amount: sdk.NewInt(-10)}}), "insufficient coins")
require.Error(keeper.MintCoins(ctx, authtypes.Minter, sdk.Coins{sdk.Coin{Denom: "denom", Amount: math.NewInt(-10)}}), "insufficient coins")
authKeeper.EXPECT().GetModuleAccount(ctx, randomPerm).Return(nil)
require.Panics(func() { _ = keeper.MintCoins(ctx, randomPerm, initCoins) }) //nolint:errcheck // we're testing for a panic, not an error
@ -1051,7 +1051,7 @@ func (suite *KeeperTestSuite) TestDelegateCoins_Invalid() {
require.Error(suite.bankKeeper.DelegateCoins(ctx, accAddrs[0], holderAcc.GetAddress(), delCoins))
suite.authKeeper.EXPECT().GetAccount(ctx, holderAcc.GetAddress()).Return(holderAcc)
invalidCoins := sdk.Coins{sdk.Coin{Denom: "fooDenom", Amount: sdk.NewInt(-50)}}
invalidCoins := sdk.Coins{sdk.Coin{Denom: "fooDenom", Amount: math.NewInt(-50)}}
require.Error(suite.bankKeeper.DelegateCoins(ctx, accAddrs[0], holderAcc.GetAddress(), invalidCoins))
suite.authKeeper.EXPECT().GetAccount(ctx, holderAcc.GetAddress()).Return(holderAcc)
@ -1199,7 +1199,7 @@ func (suite *KeeperTestSuite) TestBalanceTrackingEvents() {
suite.bankKeeper.MintCoins(
suite.ctx,
multiPermAcc.Name,
sdk.NewCoins(sdk.NewCoin("utxo", sdk.NewInt(100000)))),
sdk.NewCoins(sdk.NewCoin("utxo", math.NewInt(100000)))),
)
// send coins to address
suite.mockSendCoinsFromModuleToAccount(multiPermAcc, accAddrs[0])
@ -1208,7 +1208,7 @@ func (suite *KeeperTestSuite) TestBalanceTrackingEvents() {
suite.ctx,
multiPermAcc.Name,
accAddrs[0],
sdk.NewCoins(sdk.NewCoin("utxo", sdk.NewInt(50000))),
sdk.NewCoins(sdk.NewCoin("utxo", math.NewInt(50000))),
),
)

15
x/bank/migrations/v2/json_test.go
View File

@ -4,6 +4,7 @@ import (
"encoding/json"
"testing"
sdkmath "cosmossdk.io/math"
"github.com/stretchr/testify/require"
"github.com/cosmos/cosmos-sdk/client"
@ -27,17 +28,17 @@ func TestMigrateJSON(t *testing.T) {
{
Address: voter.String(),
Coins: sdk.Coins{
sdk.NewCoin("foo", sdk.NewInt(10)),
sdk.NewCoin("bar", sdk.NewInt(20)),
sdk.NewCoin("foobar", sdk.NewInt(0)),
sdk.NewCoin("foo", sdkmath.NewInt(10)),
sdk.NewCoin("bar", sdkmath.NewInt(20)),
sdk.NewCoin("foobar", sdkmath.NewInt(0)),
},
},
},
Supply: sdk.Coins{
sdk.NewCoin("foo", sdk.NewInt(10)),
sdk.NewCoin("bar", sdk.NewInt(20)),
sdk.NewCoin("foobar", sdk.NewInt(0)),
sdk.NewCoin("barfoo", sdk.NewInt(0)),
sdk.NewCoin("foo", sdkmath.NewInt(10)),
sdk.NewCoin("bar", sdkmath.NewInt(20)),
sdk.NewCoin("foobar", sdkmath.NewInt(0)),
sdk.NewCoin("barfoo", sdkmath.NewInt(0)),
},
}

10
x/bank/migrations/v2/store_test.go
View File

@ -26,9 +26,9 @@ func TestSupplyMigration(t *testing.T) {
v1bank.RegisterInterfaces(encCfg.InterfaceRegistry)
oldFooCoin := sdk.NewCoin("foo", sdk.NewInt(100))
oldBarCoin := sdk.NewCoin("bar", sdk.NewInt(200))
oldFooBarCoin := sdk.NewCoin("foobar", sdk.NewInt(0)) // to ensure the zero denom coins pruned.
oldFooCoin := sdk.NewCoin("foo", math.NewInt(100))
oldBarCoin := sdk.NewCoin("bar", math.NewInt(200))
oldFooBarCoin := sdk.NewCoin("foobar", math.NewInt(0)) // to ensure the zero denom coins pruned.
// Old supply was stored as a single blob under the `SupplyKey`.
oldSupply := &types.Supply{Total: sdk.Coins{oldFooCoin, oldBarCoin, oldFooBarCoin}}
@ -77,14 +77,14 @@ func TestBalanceKeysMigration(t *testing.T) {
_, _, addr := testdata.KeyTestPubAddr()
// set 10 foo coin
fooCoin := sdk.NewCoin("foo", sdk.NewInt(10))
fooCoin := sdk.NewCoin("foo", math.NewInt(10))
oldFooKey := append(append(v1bank.BalancesPrefix, addr...), []byte(fooCoin.Denom)...)
fooBz, err := encCfg.Codec.Marshal(&fooCoin)
require.NoError(t, err)
store.Set(oldFooKey, fooBz)
// set 0 foobar coin
fooBarCoin := sdk.NewCoin("foobar", sdk.NewInt(0))
fooBarCoin := sdk.NewCoin("foobar", math.NewInt(0))
oldKeyFooBar := append(append(v1bank.BalancesPrefix, addr...), []byte(fooBarCoin.Denom)...)
fooBarBz, err := encCfg.Codec.Marshal(&fooBarCoin)
require.NoError(t, err)

4
x/bank/migrations/v3/store_test.go
View File

@ -28,8 +28,8 @@ func TestMigrateStore(t *testing.T) {
prefixAccStore := prefix.NewStore(store, v2.CreateAccountBalancesPrefix(addr))
balances := sdk.NewCoins(
sdk.NewCoin("foo", sdk.NewInt(10000)),
sdk.NewCoin("bar", sdk.NewInt(20000)),
sdk.NewCoin("foo", math.NewInt(10000)),
sdk.NewCoin("bar", math.NewInt(20000)),
)
for _, b := range balances {

9
x/bank/migrations/v4/gen_state_test.go
View File

@ -3,6 +3,7 @@ package v4_test
import (
"testing"
sdkmath "cosmossdk.io/math"
"github.com/stretchr/testify/assert"
sdk "github.com/cosmos/cosmos-sdk/types"
@ -22,9 +23,9 @@ func TestMigrateGenState(t *testing.T) {
Params: types.Params{},
Balances: []types.Balance{{
Address: "balance1",
Coins: sdk.Coins{sdk.NewCoin("balance1coin", sdk.NewInt(8))},
Coins: sdk.Coins{sdk.NewCoin("balance1coin", sdkmath.NewInt(8))},
}},
Supply: sdk.Coins{sdk.NewCoin("supplycoin", sdk.NewInt(800))},
Supply: sdk.Coins{sdk.NewCoin("supplycoin", sdkmath.NewInt(800))},
DenomMetadata: []types.Metadata{{
Description: "metadesk",
DenomUnits: nil,
@ -41,9 +42,9 @@ func TestMigrateGenState(t *testing.T) {
Params: types.Params{},
Balances: []types.Balance{{
Address: "balance1",
Coins: sdk.Coins{sdk.NewCoin("balance1coin", sdk.NewInt(8))},
Coins: sdk.Coins{sdk.NewCoin("balance1coin", sdkmath.NewInt(8))},
}},
Supply: sdk.Coins{sdk.NewCoin("supplycoin", sdk.NewInt(800))},
Supply: sdk.Coins{sdk.NewCoin("supplycoin", sdkmath.NewInt(800))},
DenomMetadata: []types.Metadata{{
Description: "metadesk",
DenomUnits: nil,

4
x/bank/simulation/genesis.go
View File

@ -5,6 +5,8 @@ import (
"fmt"
"math/rand"
sdkmath "cosmossdk.io/math"
sdk "github.com/cosmos/cosmos-sdk/types"
"github.com/cosmos/cosmos-sdk/types/module"
"github.com/cosmos/cosmos-sdk/x/bank/types"
@ -78,7 +80,7 @@ func RandomizedGenState(simState *module.SimulationState) {
sendEnabled := RandomGenesisSendEnabled(simState.Rand, simState.BondDenom)
numAccs := int64(len(simState.Accounts))
totalSupply := simState.InitialStake.Mul(sdk.NewInt((numAccs + simState.NumBonded)))
totalSupply := simState.InitialStake.Mul(sdkmath.NewInt((numAccs + simState.NumBonded)))
supply := sdk.NewCoins(sdk.NewCoin(simState.BondDenom, totalSupply))
bankGenesis := types.GenesisState{

2
x/bank/types/balance_test.go
View File

@ -60,7 +60,7 @@ func TestBalanceValidate(t *testing.T) {
bank.Balance{
Address: "cosmos1yq8lgssgxlx9smjhes6ryjasmqmd3ts2559g0t",
Coins: sdk.Coins{
sdk.Coin{Denom: "uatom", Amount: sdk.NewInt(-1)},
sdk.Coin{Denom: "uatom", Amount: math.NewInt(-1)},
},
},
true,

8
x/bank/types/genesis_test.go
View File

@ -170,9 +170,9 @@ func TestMigrateSendEnabled(t *testing.T) {
Params: Params{},
Balances: []Balance{{
Address: "balance1",
Coins: sdk.Coins{sdk.NewCoin("balance1coin", sdk.NewInt(8))},
Coins: sdk.Coins{sdk.NewCoin("balance1coin", math.NewInt(8))},
}},
Supply: sdk.Coins{sdk.NewCoin("supplycoin", sdk.NewInt(800))},
Supply: sdk.Coins{sdk.NewCoin("supplycoin", math.NewInt(800))},
DenomMetadata: []Metadata{{
Description: "metadesk",
DenomUnits: nil,
@ -188,9 +188,9 @@ func TestMigrateSendEnabled(t *testing.T) {
Params: Params{},
Balances: []Balance{{
Address: "balance1",
Coins: sdk.Coins{sdk.NewCoin("balance1coin", sdk.NewInt(8))},
Coins: sdk.Coins{sdk.NewCoin("balance1coin", math.NewInt(8))},
}},
Supply: sdk.Coins{sdk.NewCoin("supplycoin", sdk.NewInt(800))},
Supply: sdk.Coins{sdk.NewCoin("supplycoin", math.NewInt(800))},
DenomMetadata: []Metadata{{
Description: "metadesk",
DenomUnits: nil,

3
x/bank/types/msgs_test.go
View File

@ -3,6 +3,7 @@ package types
import (
"testing"
sdkmath "cosmossdk.io/math"
"github.com/stretchr/testify/assert"
"github.com/stretchr/testify/require"
@ -207,7 +208,7 @@ func TestMsgMultiSendValidation(t *testing.T) {
{
true,
MsgMultiSend{
Inputs: []Input{NewInput(addr2, atom123.MulInt(sdk.NewInt(2)))},
Inputs: []Input{NewInput(addr2, atom123.MulInt(sdkmath.NewInt(2)))},
Outputs: []Output{output1, output1},
},
"",

5
x/bank/types/send_authorization_test.go
View File

@ -7,6 +7,7 @@ import (
cmtproto "github.com/cometbft/cometbft/proto/tendermint/types"
"github.com/stretchr/testify/require"
sdkmath "cosmossdk.io/math"
storetypes "cosmossdk.io/store/types"
"github.com/cosmos/cosmos-sdk/testutil"
@ -15,8 +16,8 @@ import (
)
var (
coins1000 = sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(1000)))
coins500 = sdk.NewCoins(sdk.NewCoin("stake", sdk.NewInt(500)))
coins1000 = sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(1000)))
coins500 = sdk.NewCoins(sdk.NewCoin("stake", sdkmath.NewInt(500)))
fromAddr = sdk.AccAddress("_____from _____")
toAddr = sdk.AccAddress("_______to________")
unknownAddr = sdk.AccAddress("_____unknown_____")