develop rebase staking fixes
This commit is contained in:
parent
f81c2a8f99
commit
518e2490d5
|
@ -45,20 +45,21 @@ func GetCmdQueryValidator(storeName string, cdc *wire.Codec) *cobra.Command {
|
||||||
fmt.Println(string(output))
|
fmt.Println(string(output))
|
||||||
|
|
||||||
// TODO output with proofs / machine parseable etc.
|
// TODO output with proofs / machine parseable etc.
|
||||||
|
return nil
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
return cmd
|
return cmd
|
||||||
}
|
}
|
||||||
|
|
||||||
// get the command to query a candidate
|
// get the command to query a validator
|
||||||
func GetCmdQueryCandidates(storeName string, cdc *wire.Codec) *cobra.Command {
|
func GetCmdQueryValidators(storeName string, cdc *wire.Codec) *cobra.Command {
|
||||||
cmd := &cobra.Command{
|
cmd := &cobra.Command{
|
||||||
Use: "candidates",
|
Use: "candidates",
|
||||||
Short: "Query for all validator-candidate accounts",
|
Short: "Query for all validator-validator accounts",
|
||||||
RunE: func(cmd *cobra.Command, args []string) error {
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
|
||||||
key := stake.CandidatesKey
|
key := stake.ValidatorsKey
|
||||||
ctx := context.NewCoreContextFromViper()
|
ctx := context.NewCoreContextFromViper()
|
||||||
resKVs, err := ctx.QuerySubspace(cdc, key, storeName)
|
resKVs, err := ctx.QuerySubspace(cdc, key, storeName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
@ -66,11 +67,11 @@ func GetCmdQueryCandidates(storeName string, cdc *wire.Codec) *cobra.Command {
|
||||||
}
|
}
|
||||||
|
|
||||||
// parse out the candidates
|
// parse out the candidates
|
||||||
var candidates []stake.Candidate
|
var candidates []stake.Validator
|
||||||
for _, KV := range resKVs {
|
for _, KV := range resKVs {
|
||||||
var candidate stake.Candidate
|
var validator stake.Validator
|
||||||
cdc.MustUnmarshalBinary(KV.Value, &candidate)
|
cdc.MustUnmarshalBinary(KV.Value, &validator)
|
||||||
candidates = append(candidates, candidate)
|
candidates = append(candidates, validator)
|
||||||
}
|
}
|
||||||
|
|
||||||
output, err := wire.MarshalJSONIndent(cdc, candidates)
|
output, err := wire.MarshalJSONIndent(cdc, candidates)
|
||||||
|
@ -141,7 +142,7 @@ func GetCmdQueryDelegations(storeName string, cdc *wire.Codec) *cobra.Command {
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
key := stake.GetDelegatorBondsKey(delegatorAddr, cdc)
|
key := stake.GetDelegationsKey(delegatorAddr, cdc)
|
||||||
ctx := context.NewCoreContextFromViper()
|
ctx := context.NewCoreContextFromViper()
|
||||||
resKVs, err := ctx.QuerySubspace(cdc, key, storeName)
|
resKVs, err := ctx.QuerySubspace(cdc, key, storeName)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|
|
@ -99,14 +99,14 @@ func handleMsgDeclareCandidacy(ctx sdk.Context, msg MsgDeclareCandidacy, k Keepe
|
||||||
k.setValidator(ctx, validator)
|
k.setValidator(ctx, validator)
|
||||||
tags := sdk.NewTags(
|
tags := sdk.NewTags(
|
||||||
"action", []byte("declareCandidacy"),
|
"action", []byte("declareCandidacy"),
|
||||||
"candidate", msg.CandidateAddr.Bytes(),
|
"validator", msg.ValidatorAddr.Bytes(),
|
||||||
"moniker", []byte(msg.Description.Moniker),
|
"moniker", []byte(msg.Description.Moniker),
|
||||||
"identity", []byte(msg.Description.Identity),
|
"identity", []byte(msg.Description.Identity),
|
||||||
)
|
)
|
||||||
|
|
||||||
// move coins from the msg.Address account to a (self-bond) delegator account
|
// move coins from the msg.Address account to a (self-bond) delegator account
|
||||||
// the validator account and global shares are updated within here
|
// 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 {
|
if err != nil {
|
||||||
return err.Result()
|
return err.Result()
|
||||||
}
|
}
|
||||||
|
@ -139,7 +139,7 @@ func handleMsgEditCandidacy(ctx sdk.Context, msg MsgEditCandidacy, k Keeper) sdk
|
||||||
k.setValidator(ctx, validator)
|
k.setValidator(ctx, validator)
|
||||||
tags := sdk.NewTags(
|
tags := sdk.NewTags(
|
||||||
"action", []byte("editCandidacy"),
|
"action", []byte("editCandidacy"),
|
||||||
"candidate", msg.CandidateAddr.Bytes(),
|
"validator", msg.ValidatorAddr.Bytes(),
|
||||||
"moniker", []byte(msg.Description.Moniker),
|
"moniker", []byte(msg.Description.Moniker),
|
||||||
"identity", []byte(msg.Description.Identity),
|
"identity", []byte(msg.Description.Identity),
|
||||||
)
|
)
|
||||||
|
@ -203,7 +203,7 @@ func delegate(ctx sdk.Context, k Keeper, delegatorAddr sdk.Address,
|
||||||
k.setDelegation(ctx, bond)
|
k.setDelegation(ctx, bond)
|
||||||
k.setValidator(ctx, validator)
|
k.setValidator(ctx, validator)
|
||||||
k.setPool(ctx, pool)
|
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
|
return tags, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -301,7 +301,7 @@ func handleMsgUnbond(ctx sdk.Context, msg MsgUnbond, k Keeper) sdk.Result {
|
||||||
k.setValidator(ctx, validator)
|
k.setValidator(ctx, validator)
|
||||||
}
|
}
|
||||||
k.setPool(ctx, p)
|
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{
|
return sdk.Result{
|
||||||
Tags: tags,
|
Tags: tags,
|
||||||
}
|
}
|
||||||
|
|
|
@ -704,7 +704,6 @@ func TestPool(t *testing.T) {
|
||||||
resPool = keeper.GetPool(ctx)
|
resPool = keeper.GetPool(ctx)
|
||||||
assert.True(t, expPool.equal(resPool))
|
assert.True(t, expPool.equal(resPool))
|
||||||
}
|
}
|
||||||
<<<<<<< HEAD
|
|
||||||
|
|
||||||
func TestValidatorsetKeeper(t *testing.T) {
|
func TestValidatorsetKeeper(t *testing.T) {
|
||||||
ctx, _, keeper := createTestInput(t, false, 0)
|
ctx, _, keeper := createTestInput(t, false, 0)
|
||||||
|
|
Loading…
Reference in New Issue