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.

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

Don't expect VSPs to have "revoked". #198

Merged
merged 1 commit into from
Jan 8, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 0 additions & 1 deletion docs/api.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ Example: <https://api.decred.org/?c=vsp>
"closed": false,
"voting": 3935,
"voted": 57073,
"revoked": 83,
"expired": 73,
"missed": 10,
},
Expand Down
23 changes: 5 additions & 18 deletions service.go
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2017-2024 The Decred developers
// Copyright (c) 2017-2025 The Decred developers
// Use of this source code is governed by an ISC
// license that can be found in the LICENSE file.

Expand Down Expand Up @@ -33,7 +33,6 @@ type Vsp struct {
Closed bool `json:"closed"`
Voting int64 `json:"voting"`
Voted int64 `json:"voted"`
Revoked int64 `json:"revoked"`
Expired int64 `json:"expired"`
Missed int64 `json:"missed"`
VspdVersion string `json:"vspdversion"`
Expand Down Expand Up @@ -230,16 +229,15 @@ func vspStats(service *Service, url string) error {
vspclosed, hasClosed := info["vspclosed"]
voting, hasVoting := info["voting"]
voted, hasVoted := info["voted"]
revoked, hasRevoked := info["revoked"]
expired, hasExpired := info["expired"]
missed, hasMissed := info["missed"]
version, hasVersion := info["vspdversion"]
blockheight, hasBlockHeight := info["blockheight"]
networkproportion, hasnetworkproportion := info["estimatednetworkproportion"]

hasRequiredFields := hasAPIVersions && hasFeePercentage &&
hasClosed && hasVoting && hasVoted && hasRevoked && hasVersion &&
hasBlockHeight && hasnetworkproportion
hasClosed && hasVoting && hasVoted && hasExpired && hasMissed &&
hasVersion && hasBlockHeight && hasnetworkproportion

if !hasRequiredFields {
return fmt.Errorf("%v: missing required fields: %+v", infoURL, info)
Expand All @@ -254,23 +252,12 @@ func vspStats(service *Service, url string) error {
vsp.Closed = vspclosed.(bool)
vsp.Voting = int64(voting.(float64))
vsp.Voted = int64(voted.(float64))
vsp.Revoked = int64(revoked.(float64))
vsp.Expired = int64(expired.(float64))
vsp.Missed = int64(missed.(float64))
vsp.VspdVersion = version.(string)
vsp.BlockHeight = uint64(blockheight.(float64))
vsp.EstimatedNetworkProportion = networkproportion.(float64)

// Expired and Missed were introduced in vspd 1.3.0 so they will be absent
// from the responses received from older versions. When every VSP is
// updated to 1.3.0+ these fields can be treated like every other required
// field.
if hasExpired {
vsp.Expired = int64(expired.(float64))
}

if hasMissed {
vsp.Missed = int64(missed.(float64))
}

vsp.LastUpdated = time.Now().Unix()

service.Mutex.Lock()
Expand Down
Loading