remove mint usage in rootsdk

cosmos · Oct 30, 2023 · 619b44f · 619b44f
1 parent 44db964
commit 619b44f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/baseapp/block_gas_test.go b/baseapp/block_gas_test.go
@@ -16,7 +16,6 @@ import (
 	store "cosmossdk.io/store/types"
 	bankkeeper "cosmossdk.io/x/bank/keeper"
 	banktypes "cosmossdk.io/x/bank/types"
-	minttypes "cosmossdk.io/x/mint/types"
 
 	baseapptestutil "github.com/cosmos/cosmos-sdk/baseapp/testutil"
 	"github.com/cosmos/cosmos-sdk/client"
@@ -36,6 +35,8 @@ import (
 	xauthsigning "github.com/cosmos/cosmos-sdk/x/auth/signing"
 )
 
+const mintModuleName = "mint"
+
 var blockMaxGas = uint64(simtestutil.DefaultConsensusParams.Block.MaxGas)
 
 type BlockGasImpl struct {
@@ -129,9 +130,9 @@ func TestBaseApp_BlockGas(t *testing.T) {
 
 			// test account and fund
 			priv1, _, addr1 := testdata.KeyTestPubAddr()
-			err = bankKeeper.MintCoins(ctx, minttypes.ModuleName, feeAmount)
+			err = bankKeeper.MintCoins(ctx, mintModuleName, feeAmount)
 			require.NoError(t, err)
-			err = bankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr1, feeAmount)
+			err = bankKeeper.SendCoinsFromModuleToAccount(ctx, mintModuleName, addr1, feeAmount)
 			require.NoError(t, err)
 			require.Equal(t, feeCoin.Amount, bankKeeper.GetBalance(ctx, addr1, feeCoin.Denom).Amount)
 			seq := accountKeeper.GetAccount(ctx, addr1).GetSequence()

diff --git a/baseapp/utils_test.go b/baseapp/utils_test.go
@@ -28,7 +28,6 @@ import (
 	storetypes "cosmossdk.io/store/types"
 	_ "cosmossdk.io/x/bank"
 	banktypes "cosmossdk.io/x/bank/types"
-	_ "cosmossdk.io/x/mint"
 	_ "cosmossdk.io/x/staking"
 
 	"github.com/cosmos/cosmos-sdk/baseapp"

diff --git a/server/grpc/server_test.go → tests/integration/server/server_test.go b/server/grpc/server_test.go → tests/integration/server/server_test.go
diff --git a/testutil/sims/address_helpers.go b/testutil/sims/address_helpers.go
@@ -10,14 +10,15 @@ import (
 	errorsmod "cosmossdk.io/errors"
 	"cosmossdk.io/math"
 	bankkeeper "cosmossdk.io/x/bank/keeper"
-	minttypes "cosmossdk.io/x/mint/types"
 
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 	sdkerrors "github.com/cosmos/cosmos-sdk/types/errors"
 )
 
+const mintModuleName = "mint"
+
 type GenerateAccountStrategy func(int) []sdk.AccAddress
 
 // BondDenomProvider is a subset of the staking keeper's public interface that
@@ -67,11 +68,11 @@ func addTestAddrs(bankKeeper bankkeeper.Keeper, stakingKeeper BondDenomProvider,
 }
 
 func initAccountWithCoins(bankKeeper bankkeeper.Keeper, ctx sdk.Context, addr sdk.AccAddress, coins sdk.Coins) {
-	if err := bankKeeper.MintCoins(ctx, minttypes.ModuleName, coins); err != nil {
+	if err := bankKeeper.MintCoins(ctx, mintModuleName, coins); err != nil {
 		panic(err)
 	}
 
-	if err := bankKeeper.SendCoinsFromModuleToAccount(ctx, minttypes.ModuleName, addr, coins); err != nil {
+	if err := bankKeeper.SendCoinsFromModuleToAccount(ctx, mintModuleName, addr, coins); err != nil {
 		panic(err)
 	}
 }