From bca4d2ab6018c4a18c7f8c0de94580d586297857 Mon Sep 17 00:00:00 2001 From: jholdstock Date: Wed, 29 May 2024 10:15:04 +0100 Subject: [PATCH] types: Remove Revoked from VSP info response. This was marked as deprecated in the previous release and is now being removed. --- docs/api.md | 1 - internal/webapi/vspinfo.go | 1 - types/types.go | 11 ++++------- 3 files changed, 4 insertions(+), 9 deletions(-) diff --git a/docs/api.md b/docs/api.md index 68b4478c..b667b565 100644 --- a/docs/api.md +++ b/docs/api.md @@ -56,7 +56,6 @@ when a VSP is closed will result in an error. "voted":25, "totalvotingwallets":3, "votingwalletsonline":3, - "revoked":3, "expired":2, "missed":1, "blockheight":623212, diff --git a/internal/webapi/vspinfo.go b/internal/webapi/vspinfo.go index 133bf20d..fb094eee 100644 --- a/internal/webapi/vspinfo.go +++ b/internal/webapi/vspinfo.go @@ -29,7 +29,6 @@ func (w *WebAPI) vspInfo(c *gin.Context) { Voted: cachedStats.Voted, TotalVotingWallets: cachedStats.TotalVotingWallets, VotingWalletsOnline: cachedStats.VotingWalletsOnline, - Revoked: cachedStats.Expired + cachedStats.Missed, Expired: cachedStats.Expired, Missed: cachedStats.Missed, BlockHeight: cachedStats.BlockHeight, diff --git a/types/types.go b/types/types.go index 08e701f8..699d3b46 100644 --- a/types/types.go +++ b/types/types.go @@ -24,13 +24,10 @@ type VspInfoResponse struct { Voted int64 `json:"voted"` TotalVotingWallets int64 `json:"totalvotingwallets"` VotingWalletsOnline int64 `json:"votingwalletsonline"` - // Deprecated: Revoked will be removed in the next major version bump. - // Revoked is simply the sum of Expired and Missed, so use those instead. - Revoked int64 `json:"revoked"` - Expired int64 `json:"expired"` - Missed int64 `json:"missed"` - BlockHeight uint32 `json:"blockheight"` - NetworkProportion float32 `json:"estimatednetworkproportion"` + Expired int64 `json:"expired"` + Missed int64 `json:"missed"` + BlockHeight uint32 `json:"blockheight"` + NetworkProportion float32 `json:"estimatednetworkproportion"` } type FeeAddressRequest struct {