init balance as coins, not string

tests/e2e/setup/genesis.go

@@ -46,18 +46,13 @@ func getGenDoc(path string) (*tmtypes.GenesisDoc, error) {
 // In practice, this function is used during setup when modifying the genesis file stored in the first
 // validator's path, before the completed genesis file is copied to all validators. Note that path and
 // moniker refer to the first validator - they do not relate to the account being added.
-func addGenesisAccount(cdc codec.Codec, path, moniker, amountStr string, accAddr sdk.AccAddress) error {
+func addGenesisAccount(cdc codec.Codec, path, moniker string, coins sdk.Coins, accAddr sdk.AccAddress) error {
 	serverCtx := server.NewDefaultContext()
 	config := serverCtx.Config
 
 	config.SetRoot(path)
 	config.Moniker = moniker
 
-	coins, err := sdk.ParseCoinsNormalized(amountStr)
-	if err != nil {
-		return fmt.Errorf("failed to parse coins: %w", err)
-	}
-
 	balances := banktypes.Balance{Address: accAddr.String(), Coins: coins.Sort()}
 	genAccount := authtypes.NewBaseAccount(accAddr, nil, 0, 0)
 

tests/e2e/setup/keys.go

@@ -8,6 +8,7 @@ import (
 	"github.com/cosmos/go-bip39"
 
 	appparams "github.com/umee-network/umee/v6/app/params"
+	"github.com/umee-network/umee/v6/util/coin"
 	"github.com/umee-network/umee/v6/x/metoken/mocks"
 )
 
@@ -17,13 +18,17 @@ const (
 	ATOMExponent  = 6
 	PhotonDenom   = "photon"
 
-	// TODO: validator initial balances can be only uumee. Non-validaotr accounts get other tokens for testing.
-	InitBalanceStr = "510000000000" + appparams.BondDenom + ",100000000000" + PhotonDenom + ",100000000000" + mocks.USDTBaseDenom
-
 	GaiaChainID = "test-gaia-chain"
 )
 
 var (
+	// Initial coins to give to validators
+	valCoins = sdk.NewCoins(
+		coin.New(appparams.BondDenom, 1_000000_000000),
+		coin.New(PhotonDenom, 1_000000_000000),
+		coin.New(mocks.USDTBaseDenom, 1_000000_000000),
+	)
+
 	minGasPrice = appparams.ProtocolMinGasPrice.String()
 
 	// TODO: stake less on the validators, and instead delegate from a non-validator account

tests/e2e/setup/setup.go

@@ -127,7 +127,7 @@ func (s *E2ETestSuite) initNodes() {
 		valAddr, err := val.KeyInfo.GetAddress()
 		s.Require().NoError(err)
 		s.Require().NoError(
-			addGenesisAccount(s.cdc, val0ConfigDir, "", InitBalanceStr, valAddr),
+			addGenesisAccount(s.cdc, val0ConfigDir, "", valCoins, valAddr),
 		)
 	}