testing: adding multiple sender accounts for testing purposes (cosmos…

…#935) (cosmos#959)

* testing: adding multiple sender accounts for testing puproses

* fix genesis setup (cosmos#936)

* Update testing/chain.go

Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>

* refactor: code hygiene

* Update testing/chain.go

Co-authored-by: Aditya <adityasripal@gmail.com>

* fix: setting totalySupply to empty

* nit: CamelCase not UPPERCASE

Co-authored-by: Aditya <adityasripal@gmail.com>
Co-authored-by: colin axnér <25233464+colin-axner@users.noreply.github.com>
(cherry picked from commit 20dd5ca)

Co-authored-by: Sean King <seantking@users.noreply.github.com>

testing/app.go

@@ -91,22 +91,18 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs
  delegations = append(delegations, stakingtypes.NewDelegation(genAccs[0].GetAddress(), val.Address.Bytes(), sdk.OneDec()))
  }
 
- // set validators and delegations
- stakingGenesis := stakingtypes.NewGenesisState(stakingtypes.DefaultParams(), validators, delegations)
- genesisState[stakingtypes.ModuleName] = app.AppCodec().MustMarshalJSON(stakingGenesis)
-
  totalSupply := sdk.NewCoins()
- for _, b := range balances {
- // add genesis acc tokens and delegated tokens to total supply
- totalSupply = totalSupply.Add(b.Coins.Add(sdk.NewCoin(sdk.DefaultBondDenom, bondAmt))...)
- }
 
  // add bonded amount to bonded pool module account
  balances = append(balances, banktypes.Balance{
  Address: authtypes.NewModuleAddress(stakingtypes.BondedPoolName).String(),
- Coins: sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt)},
+ Coins: sdk.Coins{sdk.NewCoin(sdk.DefaultBondDenom, bondAmt.Mul(sdk.NewInt(int64(len(valSet.Validators)))))},
  })
 
+ // set validators and delegations
+ stakingGenesis := stakingtypes.NewGenesisState(stakingtypes.DefaultParams(), validators, delegations)
+ genesisState[stakingtypes.ModuleName] = app.AppCodec().MustMarshalJSON(stakingGenesis)
+
  // update total supply
  bankGenesis := banktypes.NewGenesisState(banktypes.DefaultGenesisState().Params, balances, totalSupply, []banktypes.Metadata{})
  genesisState[banktypes.ModuleName] = app.AppCodec().MustMarshalJSON(bankGenesis)

testing/chain.go

@@ -36,6 +36,15 @@ import (
  "github.com/cosmos/ibc-go/v3/testing/simapp"
 )
 
+var (
+ MaxAccounts = 10
+)
+
+type SenderAccount struct {
+ SenderPrivKey cryptotypes.PrivKey
+ SenderAccount authtypes.AccountI
+}
+
 // TestChain is a testing struct that wraps a simapp with the last TM Header, the current ABCI
 // header and the validators of the TestChain. It also contains a field called ChainID. This
 // is the clientID that *other* chains use to refer to this TestChain. The SenderAccount
@@ -59,6 +68,8 @@ type TestChain struct {
  // autogenerated sender private key
  SenderPrivKey cryptotypes.PrivKey
  SenderAccount authtypes.AccountI
+
+ SenderAccounts []SenderAccount
 }
 
 // NewTestChain initializes a new TestChain instance with a single validator set using a
@@ -84,18 +95,34 @@ func NewTestChain(t *testing.T, coord *Coordinator, chainID string) *TestChain {
  valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator})
  signers := []tmtypes.PrivValidator{privVal}
 
- // generate genesis account
- senderPrivKey := secp256k1.GenPrivKey()
- acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), 0, 0)
- amount, ok := sdk.NewIntFromString("10000000000000000000")
- require.True(t, ok)
+ genAccs := []authtypes.GenesisAccount{}
+ genBals := []banktypes.Balance{}
+ senderAccs := []SenderAccount{}
+
+ // generate genesis accounts
+ for i := 0; i < MaxAccounts; i++ {
+ senderPrivKey := secp256k1.GenPrivKey()
+ acc := authtypes.NewBaseAccount(senderPrivKey.PubKey().Address().Bytes(), senderPrivKey.PubKey(), uint64(i), 0)
+ amount, ok := sdk.NewIntFromString("10000000000000000000")
+ require.True(t, ok)
+
+ balance := banktypes.Balance{
+ Address: acc.GetAddress().String(),
+ Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, amount)),
+ }
+
+ genAccs = append(genAccs, acc)
+ genBals = append(genBals, balance)
+
+ senderAcc := SenderAccount{
+ SenderAccount: acc,
+ SenderPrivKey: senderPrivKey,
+ }
 
- balance := banktypes.Balance{
- Address: acc.GetAddress().String(),
- Coins: sdk.NewCoins(sdk.NewCoin(sdk.DefaultBondDenom, amount)),
+ senderAccs = append(senderAccs, senderAcc)
  }
 
- app := SetupWithGenesisValSet(t, valSet, []authtypes.GenesisAccount{acc}, chainID, balance)
+ app := SetupWithGenesisValSet(t, valSet, genAccs, chainID, genBals...)
 
  // create current header and call begin block
  header := tmproto.Header{
@@ -108,18 +135,19 @@ func NewTestChain(t *testing.T, coord *Coordinator, chainID string) *TestChain {
 
  // create an account to send transactions from
  chain := &TestChain{
- t: t,
- Coordinator: coord,
- ChainID: chainID,
- App: app,
- CurrentHeader: header,
- QueryServer: app.GetIBCKeeper(),
- TxConfig: txConfig,
- Codec: app.AppCodec(),
- Vals: valSet,
- Signers: signers,
- SenderPrivKey: senderPrivKey,
- SenderAccount: acc,
+ t: t,
+ Coordinator: coord,
+ ChainID: chainID,
+ App: app,
+ CurrentHeader: header,
+ QueryServer: app.GetIBCKeeper(),
+ TxConfig: txConfig,
+ Codec: app.AppCodec(),
+ Vals: valSet,
+ Signers: signers,
+ SenderPrivKey: senderAccs[0].SenderPrivKey,
+ SenderAccount: senderAccs[0].SenderAccount,
+ SenderAccounts: senderAccs,
  }
 
  coord.CommitBlock(chain)