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

fix remove candidate keeper logic

This commit is contained in:
rigelrozanski 2018-04-02 22:18:54 +02:00
parent 7565ba4c0c
commit a6d587b870
2 changed files with 30 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
x/stake/keeper.go
View File

@ -127,20 +127,19 @@ func (k Keeper) removeCandidate(ctx sdk.Context, address sdk.Address) {
// delete the old candidate record // delete the old candidate record
store := ctx.KVStore(k.storeKey) store := ctx.KVStore(k.storeKey)
store.Delete(GetCandidateKey(address)) store.Delete(GetCandidateKey(address))
store.Delete(GetValidatorKey(address, oldCandidate.Assets, k.cdc))
// delete from recent and power weighted validator groups if the validator // delete from recent and power weighted validator groups if the validator
// exists and add validator with zero power to the validator updates // exists and add validator with zero power to the validator updates
if store.Get(GetRecentValidatorKey(address)) == nil && !k.isNewValidator(ctx, store, address) { if store.Get(GetRecentValidatorKey(address)) == nil {
return return
} }
bz, err := k.cdc.MarshalBinary(Validator{address, sdk.ZeroRat}) bz, err := k.cdc.MarshalBinary(Validator{address, sdk.ZeroRat})
if err != nil { if err != nil {
panic(err) panic(err)
} }
store.Set(GetAccUpdateValidatorKey(address), bz) store.Set(GetAccUpdateValidatorKey(address), bz)
store.Delete(GetRecentValidatorKey(address)) store.Delete(GetRecentValidatorKey(address))
store.Delete(GetValidatorKey(address, oldCandidate.Assets, k.cdc))
} }
//___________________________________________________________________________ //___________________________________________________________________________

46
x/stake/keeper_test.go
View File

@ -444,7 +444,7 @@ func TestGetAccUpdateValidators(t *testing.T) {
assert.Equal(t, 4, len(keeper.GetValidators(ctx))) assert.Equal(t, 4, len(keeper.GetValidators(ctx)))
require.Equal(t, 0, len(keeper.getAccUpdateValidators(ctx))) // max validator number is 4 require.Equal(t, 0, len(keeper.getAccUpdateValidators(ctx))) // max validator number is 4
// test candidate change its power and become a validator(pushing out an existing) // test candidate change its power and become a validator (pushing out an existing)
// candidate set: {c0, c1, c2, c3, c4} -> {c0, c1, c2, c3, c4} // candidate set: {c0, c1, c2, c3, c4} -> {c0, c1, c2, c3, c4}
// validator set: {c0, c1, c2, c3} -> {c1, c2, c3, c4} // validator set: {c0, c1, c2, c3} -> {c1, c2, c3, c4}
// accUpdate set: {} -> {c0, c4} // accUpdate set: {} -> {c0, c4}
@ -460,37 +460,47 @@ func TestGetAccUpdateValidators(t *testing.T) {
require.Equal(t, 5, len(candidates)) require.Equal(t, 5, len(candidates))
vals = keeper.GetValidators(ctx) vals = keeper.GetValidators(ctx)
require.Equal(t, 4, len(vals)) require.Equal(t, 4, len(vals))
assert.Equal(t, candidatesIn[1].Address, vals[1].Address)
assert.Equal(t, candidatesIn[2].Address, vals[3].Address)
assert.Equal(t, candidatesIn[3].Address, vals[2].Address)
assert.Equal(t, candidatesIn[4].Address, vals[0].Address)
acc = keeper.getAccUpdateValidators(ctx) acc = keeper.getAccUpdateValidators(ctx)
require.Equal(t, 2, len(acc), "%v", acc) require.Equal(t, 2, len(acc), "%v", acc)
assert.Equal(t, candidatesIn[0].Address, acc[0].Address) assert.Equal(t, candidatesIn[0].Address, acc[0].Address)
assert.True(t, acc[0].VotingPower.Equal(sdk.ZeroRat)) assert.Equal(t, int64(0), acc[0].VotingPower.Evaluate())
assert.Equal(t, vals[0], acc[1]) assert.Equal(t, vals[0], acc[1])
// test from something to nothing // test from something to nothing
// candidate set: {c0, c1, c2, c3, c4} -> {} // candidate set: {c0, c1, c2, c3, c4} -> {}
// validator set: {c0, c1, c3, c4} -> {} // validator set: {c1, c2, c3, c4} -> {}
// accUpdate set: {} -> {c0, c1, c2, c3, c4} // accUpdate set: {} -> {c1, c2, c3, c4}
keeper.clearAccUpdateValidators(ctx) keeper.clearAccUpdateValidators(ctx)
keeper.removeCandidate(ctx, candidates[0].Address) assert.Equal(t, 5, len(keeper.GetCandidates(ctx, 5)))
keeper.removeCandidate(ctx, candidates[1].Address) assert.Equal(t, 4, len(keeper.GetValidators(ctx)))
keeper.removeCandidate(ctx, candidates[2].Address) assert.Equal(t, 0, len(keeper.getAccUpdateValidators(ctx)))
keeper.removeCandidate(ctx, candidates[3].Address)
keeper.removeCandidate(ctx, candidates[4].Address) keeper.removeCandidate(ctx, candidatesIn[0].Address)
acc = keeper.getAccUpdateValidators(ctx) keeper.removeCandidate(ctx, candidatesIn[1].Address)
require.Equal(t, 5, len(acc)) keeper.removeCandidate(ctx, candidatesIn[2].Address)
keeper.removeCandidate(ctx, candidatesIn[3].Address)
keeper.removeCandidate(ctx, candidatesIn[4].Address)
vals = keeper.GetValidators(ctx)
assert.Equal(t, 0, len(vals), "%v", vals)
candidates = keeper.GetCandidates(ctx, 5) candidates = keeper.GetCandidates(ctx, 5)
require.Equal(t, 0, len(candidates)) require.Equal(t, 0, len(candidates))
assert.Equal(t, candidatesIn[0].Address, acc[0].Address) acc = keeper.getAccUpdateValidators(ctx)
require.Equal(t, 4, len(acc))
assert.Equal(t, candidatesIn[1].Address, acc[0].Address)
assert.Equal(t, candidatesIn[2].Address, acc[1].Address)
assert.Equal(t, candidatesIn[3].Address, acc[2].Address)
assert.Equal(t, candidatesIn[4].Address, acc[3].Address)
assert.Equal(t, int64(0), acc[0].VotingPower.Evaluate()) assert.Equal(t, int64(0), acc[0].VotingPower.Evaluate())
assert.Equal(t, candidatesIn[1].Address, acc[1].Address)
assert.Equal(t, int64(0), acc[1].VotingPower.Evaluate()) assert.Equal(t, int64(0), acc[1].VotingPower.Evaluate())
assert.Equal(t, candidatesIn[2].Address, acc[2].Address)
assert.Equal(t, int64(0), acc[2].VotingPower.Evaluate()) assert.Equal(t, int64(0), acc[2].VotingPower.Evaluate())
assert.Equal(t, candidatesIn[3].Address, acc[3].Address)
assert.Equal(t, int64(0), acc[3].VotingPower.Evaluate()) assert.Equal(t, int64(0), acc[3].VotingPower.Evaluate())
assert.Equal(t, candidatesIn[4].Address, acc[4].Address)
assert.Equal(t, int64(0), acc[4].VotingPower.Evaluate())
} }
// test if is a validator from the last update // test if is a validator from the last update