refactor(x/auth): removal of Address.String()

simapp/genesis_account_test.go

@@ -10,14 +10,19 @@ import (
 	"cosmossdk.io/simapp"
 	authtypes "cosmossdk.io/x/auth/types"
 
+	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	sdk "github.com/cosmos/cosmos-sdk/types"
 )
 
 func TestSimGenesisAccountValidate(t *testing.T) {
 	pubkey := secp256k1.GenPrivKey().PubKey()
-	addr := sdk.AccAddress(pubkey.Address())
 
+	ac := codectestutil.CodecOptions{}.GetAddressCodec()
+	addr, err := ac.BytesToString(pubkey.Address())
+	require.NoError(t, err)
+	modAddr, err := ac.BytesToString(crypto.AddressHash([]byte("testmod")))
+	require.NoError(t, err)
 	vestingStart := time.Now().UTC()
 
 	coins := sdk.NewCoins(sdk.NewInt64Coin("test", 1000))
@@ -45,7 +50,7 @@ func TestSimGenesisAccountValidate(t *testing.T) {
 		{
 			"valid basic account with module name",
 			simapp.SimGenesisAccount{
-				BaseAccount: authtypes.NewBaseAccount(sdk.AccAddress(crypto.AddressHash([]byte("testmod"))), nil, 0, 0),
+				BaseAccount: authtypes.NewBaseAccount(modAddr, nil, 0, 0),
 				ModuleName:  "testmod",
 			},
 			false,

simapp/simd/cmd/testnet.go

@@ -276,6 +276,10 @@ func initTestnetFiles(
 			_ = os.RemoveAll(args.outputDir)
 			return err
 		}
+		addrStr, err := clientCtx.AddressCodec.BytesToString(addr)
+		if err != nil {
+			return err
+		}
 
 		info := map[string]string{"secret": secret}
 
@@ -296,8 +300,8 @@ func initTestnetFiles(
 			sdk.NewCoin(sdk.DefaultBondDenom, accStakingTokens),
 		}
 
-		genBalances = append(genBalances, banktypes.Balance{Address: addr.String(), Coins: coins.Sort()})
-		genAccounts = append(genAccounts, authtypes.NewBaseAccount(addr, nil, 0, 0))
+		genBalances = append(genBalances, banktypes.Balance{Address: addrStr, Coins: coins.Sort()})
+		genAccounts = append(genAccounts, authtypes.NewBaseAccount(addrStr, nil, 0, 0))
 
 		valStr, err := clientCtx.ValidatorAddressCodec.BytesToString(sdk.ValAddress(addr))
 		if err != nil {

simapp/test_helpers.go

@@ -21,6 +21,7 @@ import (
 
 	bam "github.com/cosmos/cosmos-sdk/baseapp"
 	"github.com/cosmos/cosmos-sdk/client/flags"
+	codectestutil "github.com/cosmos/cosmos-sdk/codec/testutil"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/secp256k1"
 	"github.com/cosmos/cosmos-sdk/server"
 	servertypes "github.com/cosmos/cosmos-sdk/server/types"
@@ -65,7 +66,9 @@ func NewSimappWithCustomOptions(t *testing.T, isCheckTx bool, options SetupOptio
 
 	// generate genesis account
 	senderPrivKey := secp256k1.GenPrivKey()
-	acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0)
+	addr, err := codectestutil.CodecOptions{}.GetAddressCodec().BytesToString(senderPrivKey.PubKey().Address())
+	require.NoError(t, err)
+	acc := authtypes.NewBaseAccount(addr, senderPrivKey.PubKey(), 0, 0)
 	balance := banktypes.Balance{
 		Address: acc.GetAddress().String(),
 		Coins:   sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(100000000000000))),
@@ -107,7 +110,9 @@ func Setup(t *testing.T, isCheckTx bool) *SimApp {
 
 	// generate genesis account
 	senderPrivKey := secp256k1.GenPrivKey()
-	acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0)
+	addr, err := codectestutil.CodecOptions{}.GetAddressCodec().BytesToString(senderPrivKey.PubKey().Address())
+	require.NoError(t, err)
+	acc := authtypes.NewBaseAccount(addr, senderPrivKey.PubKey(), 0, 0)
 	balance := banktypes.Balance{
 		Address: acc.GetAddress().String(),
 		Coins:   sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, sdkmath.NewInt(100000000000000))),
@@ -167,7 +172,9 @@ func GenesisStateWithSingleValidator(t *testing.T, app *SimApp) GenesisState {
 
 	// generate genesis account
 	senderPrivKey := secp256k1.GenPrivKey()
-	acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0)
+	addr, err := app.AuthKeeper.AddressCodec().BytesToString(senderPrivKey.PubKey().Address())
+	require.NoError(t, err)
+	acc := authtypes.NewBaseAccount(addr, senderPrivKey.PubKey(), 0, 0)
 	balances := []banktypes.Balance{
 		{
 			Address: acc.GetAddress().String(),

tests/e2e/baseapp/utils.go

@@ -39,7 +39,7 @@ func GenesisStateWithSingleValidator(t *testing.T, codec codec.Codec, builder *r
 
 	// generate genesis account
 	senderPrivKey := secp256k1.GenPrivKey()
-	acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0)
+	acc := authtypes.NewBaseAccount(sdk.AccAddress(senderPrivKey.PubKey().Address()).String(), senderPrivKey.PubKey(), 0, 0)
 	balances := []banktypes.Balance{
 		{
 			Address: acc.GetAddress().String(),

tests/e2e/tx/service_test.go

@@ -643,15 +643,19 @@ func (s *E2ETestSuite) TestSimMultiSigTx() {
 	// Sign with account1
 	addr1, err := account1.GetAddress()
 	s.Require().NoError(err)
+	addr1Str, err := clientCtx.AddressCodec.BytesToString(addr1)
+	s.Require().NoError(err)
 	clientCtx.HomeDir = strings.Replace(clientCtx.HomeDir, "simd", "simcli", 1)
-	account1Signature, err := authtest.TxSignExec(clientCtx, addr1, multiGeneratedTxFile.Name(), "--multisig", addr.String())
+	account1Signature, err := authtest.TxSignExec(clientCtx, addr1Str, multiGeneratedTxFile.Name(), "--multisig", addr.String())
 	s.Require().NoError(err)
 	sign1File := testutil.WriteToNewTempFile(s.T(), account1Signature.String())
 
 	// Sign with account2
 	addr2, err := account2.GetAddress()
 	s.Require().NoError(err)
-	account2Signature, err := authtest.TxSignExec(clientCtx, addr2, multiGeneratedTxFile.Name(), "--multisig", addr.String())
+	addr2Str, err := clientCtx.AddressCodec.BytesToString(addr2)
+	s.Require().NoError(err)
+	account2Signature, err := authtest.TxSignExec(clientCtx, addr2Str, multiGeneratedTxFile.Name(), "--multisig", addr.String())
 	s.Require().NoError(err)
 	sign2File := testutil.WriteToNewTempFile(s.T(), account2Signature.String())
 

tests/integration/auth/client/cli/suite_test.go

@@ -122,7 +122,10 @@ func (s *CLITestSuite) TestCLIValidateSignatures() {
 	unsignedTx := testutil.WriteToNewTempFile(s.T(), res.String())
 	defer unsignedTx.Close()
 
-	res, err = authtestutil.TxSignExec(s.clientCtx, s.val, unsignedTx.Name())
+	valStr, err := s.ac.BytesToString(s.val)
+	s.Require().NoError(err)
+
+	res, err = authtestutil.TxSignExec(s.clientCtx, valStr, unsignedTx.Name())
 	s.Require().NoError(err)
 	signedTx, err := s.clientCtx.TxConfig.TxJSONDecoder()(res.Bytes())
 	s.Require().NoError(err)
@@ -159,16 +162,19 @@ func (s *CLITestSuite) TestCLISignBatch() {
 	defer outputFile.Close()
 	s.clientCtx.HomeDir = strings.Replace(s.clientCtx.HomeDir, "simd", "simcli", 1)
 
+	valAddr, err := s.clientCtx.AddressCodec.BytesToString(s.val)
+	s.Require().NoError(err)
+
 	// sign-batch file - offline is set but account-number and sequence are not
-	_, err = authtestutil.TxSignBatchExec(s.clientCtx, s.val, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), "--offline")
+	_, err = authtestutil.TxSignBatchExec(s.clientCtx, valAddr, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), "--offline")
 	s.Require().EqualError(err, "required flag(s) \"account-number\", \"sequence\" not set")
 
 	// sign-batch file - offline and sequence is set but account-number is not set
-	_, err = authtestutil.TxSignBatchExec(s.clientCtx, s.val, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), fmt.Sprintf("--%s=%s", flags.FlagSequence, "1"), "--offline")
+	_, err = authtestutil.TxSignBatchExec(s.clientCtx, valAddr, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), fmt.Sprintf("--%s=%s", flags.FlagSequence, "1"), "--offline")
 	s.Require().EqualError(err, "required flag(s) \"account-number\" not set")
 
 	// sign-batch file - offline and account-number is set but sequence is not set
-	_, err = authtestutil.TxSignBatchExec(s.clientCtx, s.val, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), fmt.Sprintf("--%s=%s", flags.FlagAccountNumber, "1"), "--offline")
+	_, err = authtestutil.TxSignBatchExec(s.clientCtx, valAddr, outputFile.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), fmt.Sprintf("--%s=%s", flags.FlagAccountNumber, "1"), "--offline")
 	s.Require().EqualError(err, "required flag(s) \"sequence\" not set")
 }
 
@@ -450,19 +456,22 @@ func (s *CLITestSuite) TestCLISendGenerateSignAndBroadcast() {
 	s.Require().EqualError(err, "signatures validation failed")
 	s.Require().Contains(res.String(), fmt.Sprintf("Signers:\n  0: %v\n\nSignatures:\n\n", s.val.String()))
 
+	valStr, err := s.ac.BytesToString(s.val)
+	s.Require().NoError(err)
+
 	// Test sign
 
 	// Does not work in offline mode
-	_, err = authtestutil.TxSignExec(s.clientCtx, s.val, unsignedTxFile.Name(), "--offline")
+	_, err = authtestutil.TxSignExec(s.clientCtx, valStr, unsignedTxFile.Name(), "--offline")
 	s.Require().EqualError(err, "required flag(s) \"account-number\", \"sequence\" not set")
 
 	// But works offline if we set account number and sequence
 	s.clientCtx.HomeDir = strings.Replace(s.clientCtx.HomeDir, "simd", "simcli", 1)
-	_, err = authtestutil.TxSignExec(s.clientCtx, s.val, unsignedTxFile.Name(), "--offline", "--account-number", "1", "--sequence", "1")
+	_, err = authtestutil.TxSignExec(s.clientCtx, valStr, unsignedTxFile.Name(), "--offline", "--account-number", "1", "--sequence", "1")
 	s.Require().NoError(err)
 
 	// Sign transaction
-	signedTx, err := authtestutil.TxSignExec(s.clientCtx, s.val, unsignedTxFile.Name())
+	signedTx, err := authtestutil.TxSignExec(s.clientCtx, valStr, unsignedTxFile.Name())
 	s.Require().NoError(err)
 	signedFinalTx, err := txCfg.TxJSONDecoder()(signedTx.Bytes())
 	s.Require().NoError(err)
@@ -541,7 +550,9 @@ func (s *CLITestSuite) TestCLIMultisignInsufficientCosigners() {
 	s.clientCtx.HomeDir = strings.Replace(s.clientCtx.HomeDir, "simd", "simcli", 1)
 	addr1, err := account1.GetAddress()
 	s.Require().NoError(err)
-	account1Signature, err := authtestutil.TxSignExec(s.clientCtx, addr1, multiGeneratedTxFile.Name(), "--multisig", addr.String())
+	addr1Str, err := s.ac.BytesToString(addr1)
+	s.Require().NoError(err)
+	account1Signature, err := authtestutil.TxSignExec(s.clientCtx, addr1Str, multiGeneratedTxFile.Name(), "--multisig", addr.String())
 	s.Require().NoError(err)
 
 	sign1File := testutil.WriteToNewTempFile(s.T(), account1Signature.String())
@@ -625,8 +636,10 @@ func (s *CLITestSuite) TestCLIMultisignSortSignatures() {
 	// Sign with account1
 	addr1, err := account1.GetAddress()
 	s.Require().NoError(err)
+	addr1Str, err := s.ac.BytesToString(addr1)
+	s.Require().NoError(err)
 	s.clientCtx.HomeDir = strings.Replace(s.clientCtx.HomeDir, "simd", "simcli", 1)
-	account1Signature, err := authtestutil.TxSignExec(s.clientCtx, addr1, multiGeneratedTxFile.Name(), "--multisig", addr.String())
+	account1Signature, err := authtestutil.TxSignExec(s.clientCtx, addr1Str, multiGeneratedTxFile.Name(), "--multisig", addr.String())
 	s.Require().NoError(err)
 
 	sign1File := testutil.WriteToNewTempFile(s.T(), account1Signature.String())
@@ -635,7 +648,9 @@ func (s *CLITestSuite) TestCLIMultisignSortSignatures() {
 	// Sign with account2
 	addr2, err := account2.GetAddress()
 	s.Require().NoError(err)
-	account2Signature, err := authtestutil.TxSignExec(s.clientCtx, addr2, multiGeneratedTxFile.Name(), "--multisig", addr.String())
+	addr2Str, err := s.ac.BytesToString(addr2)
+	s.Require().NoError(err)
+	account2Signature, err := authtestutil.TxSignExec(s.clientCtx, addr2Str, multiGeneratedTxFile.Name(), "--multisig", addr.String())
 	s.Require().NoError(err)
 
 	sign2File := testutil.WriteToNewTempFile(s.T(), account2Signature.String())
@@ -644,7 +659,9 @@ func (s *CLITestSuite) TestCLIMultisignSortSignatures() {
 	// Sign with dummy account
 	dummyAddr, err := dummyAcc.GetAddress()
 	s.Require().NoError(err)
-	_, err = authtestutil.TxSignExec(s.clientCtx, dummyAddr, multiGeneratedTxFile.Name(), "--multisig", addr.String())
+	dummyAddrStr, err := s.ac.BytesToString(dummyAddr)
+	s.Require().NoError(err)
+	_, err = authtestutil.TxSignExec(s.clientCtx, dummyAddrStr, multiGeneratedTxFile.Name(), "--multisig", addr.String())
 	s.Require().Error(err)
 	s.Require().Contains(err.Error(), "signing key is not a part of multisig key")
 
@@ -670,6 +687,8 @@ func (s *CLITestSuite) TestSignWithMultisig() {
 
 	addr1, err := account1.GetAddress()
 	s.Require().NoError(err)
+	addr1Str, err := s.ac.BytesToString(addr1)
+	s.Require().NoError(err)
 
 	// Create an address that is not in the keyring, will be used to simulate `--multisig`
 	multisig := "cosmos1hd6fsrvnz6qkp87s3u86ludegq97agxsdkwzyh"
@@ -694,7 +713,7 @@ func (s *CLITestSuite) TestSignWithMultisig() {
 	// even though the tx signer is NOT the multisig address. This is fine though,
 	// as the main point of this test is to test the `--multisig` flag with an address
 	// that is not in the keyring.
-	_, err = authtestutil.TxSignExec(s.clientCtx, addr1, multiGeneratedTx2File.Name(), "--multisig", multisig)
+	_, err = authtestutil.TxSignExec(s.clientCtx, addr1Str, multiGeneratedTx2File.Name(), "--multisig", multisig)
 	s.Require().Contains(err.Error(), "error getting account from keybase")
 }
 
@@ -728,18 +747,22 @@ func (s *CLITestSuite) TestCLIMultisign() {
 
 	addr1, err := account1.GetAddress()
 	s.Require().NoError(err)
+	addr1Str, err := s.ac.BytesToString(addr1)
+	s.Require().NoError(err)
 	// Sign with account1
 	s.clientCtx.HomeDir = strings.Replace(s.clientCtx.HomeDir, "simd", "simcli", 1)
-	account1Signature, err := authtestutil.TxSignExec(s.clientCtx, addr1, multiGeneratedTxFile.Name(), "--multisig", addr.String())
+	account1Signature, err := authtestutil.TxSignExec(s.clientCtx, addr1Str, multiGeneratedTxFile.Name(), "--multisig", addr.String())
 	s.Require().NoError(err)
 
 	sign1File := testutil.WriteToNewTempFile(s.T(), account1Signature.String())
 	defer sign1File.Close()
 
 	addr2, err := account2.GetAddress()
 	s.Require().NoError(err)
+	addr2Str, err := s.ac.BytesToString(addr2)
+	s.Require().NoError(err)
 	// Sign with account2
-	account2Signature, err := authtestutil.TxSignExec(s.clientCtx, addr2, multiGeneratedTxFile.Name(), "--multisig", addr.String())
+	account2Signature, err := authtestutil.TxSignExec(s.clientCtx, addr2Str, multiGeneratedTxFile.Name(), "--multisig", addr.String())
 	s.Require().NoError(err)
 
 	sign2File := testutil.WriteToNewTempFile(s.T(), account2Signature.String())
@@ -798,8 +821,10 @@ func (s *CLITestSuite) TestSignBatchMultisig() {
 
 	addr1, err := account1.GetAddress()
 	s.Require().NoError(err)
+	addr1Str, err := s.clientCtx.AddressCodec.BytesToString(addr1)
+	s.Require().NoError(err)
 	// sign-batch file
-	res, err := authtestutil.TxSignBatchExec(s.clientCtx, addr1, filename.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), "--multisig", addr.String(), "--signature-only")
+	res, err := authtestutil.TxSignBatchExec(s.clientCtx, addr1Str, filename.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), "--multisig", addr.String(), "--signature-only")
 	s.Require().NoError(err)
 	s.Require().Equal(1, len(strings.Split(strings.Trim(res.String(), "\n"), "\n")))
 	// write sigs to file
@@ -808,8 +833,10 @@ func (s *CLITestSuite) TestSignBatchMultisig() {
 
 	addr2, err := account2.GetAddress()
 	s.Require().NoError(err)
+	addr2Str, err := s.clientCtx.AddressCodec.BytesToString(addr2)
+	s.Require().NoError(err)
 	// sign-batch file with account2
-	res, err = authtestutil.TxSignBatchExec(s.clientCtx, addr2, filename.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), "--multisig", addr.String(), "--signature-only")
+	res, err = authtestutil.TxSignBatchExec(s.clientCtx, addr2Str, filename.Name(), fmt.Sprintf("--%s=%s", flags.FlagChainID, s.clientCtx.ChainID), "--multisig", addr.String(), "--signature-only")
 	s.Require().NoError(err)
 	s.Require().Equal(1, len(strings.Split(strings.Trim(res.String(), "\n"), "\n")))
 	// write sigs to file2
@@ -882,7 +909,7 @@ func (s *CLITestSuite) TestTxWithoutPublicKey() {
 	defer unsignedTxFile.Close()
 
 	// Sign the file with the unsignedTx.
-	signedTx, err := authtestutil.TxSignExec(s.clientCtx, s.val, unsignedTxFile.Name(), fmt.Sprintf("--%s=true", cli.FlagOverwrite))
+	signedTx, err := authtestutil.TxSignExec(s.clientCtx, valStr, unsignedTxFile.Name(), fmt.Sprintf("--%s=true", cli.FlagOverwrite))
 	s.Require().NoError(err)
 
 	// Remove the signerInfo's `public_key` field manually from the signedTx.
@@ -948,7 +975,7 @@ func (s *CLITestSuite) TestSignWithMultiSignersAminoJSON() {
 	defer unsignedTxFile.Close()
 
 	// Let val0 sign first the file with the unsignedTx.
-	signedByVal0, err := authtestutil.TxSignExec(s.clientCtx, val0, unsignedTxFile.Name(), "--overwrite", "--sign-mode=amino-json")
+	signedByVal0, err := authtestutil.TxSignExec(s.clientCtx, valStr, unsignedTxFile.Name(), "--overwrite", "--sign-mode=amino-json")
 	s.Require().NoError(err)
 	signedByVal0File := testutil.WriteToNewTempFile(s.T(), signedByVal0.String())
 	defer signedByVal0File.Close()
@@ -959,7 +986,7 @@ func (s *CLITestSuite) TestSignWithMultiSignersAminoJSON() {
 
 	signedTx, err := authtestutil.TxSignExec(
 		s.clientCtx,
-		val1,
+		val1Str,
 		signedByVal0File.Name(),
 		"--offline",
 		fmt.Sprintf("--account-number=%d", val1AccNum),

tests/integration/bank/app_test.go

@@ -86,7 +86,8 @@ func createTestSuite(t *testing.T, genesisAccounts []authtypes.GenesisAccount) s
 		genAccounts = append(genAccounts, simtestutil.GenesisAccount{GenesisAccount: acc})
 	}
 
-	startupCfg := simtestutil.DefaultStartUpConfig()
+	startupCfg, err := simtestutil.DefaultStartUpConfig(cdctestutil.CodecOptions{}.GetAddressCodec())
+	require.NoError(t, err)
 	startupCfg.GenesisAccounts = genAccounts
 
 	app, err := simtestutil.SetupWithConfiguration(
@@ -333,8 +334,8 @@ func TestMsgMultiSendDependent(t *testing.T) {
 	addr2Str, err := ac.BytesToString(addr2)
 	require.NoError(t, err)
 
-	acc1 := authtypes.NewBaseAccountWithAddress(addr1)
-	acc2 := authtypes.NewBaseAccountWithAddress(addr2)
+	acc1 := authtypes.NewBaseAccountWithAddress(addr1Str)
+	acc2 := authtypes.NewBaseAccountWithAddress(addr2Str)
 	err = acc2.SetAccountNumber(1)
 	require.NoError(t, err)
 
@@ -396,7 +397,7 @@ func TestMsgMultiSendDependent(t *testing.T) {
 }
 
 func TestMsgSetSendEnabled(t *testing.T) {
-	acc1 := authtypes.NewBaseAccountWithAddress(addr1)
+	acc1 := authtypes.NewBaseAccountWithAddress(addr1.String())
 
 	genAccs := []authtypes.GenesisAccount{acc1}
 	s := createTestSuite(t, genAccs)

tests/integration/gov/common_test.go

@@ -22,6 +22,7 @@ import (
 	_ "cosmossdk.io/x/staking"
 	stakingtypes "cosmossdk.io/x/staking/types"
 
+	"github.com/cosmos/cosmos-sdk/codec/testutil"
 	"github.com/cosmos/cosmos-sdk/crypto/keys/ed25519"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/testutil/configurator"
@@ -102,6 +103,9 @@ func createTestSuite(t *testing.T) suite {
 	t.Helper()
 	res := suite{}
 
+	cfg, err := simtestutil.DefaultStartUpConfig(testutil.CodecOptions{}.GetAddressCodec())
+	require.NoError(t, err)
+
 	app, err := simtestutil.SetupWithConfiguration(
 		depinject.Configs(
 			configurator.NewAppConfig(
@@ -114,7 +118,7 @@ func createTestSuite(t *testing.T) suite {
 			),
 			depinject.Supply(sdklog.NewNopLogger()),
 		),
-		simtestutil.DefaultStartUpConfig(),
+		cfg,
 		&res.AccountKeeper, &res.BankKeeper, &res.GovKeeper, &res.StakingKeeper,
 	)
 	require.NoError(t, err)