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

fixed small breaking changes from pulling in develop

This commit is contained in:
David Kajpust 2018-06-06 15:49:22 -04:00
parent 33a5e01264
commit 78703f027d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
x/stake/inflation_test.go
View File

@ -214,7 +214,7 @@ func TestLargeBond(t *testing.T) {
// initialBondedRatio that we can use to compare to the new values after the unbond // initialBondedRatio that we can use to compare to the new values after the unbond
initialBondedRatio := pool.bondedRatio() initialBondedRatio := pool.bondedRatio()
params := defaultParams() params := DefaultParams()
params.MaxValidators = bondedValidators + 1 //must do this to allow for an extra validator to bond params.MaxValidators = bondedValidators + 1 //must do this to allow for an extra validator to bond
keeper.setParams(ctx, params) keeper.setParams(ctx, params)
@ -245,7 +245,7 @@ func TestLargeBond(t *testing.T) {
// Tests that inflation increases or decreases as expected when we do a random operation on 20 different validators // Tests that inflation increases or decreases as expected when we do a random operation on 20 different validators
func TestInflationWithRandomOperations(t *testing.T) { func TestInflationWithRandomOperations(t *testing.T) {
ctx, _, keeper := createTestInput(t, false, 0) ctx, _, keeper := createTestInput(t, false, 0)
params := defaultParams() params := DefaultParams()
keeper.setParams(ctx, params) keeper.setParams(ctx, params)
numValidators := 20 numValidators := 20
@ -343,7 +343,7 @@ func updateProvisions(t *testing.T, keeper Keeper, pool Pool, ctx sdk.Context, h
// Allows you to decide how many validators to setup // Allows you to decide how many validators to setup
// Allows you to pick which validators are bonded by adjusting the MaxValidators of params // Allows you to pick which validators are bonded by adjusting the MaxValidators of params
func setupTestValidators(pool Pool, keeper Keeper, ctx sdk.Context, validatorTokens []int64, maxValidators uint16) ([]Validator, Keeper, Pool) { func setupTestValidators(pool Pool, keeper Keeper, ctx sdk.Context, validatorTokens []int64, maxValidators uint16) ([]Validator, Keeper, Pool) {
params := defaultParams() params := DefaultParams()
params.MaxValidators = maxValidators params.MaxValidators = maxValidators
keeper.setParams(ctx, params) keeper.setParams(ctx, params)
numValidators := len(validatorTokens) numValidators := len(validatorTokens)

2
x/stake/test_common.go
View File

@ -150,7 +150,7 @@ func createTestAddrs(numAddrs int) []sdk.Address {
buffer.WriteString(numString) //adding on final two digits to make addresses unique buffer.WriteString(numString) //adding on final two digits to make addresses unique
res, _ := sdk.GetAccAddressHex(buffer.String()) res, _ := sdk.GetAccAddressHex(buffer.String())
bech, _ := sdk.Bech32CosmosifyAcc(res) bech, _ := sdk.Bech32ifyAcc(res)
addresses = append(addresses, testAddr(buffer.String(), bech)) addresses = append(addresses, testAddr(buffer.String(), bech))
buffer.Reset() buffer.Reset()
} }