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

develop rebase staking fixes

This commit is contained in:
rigelrozanski 2018-05-10 20:51:48 -04:00
parent f81c2a8f99
commit 518e2490d5
3 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
x/stake/client/cli/query.go
View File

@ -45,20 +45,21 @@ func GetCmdQueryValidator(storeName string, cdc *wire.Codec) *cobra.Command {
fmt.Println(string(output))
// TODO output with proofs / machine parseable etc.
return nil
},
}
return cmd
}
// get the command to query a candidate
func GetCmdQueryCandidates(storeName string, cdc *wire.Codec) *cobra.Command {
// get the command to query a validator
func GetCmdQueryValidators(storeName string, cdc *wire.Codec) *cobra.Command {
cmd := &cobra.Command{
Use: "candidates",
Short: "Query for all validator-candidate accounts",
Short: "Query for all validator-validator accounts",
RunE: func(cmd *cobra.Command, args []string) error {
key := stake.CandidatesKey
key := stake.ValidatorsKey
ctx := context.NewCoreContextFromViper()
resKVs, err := ctx.QuerySubspace(cdc, key, storeName)
if err != nil {
@ -66,11 +67,11 @@ func GetCmdQueryCandidates(storeName string, cdc *wire.Codec) *cobra.Command {
}
// parse out the candidates
var candidates []stake.Candidate
var candidates []stake.Validator
for _, KV := range resKVs {
var candidate stake.Candidate
cdc.MustUnmarshalBinary(KV.Value, &candidate)
candidates = append(candidates, candidate)
var validator stake.Validator
cdc.MustUnmarshalBinary(KV.Value, &validator)
candidates = append(candidates, validator)
}
output, err := wire.MarshalJSONIndent(cdc, candidates)
@ -141,7 +142,7 @@ func GetCmdQueryDelegations(storeName string, cdc *wire.Codec) *cobra.Command {
if err != nil {
return err
}
key := stake.GetDelegatorBondsKey(delegatorAddr, cdc)
key := stake.GetDelegationsKey(delegatorAddr, cdc)
ctx := context.NewCoreContextFromViper()
resKVs, err := ctx.QuerySubspace(cdc, key, storeName)
if err != nil {

10
x/stake/handler.go
View File

@ -99,14 +99,14 @@ func handleMsgDeclareCandidacy(ctx sdk.Context, msg MsgDeclareCandidacy, k Keepe
k.setValidator(ctx, validator)
tags := sdk.NewTags(
"action", []byte("declareCandidacy"),
"candidate", msg.CandidateAddr.Bytes(),
"validator", msg.ValidatorAddr.Bytes(),
"moniker", []byte(msg.Description.Moniker),
"identity", []byte(msg.Description.Identity),
)
// move coins from the msg.Address account to a (self-bond) delegator account
// the validator account and global shares are updated within here
delegateTags, err := delegate(ctx, k, msg.CandidateAddr, msg.Bond, candidate)
delegateTags, err := delegate(ctx, k, msg.ValidatorAddr, msg.Bond, validator)
if err != nil {
return err.Result()
}
@ -139,7 +139,7 @@ func handleMsgEditCandidacy(ctx sdk.Context, msg MsgEditCandidacy, k Keeper) sdk
k.setValidator(ctx, validator)
tags := sdk.NewTags(
"action", []byte("editCandidacy"),
"candidate", msg.CandidateAddr.Bytes(),
"validator", msg.ValidatorAddr.Bytes(),
"moniker", []byte(msg.Description.Moniker),
"identity", []byte(msg.Description.Identity),
)
@ -203,7 +203,7 @@ func delegate(ctx sdk.Context, k Keeper, delegatorAddr sdk.Address,
k.setDelegation(ctx, bond)
k.setValidator(ctx, validator)
k.setPool(ctx, pool)
tags := sdk.NewTags("action", []byte("delegate"), "delegator", delegatorAddr.Bytes(), "candidate", candidate.Address.Bytes())
tags := sdk.NewTags("action", []byte("delegate"), "delegator", delegatorAddr.Bytes(), "validator", validator.Address.Bytes())
return tags, nil
}
@ -301,7 +301,7 @@ func handleMsgUnbond(ctx sdk.Context, msg MsgUnbond, k Keeper) sdk.Result {
k.setValidator(ctx, validator)
}
k.setPool(ctx, p)
tags := sdk.NewTags("action", []byte("unbond"), "delegator", msg.DelegatorAddr.Bytes(), "candidate", msg.CandidateAddr.Bytes())
tags := sdk.NewTags("action", []byte("unbond"), "delegator", msg.DelegatorAddr.Bytes(), "validator", msg.ValidatorAddr.Bytes())
return sdk.Result{
Tags: tags,
}

1
x/stake/keeper_test.go
View File

@ -704,7 +704,6 @@ func TestPool(t *testing.T) {
resPool = keeper.GetPool(ctx)
assert.True(t, expPool.equal(resPool))
}
<<<<<<< HEAD
func TestValidatorsetKeeper(t *testing.T) {
ctx, _, keeper := createTestInput(t, false, 0)