Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[release-v1.5] rpcserver: Cleanup getvoteinfo RPC. #2005

Merged
merged 1 commit into from
Nov 18, 2019
Merged

[release-v1.5] rpcserver: Cleanup getvoteinfo RPC. #2005

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 30 additions & 33 deletions rpcserver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,10 +55,10 @@ import (

// API version constants
const (
jsonrpcSemverString = "6.1.0"
jsonrpcSemverString = "6.1.1"
jsonrpcSemverMajor = 6
jsonrpcSemverMinor = 1
jsonrpcSemverPatch = 0
jsonrpcSemverPatch = 1
)

const (
Expand Down Expand Up @@ -2935,15 +2935,23 @@ func handleGetTicketPoolValue(s *rpcServer, cmd interface{}, closeChan <-chan st

// handleGetVoteInfo implements the getvoteinfo command.
func handleGetVoteInfo(s *rpcServer, cmd interface{}, closeChan <-chan struct{}) (interface{}, error) {
c, ok := cmd.(*types.GetVoteInfoCmd)
if !ok {
return nil, rpcInvalidError("Invalid type: %T", c)
}

snapshot := s.chain.BestSnapshot()
c := cmd.(*types.GetVoteInfoCmd)

// Shorter versions of some parameters for convenience.
interval := int64(s.server.chainParams.RuleChangeActivationInterval)
quorum := s.server.chainParams.RuleChangeActivationQuorum
chain := s.chain
snapshot := chain.BestSnapshot()

vi, err := chain.GetVoteInfo(&snapshot.Hash, c.Version)
if err != nil {
if _, ok := err.(blockchain.VoteVersionError); ok {
return nil, rpcInvalidError("%d: unrecognized vote version",
c.Version)
}
return nil, rpcInternalError(err.Error(), "could not obtain vote info")
}

// Assemble JSON result.
result := types.GetVoteInfoResult{
CurrentHeight: snapshot.Height,
Expand All @@ -2957,53 +2965,42 @@ func handleGetVoteInfo(s *rpcServer, cmd interface{}, closeChan <-chan struct{})
}

// We don't fail, we try to return the totals for this version.
var err error
result.TotalVotes, err = s.chain.CountVoteVersion(c.Version)
result.TotalVotes, err = chain.CountVoteVersion(c.Version)
if err != nil {
return nil, rpcInternalError(err.Error(),
"Could not count voter versions")
}

vi, err := s.chain.GetVoteInfo(&snapshot.Hash, c.Version)
if err != nil {
return nil, rpcInternalError(err.Error(),
"Could not obtain vote info")
}

result.Agendas = make([]types.Agenda, 0, len(vi.Agendas))
for _, agenda := range vi.Agendas {
// Obtain status of agenda.
state, err := chain.NextThresholdState(&snapshot.Hash, c.Version,
agenda.Vote.Id)
if err != nil {
return nil, err
}

a := types.Agenda{
ID: agenda.Vote.Id,
Description: agenda.Vote.Description,
Mask: agenda.Vote.Mask,
Choices: make([]types.Choice, 0,
len(agenda.Vote.Choices)),
StartTime: agenda.StartTime,
ExpireTime: agenda.ExpireTime,
Choices: make([]types.Choice, 0, len(agenda.Vote.Choices)),
StartTime: agenda.StartTime,
ExpireTime: agenda.ExpireTime,
Status: state.String(),
}

// Handle choices.
for _, choice := range agenda.Vote.Choices {
c := types.Choice{
a.Choices = append(a.Choices, types.Choice{
ID: choice.Id,
Description: choice.Description,
Bits: choice.Bits,
IsAbstain: choice.IsAbstain,
IsNo: choice.IsNo,
}
a.Choices = append(a.Choices, c)
})
}

// Obtain status of agenda.
state, err := s.chain.NextThresholdState(&snapshot.Hash, c.Version,
agenda.Vote.Id)
if err != nil {
return nil, err
}

// Save off status.
a.Status = state.String()

if state.State != blockchain.ThresholdStarted {
// Append transformed agenda without progress.
result.Agendas = append(result.Agendas, a)
Expand Down