certusone
/
cosmos-sdk
mirror of https://github.com/certusone/cosmos-sdk.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge PR #2429: LCD Properly Init Proposing Validator in Tests 

* Refactor InitializeTestLCD to initialize correctly

* Update InitializeTestLCD API usage in LCD unit tests

* Update pending log

* Update named return variables

* Increase power of validator proposer in LCD tests
This commit is contained in:
Alexander Bezobchuk 2018-10-03 16:42:44 +00:00 committed by Rigel
parent 324bdaf55d
commit 89d13d1f4c
3 changed files with 64 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
PENDING.md
View File

@ -174,5 +174,7 @@ BUG FIXES
* [\#2158](https://github.com/cosmos/cosmos-sdk/issues/2158) Fix non-deterministic ordering of validator iteration when slashing in `gov EndBlocker` * [\#2158](https://github.com/cosmos/cosmos-sdk/issues/2158) Fix non-deterministic ordering of validator iteration when slashing in `gov EndBlocker`
* [simulation] \#1924 Make simulation stop on SIGTERM * [simulation] \#1924 Make simulation stop on SIGTERM
* [\#2388](https://github.com/cosmos/cosmos-sdk/issues/2388) Remove dependency on deprecated tendermint/tmlibs repository. * [\#2388](https://github.com/cosmos/cosmos-sdk/issues/2388) Remove dependency on deprecated tendermint/tmlibs repository.
* [\#2416](https://github.com/cosmos/cosmos-sdk/issues/2416) Refactored
`InitializeTestLCD` to properly include proposing validator in genesis state.
* Tendermint * Tendermint

72
client/lcd/lcd_test.go
View File

@ -42,7 +42,7 @@ func init() {
func TestKeys(t *testing.T) { func TestKeys(t *testing.T) {
name, password := "test", "1234567890" name, password := "test", "1234567890"
addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
// get seed // get seed
@ -125,7 +125,7 @@ func TestVersion(t *testing.T) {
t.SkipNow() t.SkipNow()
} }
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{})
defer cleanup() defer cleanup()
// node info // node info
@ -148,7 +148,7 @@ func TestVersion(t *testing.T) {
} }
func TestNodeStatus(t *testing.T) { func TestNodeStatus(t *testing.T) {
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{})
defer cleanup() defer cleanup()
// node info // node info
@ -170,7 +170,7 @@ func TestNodeStatus(t *testing.T) {
} }
func TestBlock(t *testing.T) { func TestBlock(t *testing.T) {
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{})
defer cleanup() defer cleanup()
var resultBlock ctypes.ResultBlock var resultBlock ctypes.ResultBlock
@ -200,7 +200,7 @@ func TestBlock(t *testing.T) {
} }
func TestValidators(t *testing.T) { func TestValidators(t *testing.T) {
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{})
defer cleanup() defer cleanup()
var resultVals rpc.ResultValidatorsOutput var resultVals rpc.ResultValidatorsOutput
@ -235,7 +235,7 @@ func TestValidators(t *testing.T) {
func TestCoinSend(t *testing.T) { func TestCoinSend(t *testing.T) {
name, password := "test", "1234567890" name, password := "test", "1234567890"
addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
bz, err := hex.DecodeString("8FA6AB57AD6870F6B5B2E57735F38F2F30E73CB6") bz, err := hex.DecodeString("8FA6AB57AD6870F6B5B2E57735F38F2F30E73CB6")
@ -303,7 +303,7 @@ func TestCoinSend(t *testing.T) {
func DisabledTestIBCTransfer(t *testing.T) { func DisabledTestIBCTransfer(t *testing.T) {
name, password := "test", "1234567890" name, password := "test", "1234567890"
addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
acc := getAccount(t, port, addr) acc := getAccount(t, port, addr)
@ -332,7 +332,7 @@ func DisabledTestIBCTransfer(t *testing.T) {
func TestCoinSendGenerateSignAndBroadcast(t *testing.T) { func TestCoinSendGenerateSignAndBroadcast(t *testing.T) {
name, password := "test", "1234567890" name, password := "test", "1234567890"
addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
acc := getAccount(t, port, addr) acc := getAccount(t, port, addr)
@ -391,7 +391,7 @@ func TestCoinSendGenerateSignAndBroadcast(t *testing.T) {
func TestTxs(t *testing.T) { func TestTxs(t *testing.T) {
name, password := "test", "1234567890" name, password := "test", "1234567890"
addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
// query wrong // query wrong
@ -450,7 +450,7 @@ func TestTxs(t *testing.T) {
func TestPoolParamsQuery(t *testing.T) { func TestPoolParamsQuery(t *testing.T) {
_, password := "test", "1234567890" _, password := "test", "1234567890"
addr, _ := CreateAddr(t, "test", password, GetKeyBase(t)) addr, _ := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
defaultParams := stake.DefaultParams() defaultParams := stake.DefaultParams()
@ -484,9 +484,11 @@ func TestPoolParamsQuery(t *testing.T) {
} }
func TestValidatorsQuery(t *testing.T) { func TestValidatorsQuery(t *testing.T) {
cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) cleanup, valPubKeys, operAddrs, port := InitializeTestLCD(t, 1, []sdk.AccAddress{})
defer cleanup() defer cleanup()
require.Equal(t, 1, len(pks))
require.Equal(t, 1, len(valPubKeys))
require.Equal(t, 1, len(operAddrs))
validators := getValidators(t, port) validators := getValidators(t, port)
require.Equal(t, len(validators), 1) require.Equal(t, len(validators), 1)
@ -494,35 +496,35 @@ func TestValidatorsQuery(t *testing.T) {
// make sure all the validators were found (order unknown because sorted by operator addr) // make sure all the validators were found (order unknown because sorted by operator addr)
foundVal := false foundVal := false
if validators[0].ConsPubKey == pks[0] { if validators[0].ConsPubKey == valPubKeys[0] {
foundVal = true foundVal = true
} }
require.True(t, foundVal, "pk %v, operator %v", pks[0], validators[0].OperatorAddr) require.True(t, foundVal, "pk %v, operator %v", operAddrs[0], validators[0].OperatorAddr)
} }
func TestValidatorQuery(t *testing.T) { func TestValidatorQuery(t *testing.T) {
cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{}) cleanup, valPubKeys, operAddrs, port := InitializeTestLCD(t, 1, []sdk.AccAddress{})
defer cleanup() defer cleanup()
require.Equal(t, 1, len(pks)) require.Equal(t, 1, len(valPubKeys))
require.Equal(t, 1, len(operAddrs))
validator1Operator := sdk.ValAddress(pks[0].Address()) validator := getValidator(t, port, operAddrs[0])
validator := getValidator(t, port, validator1Operator) assert.Equal(t, validator.OperatorAddr, operAddrs[0], "The returned validator does not hold the correct data")
assert.Equal(t, validator.OperatorAddr, validator1Operator, "The returned validator does not hold the correct data")
} }
func TestBonding(t *testing.T) { func TestBonding(t *testing.T) {
name, password, denom := "test", "1234567890", "steak" name, password, denom := "test", "1234567890", "steak"
addr, seed := CreateAddr(t, name, password, GetKeyBase(t)) addr, seed := CreateAddr(t, name, password, GetKeyBase(t))
cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
cleanup, _, operAddrs, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
amt := sdk.NewDec(60) amt := sdk.NewDec(60)
validator1Operator := sdk.ValAddress(pks[0].Address()) validator := getValidator(t, port, operAddrs[0])
validator := getValidator(t, port, validator1Operator)
// create bond TX // create bond TX
resultTx := doDelegate(t, port, seed, name, password, addr, validator1Operator, 60) resultTx := doDelegate(t, port, seed, name, password, addr, operAddrs[0], 60)
tests.WaitForHeight(resultTx.Height+1, port) tests.WaitForHeight(resultTx.Height+1, port)
require.Equal(t, uint32(0), resultTx.CheckTx.Code) require.Equal(t, uint32(0), resultTx.CheckTx.Code)
@ -534,7 +536,7 @@ func TestBonding(t *testing.T) {
require.Equal(t, int64(40), coins.AmountOf(denom).Int64()) require.Equal(t, int64(40), coins.AmountOf(denom).Int64())
// query validator // query validator
bond := getDelegation(t, port, addr, validator1Operator) bond := getDelegation(t, port, addr, operAddrs[0])
require.Equal(t, amt, bond.Shares) require.Equal(t, amt, bond.Shares)
summary := getDelegationSummary(t, port, addr) summary := getDelegationSummary(t, port, addr)
@ -545,17 +547,17 @@ func TestBonding(t *testing.T) {
bondedValidators := getDelegatorValidators(t, port, addr) bondedValidators := getDelegatorValidators(t, port, addr)
require.Len(t, bondedValidators, 1) require.Len(t, bondedValidators, 1)
require.Equal(t, validator1Operator, bondedValidators[0].OperatorAddr) require.Equal(t, operAddrs[0], bondedValidators[0].OperatorAddr)
require.Equal(t, validator.DelegatorShares.Add(amt).String(), bondedValidators[0].DelegatorShares.String()) require.Equal(t, validator.DelegatorShares.Add(amt).String(), bondedValidators[0].DelegatorShares.String())
bondedValidator := getDelegatorValidator(t, port, addr, validator1Operator) bondedValidator := getDelegatorValidator(t, port, addr, operAddrs[0])
require.Equal(t, validator1Operator, bondedValidator.OperatorAddr) require.Equal(t, operAddrs[0], bondedValidator.OperatorAddr)
////////////////////// //////////////////////
// testing unbonding // testing unbonding
// create unbond TX // create unbond TX
resultTx = doBeginUnbonding(t, port, seed, name, password, addr, validator1Operator, 60) resultTx = doBeginUnbonding(t, port, seed, name, password, addr, operAddrs[0], 60)
tests.WaitForHeight(resultTx.Height+1, port) tests.WaitForHeight(resultTx.Height+1, port)
require.Equal(t, uint32(0), resultTx.CheckTx.Code) require.Equal(t, uint32(0), resultTx.CheckTx.Code)
@ -566,7 +568,7 @@ func TestBonding(t *testing.T) {
coins = acc.GetCoins() coins = acc.GetCoins()
require.Equal(t, int64(40), coins.AmountOf("steak").Int64()) require.Equal(t, int64(40), coins.AmountOf("steak").Int64())
unbonding := getUndelegation(t, port, addr, validator1Operator) unbonding := getUndelegation(t, port, addr, operAddrs[0])
require.Equal(t, "60", unbonding.Balance.Amount.String()) require.Equal(t, "60", unbonding.Balance.Amount.String())
summary = getDelegationSummary(t, port, addr) summary = getDelegationSummary(t, port, addr)
@ -599,7 +601,7 @@ func TestBonding(t *testing.T) {
func TestSubmitProposal(t *testing.T) { func TestSubmitProposal(t *testing.T) {
name, password := "test", "1234567890" name, password := "test", "1234567890"
addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
// create SubmitProposal TX // create SubmitProposal TX
@ -621,7 +623,7 @@ func TestSubmitProposal(t *testing.T) {
func TestDeposit(t *testing.T) { func TestDeposit(t *testing.T) {
name, password := "test", "1234567890" name, password := "test", "1234567890"
addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
// create SubmitProposal TX // create SubmitProposal TX
@ -655,7 +657,7 @@ func TestDeposit(t *testing.T) {
func TestVote(t *testing.T) { func TestVote(t *testing.T) {
name, password := "test", "1234567890" name, password := "test", "1234567890"
addr, seed := CreateAddr(t, "test", password, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
// create SubmitProposal TX // create SubmitProposal TX
@ -693,12 +695,12 @@ func TestVote(t *testing.T) {
func TestUnjail(t *testing.T) { func TestUnjail(t *testing.T) {
_, password := "test", "1234567890" _, password := "test", "1234567890"
addr, _ := CreateAddr(t, "test", password, GetKeyBase(t)) addr, _ := CreateAddr(t, "test", password, GetKeyBase(t))
cleanup, pks, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr}) cleanup, valPubKeys, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr})
defer cleanup() defer cleanup()
// XXX: any less than this and it fails // XXX: any less than this and it fails
tests.WaitForHeight(3, port) tests.WaitForHeight(3, port)
pkString, _ := sdk.Bech32ifyConsPub(pks[0]) pkString, _ := sdk.Bech32ifyConsPub(valPubKeys[0])
signingInfo := getSigningInfo(t, port, pkString) signingInfo := getSigningInfo(t, port, pkString)
tests.WaitForHeight(4, port) tests.WaitForHeight(4, port)
require.Equal(t, true, signingInfo.IndexOffset > 0) require.Equal(t, true, signingInfo.IndexOffset > 0)
@ -711,7 +713,7 @@ func TestProposalsQuery(t *testing.T) {
name2, password2 := "test2", "1234567890" name2, password2 := "test2", "1234567890"
addr, seed := CreateAddr(t, "test", password1, GetKeyBase(t)) addr, seed := CreateAddr(t, "test", password1, GetKeyBase(t))
addr2, seed2 := CreateAddr(t, "test2", password2, GetKeyBase(t)) addr2, seed2 := CreateAddr(t, "test2", password2, GetKeyBase(t))
cleanup, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr, addr2}) cleanup, _, _, port := InitializeTestLCD(t, 1, []sdk.AccAddress{addr, addr2})
defer cleanup() defer cleanup()
// Addr1 proposes (and deposits) proposals #1 and #2 // Addr1 proposes (and deposits) proposals #1 and #2

39
client/lcd/test_helpers.go
View File

@ -115,7 +115,14 @@ func CreateAddr(t *testing.T, name, password string, kb crkeys.Keybase) (sdk.Acc
// their respective sockets where nValidators is the total number of validators // their respective sockets where nValidators is the total number of validators
// and initAddrs are the accounts to initialize with some steak tokens. It // and initAddrs are the accounts to initialize with some steak tokens. It
// returns a cleanup function, a set of validator public keys, and a port. // returns a cleanup function, a set of validator public keys, and a port.
func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress) (func(), []crypto.PubKey, string) { func InitializeTestLCD(
t *testing.T, nValidators int, initAddrs []sdk.AccAddress,
) (cleanup func(), valConsPubKeys []crypto.PubKey, valOperAddrs []sdk.ValAddress, port string) {
if nValidators < 1 {
panic("InitializeTestLCD must use at least one validator")
}
config := GetConfig() config := GetConfig()
config.Consensus.TimeoutCommit = 100 config.Consensus.TimeoutCommit = 100
config.Consensus.SkipTimeoutCommit = false config.Consensus.SkipTimeoutCommit = false
@ -136,30 +143,34 @@ func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress
genDoc, err := tmtypes.GenesisDocFromFile(genesisFile) genDoc, err := tmtypes.GenesisDocFromFile(genesisFile)
require.NoError(t, err) require.NoError(t, err)
if nValidators < 1 { // append initial (proposing) validator
panic("InitializeTestLCD must use at least one validator") genDoc.Validators[0] = tmtypes.GenesisValidator{
PubKey: privVal.GetPubKey(),
Power: 999999, // create enough power to enable 2/3 voting power
Name: "validator-1",
} }
// append any additional (non-proposing) validators
for i := 1; i < nValidators; i++ { for i := 1; i < nValidators; i++ {
genDoc.Validators = append(genDoc.Validators, genDoc.Validators = append(genDoc.Validators,
tmtypes.GenesisValidator{ tmtypes.GenesisValidator{
PubKey: ed25519.GenPrivKey().PubKey(), PubKey: ed25519.GenPrivKey().PubKey(),
Power: 1, Power: 1,
Name: "val", Name: fmt.Sprintf("validator-%d", i+1),
}, },
) )
} }
var validatorsPKs []crypto.PubKey
// NOTE: It's bad practice to reuse public key address for the operator
// address but doing in the test for simplicity.
var appGenTxs []json.RawMessage var appGenTxs []json.RawMessage
for _, gdValidator := range genDoc.Validators {
pk := gdValidator.PubKey
validatorsPKs = append(validatorsPKs, pk)
appGenTx, _, _, err := gapp.GaiaAppGenTxNF(cdc, pk, sdk.AccAddress(pk.Address()), "test_val1") for _, gdValidator := range genDoc.Validators {
operAddr := ed25519.GenPrivKey().PubKey().Address()
pk := gdValidator.PubKey
valConsPubKeys = append(valConsPubKeys, pk)
valOperAddrs = append(valOperAddrs, sdk.ValAddress(operAddr))
appGenTx, _, _, err := gapp.GaiaAppGenTxNF(cdc, pk, sdk.AccAddress(operAddr), gdValidator.Name)
require.NoError(t, err) require.NoError(t, err)
appGenTxs = append(appGenTxs, appGenTx) appGenTxs = append(appGenTxs, appGenTx)
@ -203,14 +214,14 @@ func InitializeTestLCD(t *testing.T, nValidators int, initAddrs []sdk.AccAddress
tests.WaitForLCDStart(port) tests.WaitForLCDStart(port)
tests.WaitForHeight(1, port) tests.WaitForHeight(1, port)
cleanup := func() { cleanup = func() {
logger.Debug("cleaning up LCD initialization") logger.Debug("cleaning up LCD initialization")
node.Stop() node.Stop()
node.Wait() node.Wait()
lcd.Close() lcd.Close()
} }
return cleanup, validatorsPKs, port return cleanup, valConsPubKeys, valOperAddrs, port
} }
// startTM creates and starts an in-process Tendermint node with memDB and // startTM creates and starts an in-process Tendermint node with memDB and