clear all VotingData{} in ledgercore.AccountData.ClearOnlineState() a…

…nd remove dead basics.AccountData.ClearOnlineState()
algorand · Feb 17, 2022 · a5e867f · a5e867f
1 parent ca46d03
commit a5e867f
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 15 deletions.
diff --git a/data/basics/userBalance.go b/data/basics/userBalance.go
@@ -412,16 +412,6 @@ func MakeAccountData(status Status, algos MicroAlgos) AccountData {
 	return AccountData{Status: status, MicroAlgos: algos}
 }
 
-// ClearOnlineState resets the account's fields to indicate that the account is an offline account
-func (u *AccountData) ClearOnlineState() {
-	u.Status = Offline
-	u.VoteFirstValid = Round(0)
-	u.VoteLastValid = Round(0)
-	u.VoteKeyDilution = 0
-	u.VoteID = crypto.OneTimeSignatureVerifier{}
-	u.SelectionID = crypto.VRFVerifier{}
-}
-
 // Money returns the amount of MicroAlgos associated with the user's account
 func (u AccountData) Money(proto config.ConsensusParams, rewardsLevel uint64) (money MicroAlgos, rewards MicroAlgos) {
 	e := u.WithUpdatedRewards(proto, rewardsLevel)

diff --git a/ledger/ledgercore/accountdata.go b/ledger/ledgercore/accountdata.go
@@ -123,11 +123,7 @@ func (u AccountData) WithUpdatedRewards(proto config.ConsensusParams, rewardsLev
 // ClearOnlineState resets the account's fields to indicate that the account is an offline account
 func (u *AccountData) ClearOnlineState() {
 	u.Status = basics.Offline
-	u.VoteFirstValid = basics.Round(0)
-	u.VoteLastValid = basics.Round(0)
-	u.VoteKeyDilution = 0
-	u.VoteID = crypto.OneTimeSignatureVerifier{}
-	u.SelectionID = crypto.VRFVerifier{}
+	u.VotingData = VotingData{}
 }
 
 // MinBalance computes the minimum balance requirements for an account based on