remove knockOfflineCandidates from roundCowParent interface

algorand · Dec 19, 2024 · 567780a · 567780a
1 parent b94f083
commit 567780a
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/ledger/eval/appcow_test.go b/ledger/eval/appcow_test.go
@@ -56,10 +56,6 @@ func (ml *emptyLedger) onlineStake() (basics.MicroAlgos, error) {
 	return basics.MicroAlgos{}, nil
 }
 
-func (ml *emptyLedger) knockOfflineCandidates() (map[basics.Address]basics.OnlineAccountData, error) {
-	return nil, nil
-}
-
 func (ml *emptyLedger) lookupAppParams(addr basics.Address, aidx basics.AppIndex, cacheOnly bool) (ledgercore.AppParamsDelta, bool, error) {
 	return ledgercore.AppParamsDelta{}, true, nil
 }

diff --git a/ledger/eval/cow.go b/ledger/eval/cow.go
@@ -46,7 +46,6 @@ type roundCowParent interface {
 	// lookup retrieves agreement data about an address, querying the ledger if necessary.
 	lookupAgreement(basics.Address) (basics.OnlineAccountData, error)
 	onlineStake() (basics.MicroAlgos, error)
-	knockOfflineCandidates() (map[basics.Address]basics.OnlineAccountData, error)
 
 	// lookupAppParams, lookupAssetParams, lookupAppLocalState, and lookupAssetHolding retrieve data for a given address and ID.
 	// If cacheOnly is set, the ledger DB will not be queried, and only the cache will be consulted.
@@ -192,10 +191,6 @@ func (cb *roundCowState) lookupAgreement(addr basics.Address) (data basics.Onlin
 	return cb.lookupParent.lookupAgreement(addr)
 }
 
-func (cb *roundCowState) knockOfflineCandidates() (map[basics.Address]basics.OnlineAccountData, error) {
-	return cb.lookupParent.knockOfflineCandidates()
-}
-
 func (cb *roundCowState) lookupAppParams(addr basics.Address, aidx basics.AppIndex, cacheOnly bool) (ledgercore.AppParamsDelta, bool, error) {
 	params, ok := cb.mods.Accts.GetAppParams(addr, aidx)
 	if ok {

diff --git a/ledger/eval/cow_test.go b/ledger/eval/cow_test.go
@@ -73,10 +73,6 @@ func (ml *mockLedger) onlineStake() (basics.MicroAlgos, error) {
 	return basics.Algos(55_555), nil
 }
 
-func (ml *mockLedger) knockOfflineCandidates() (map[basics.Address]basics.OnlineAccountData, error) {
-	return nil, nil
-}
-
 func (ml *mockLedger) lookupAppParams(addr basics.Address, aidx basics.AppIndex, cacheOnly bool) (ledgercore.AppParamsDelta, bool, error) {
 	params, ok := ml.balanceMap[addr].AppParams[aidx]
 	return ledgercore.AppParamsDelta{Params: &params}, ok, nil // XXX make a copy?

diff --git a/ledger/eval/eval.go b/ledger/eval/eval.go
@@ -237,10 +237,6 @@ func (x *roundCowBase) lookupAgreement(addr basics.Address) (basics.OnlineAccoun
 	return ad, err
 }
 
-func (x *roundCowBase) knockOfflineCandidates() (map[basics.Address]basics.OnlineAccountData, error) {
-	return x.l.GetKnockOfflineCandidates(x.rnd, x.proto)
-}
-
 // onlineStake returns the total online stake as of the start of the round. It
 // caches the result to prevent repeated calls to the ledger.
 func (x *roundCowBase) onlineStake() (basics.MicroAlgos, error) {
@@ -1680,7 +1676,7 @@ func (eval *BlockEvaluator) generateKnockOfflineAccountsList(participating []bas
 	// First, ask the ledger for the top N online accounts, with their latest
 	// online account data, current up to the previous round.
 	if maxSuspensions > 0 {
-		knockOfflineCandidates, err := eval.state.knockOfflineCandidates()
+		knockOfflineCandidates, err := eval.l.GetKnockOfflineCandidates(eval.prevHeader.Round, eval.proto)
 		if err != nil {
 			// Log an error and keep going; generating lists of absent and expired
 			// accounts is not required by block validation rules.
@@ -1708,7 +1704,7 @@ func (eval *BlockEvaluator) generateKnockOfflineAccountsList(participating []bas
 		if !found {
 			continue
 		}
-		// This will overwrite data from the knockOfflineCandidates() list, if they were modified in the current block.
+		// This will overwrite data from the knockOfflineCandidates list, if they were modified in the current block.
 		candidates[accountAddr] = candidateData{
 			VoteLastValid:         acctData.VoteLastValid,
 			VoteID:                acctData.VoteID,