move test helper for more accesibility

Author: rhuairahrighairidh

app/ante/ante_test.go

@@ -4,11 +4,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/cosmos/cosmos-sdk/codec"
 	cryptotypes "github.com/cosmos/cosmos-sdk/crypto/types"
 	"github.com/cosmos/cosmos-sdk/simapp/helpers"
 	sdk "github.com/cosmos/cosmos-sdk/types"
-	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	"github.com/stretchr/testify/require"
 	abci "github.com/tendermint/tendermint/abci/types"
@@ -47,7 +45,7 @@ func TestAppAnteHandler(t *testing.T) {
 	tApp = tApp.InitializeFromGenesisStatesWithTimeAndChainID(
 		time.Date(1998, 1, 1, 0, 0, 0, 0, time.UTC),
 		chainID,
-		NewFundedGenStateWithSameCoins(
+		app.NewFundedGenStateWithSameCoins(
 			tApp.AppCodec(),
 			sdk.NewCoins(sdk.NewInt64Coin("ukava", 1e9)),
 			testAddresses,
@@ -128,36 +126,6 @@ func TestAppAnteHandler(t *testing.T) {
 	}
 }
 
-// NewFundedGenStateWithSameCoins creates a (auth and bank) genesis state populated with accounts from the given addresses and balance.
-func NewFundedGenStateWithSameCoins(cdc codec.JSONCodec, balance sdk.Coins, addresses []sdk.AccAddress) app.GenesisState {
-	balances := make([]banktypes.Balance, len(addresses))
-	for i, addr := range addresses {
-		balances[i] = banktypes.Balance{
-			Address: addr.String(),
-			Coins:   balance,
-		}
-	}
-
-	bankGenesis := banktypes.NewGenesisState(
-		banktypes.DefaultParams(),
-		balances,
-		nil,
-		[]banktypes.Metadata{}, // Metadata is not used in the antehandler to it is left out here
-	)
-
-	accounts := make(authtypes.GenesisAccounts, len(addresses))
-	for i := range addresses {
-		accounts[i] = authtypes.NewBaseAccount(addresses[i], nil, 0, 0)
-	}
-
-	authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), accounts)
-
-	return app.GenesisState{
-		authtypes.ModuleName: cdc.MustMarshalJSON(authGenesis),
-		banktypes.ModuleName: cdc.MustMarshalJSON(bankGenesis),
-	}
-}
-
 // TODO Test pricefeed oracles and bep3 deputy txs can always get into the mempool.
 
 // func newPricefeedGenStateMulti(cdc codec.JSONCodec, oracles []sdk.AccAddress) app.GenesisState {

app/test_common.go

@@ -13,6 +13,7 @@ import (
 	authkeeper "github.com/cosmos/cosmos-sdk/x/auth/keeper"
 	authtypes "github.com/cosmos/cosmos-sdk/x/auth/types"
 	bankkeeper "github.com/cosmos/cosmos-sdk/x/bank/keeper"
+	banktypes "github.com/cosmos/cosmos-sdk/x/bank/types"
 	crisiskeeper "github.com/cosmos/cosmos-sdk/x/crisis/keeper"
 	distkeeper "github.com/cosmos/cosmos-sdk/x/distribution/keeper"
 	govkeeper "github.com/cosmos/cosmos-sdk/x/gov/keeper"
@@ -160,16 +161,34 @@ func GeneratePrivKeyAddressPairs(n int) (keys []cryptotypes.PrivKey, addrs []sdk
 	return
 }
 
-// Create a new auth genesis state from some addresses and coins. The state is returned marshalled into a map.
-func NewAuthGenState(cdc codec.JSONCodec, addresses []sdk.AccAddress, coins []sdk.Coins) GenesisState {
-	// Create GenAccounts
-	accounts := authtypes.GenesisAccounts{}
+// NewFundedGenStateWithSameCoins creates a (auth and bank) genesis state populated with accounts from the given addresses and balance.
+func NewFundedGenStateWithSameCoins(cdc codec.JSONCodec, balance sdk.Coins, addresses []sdk.AccAddress) GenesisState {
+	balances := make([]banktypes.Balance, len(addresses))
+	for i, addr := range addresses {
+		balances[i] = banktypes.Balance{
+			Address: addr.String(),
+			Coins:   balance,
+		}
+	}
+
+	bankGenesis := banktypes.NewGenesisState(
+		banktypes.DefaultParams(),
+		balances,
+		nil,
+		[]banktypes.Metadata{}, // Metadata is not widely used in the sdk or kava
+	)
+
+	accounts := make(authtypes.GenesisAccounts, len(addresses))
 	for i := range addresses {
-		accounts = append(accounts, authtypes.NewBaseAccount(addresses[i], nil, 0, 0))
+		accounts[i] = authtypes.NewBaseAccount(addresses[i], nil, 0, 0)
 	}
-	// Create the auth genesis state
+
 	authGenesis := authtypes.NewGenesisState(authtypes.DefaultParams(), accounts)
-	return GenesisState{authtypes.ModuleName: cdc.MustMarshalJSON(authGenesis)}
+
+	return GenesisState{
+		authtypes.ModuleName: cdc.MustMarshalJSON(authGenesis),
+		banktypes.ModuleName: cdc.MustMarshalJSON(bankGenesis),
+	}
 }
 
 // TODO move auth builder to a new package