This allows to setup a TestChain with more than one validators.

* Patch cosmos#918:
  - [x] Run a TestChain with more than one genesis accounts
  - [x] Run a TestChain with more than one validators
  - [x] Run multiple validators with same voting power
  - [ ] Update validator set of TestChains (elegant solution is still WIP)

* Easy fix for the valset update is available in the issue

Author: sainoe

testing/app.go

@@ -95,16 +95,21 @@ func SetupWithGenesisValSet(t *testing.T, valSet *tmtypes.ValidatorSet, genAccs
 	stakingGenesis := stakingtypes.NewGenesisState(stakingtypes.DefaultParams(), validators, delegations)
 	genesisState[stakingtypes.ModuleName] = app.AppCodec().MustMarshalJSON(stakingGenesis)
 
+	// compute bonded amount
+	totalBondAmt := bondAmt.Mul(sdk.NewInt(int64(len(delegations))))
+
 	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))...)
+		totalSupply = totalSupply.Add(b.Coins...)
 	}
+	// add bonded amountto total supply
+	totalSupply = totalSupply.Add(sdk.NewCoin(sdk.DefaultBondDenom, totalBondAmt))
 
 	// 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, totalBondAmt)},
 	})
 
 	// update total supply

testing/chain.go

@@ -69,15 +69,31 @@ type TestChain struct {
 // Time management is handled by the Coordinator in order to ensure synchrony between chains.
 // Each update of any chain increments the block header time for all chains by 5 seconds.
 func NewTestChain(t *testing.T, coord *Coordinator, chainID string) *TestChain {
-	// generate validator private/public key
-	privVal := mock.NewPV()
-	pubKey, err := privVal.GetPubKey()
-	require.NoError(t, err)
-
-	// create validator set with single validator
-	validator := tmtypes.NewValidator(pubKey, 1)
-	valSet := tmtypes.NewValidatorSet([]*tmtypes.Validator{validator})
-	signers := []tmtypes.PrivValidator{privVal}
+
+	// generate validators private/public key
+	var (
+		validators       []*tmtypes.Validator
+		signersByAddress = make(map[string]tmtypes.PrivValidator, ValidatorsPerChain)
+	)
+
+	for i := 0; i < ValidatorsPerChain; i++ {
+		privVal := mock.NewPV()
+		pubKey, err := privVal.GetPubKey()
+		require.NoError(t, err)
+		validators = append(validators, tmtypes.NewValidator(pubKey, 1))
+		signersByAddress[pubKey.Address().String()] = privVal
+	}
+
+	// construct validator set;
+	// Note that the validators are sorted by voting power
+	// or, if equal, by address lexical order
+	valSet := tmtypes.NewValidatorSet(validators)
+
+	// create signers indexed by the valSet validators's order
+	signers := []tmtypes.PrivValidator{}
+	for _, val := range valSet.Validators {
+		signers = append(signers, signersByAddress[val.PubKey.Address().String()])
+	}
 
 	// generate genesis account
 	senderPrivKey := secp256k1.GenPrivKey()

testing/chain_test.go

@@ -45,3 +45,13 @@ func TestCreateSortedSignerArray(t *testing.T) {
 	actual = ibctesting.CreateSortedSignerArray(privVal2, privVal1, validator2, validator1)
 	require.Equal(t, expected, actual)
 }
+
+func TestValidatorsPerChain(t *testing.T) {
+	ibctesting.ValidatorsPerChain = 2
+
+	coordinator := ibctesting.NewCoordinator(t, 2)
+	chainA := coordinator.GetChain(ibctesting.GetChainID(1))
+	chainB := coordinator.GetChain(ibctesting.GetChainID(2))
+	require.Len(t, chainA.Vals.Validators, 2)
+	require.Len(t, chainB.Vals.Validators, 2)
+}

testing/simapp/test_helpers.go

@@ -263,7 +263,11 @@ func SignAndDeliver(
 		require.Nil(t, res)
 	}
 
-	app.EndBlock(abci.RequestEndBlock{})
+	valUpdates := app.EndBlock(abci.RequestEndBlock{})
+	for _, v := range valUpdates.ValidatorUpdates {
+		fmt.Printf("%#v\n", v.String())
+	}
+
 	app.Commit()
 
 	return gInfo, res, err

testing/values.go

@@ -57,7 +57,8 @@ var (
 	MockFailPacketData           = mock.MockFailPacketData
 	MockRecvCanaryCapabilityName = mock.MockRecvCanaryCapabilityName
 
-	prefix = commitmenttypes.NewMerklePrefix([]byte("ibc"))
+	prefix             = commitmenttypes.NewMerklePrefix([]byte("ibc"))
+	ValidatorsPerChain = 1
 )
 
 func GetMockRecvCanaryCapabilityName(packet channeltypes.Packet) string {