diff options
author | chris erway <51567+cce@users.noreply.github.com> | 2022-02-18 17:05:53 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-02-18 17:05:53 -0500 |
commit | 75c08ab8521e5bac598d49e2c8f20d57cf72e6d9 (patch) | |
tree | 9991f30a6bec25bf6b000cdc644145f485798bc1 | |
parent | 1032c57dc7a922aa0e45a4128aee052bb916fdd9 (diff) | |
parent | 3ed618bc111e524c639027e2b64ab7f27860183f (diff) |
Merge pull request #3660 from cce/unlimited-assets-deadcode
remove dead code from apply.Balances
-rw-r--r-- | ledger/apply/apply.go | 5 | ||||
-rw-r--r-- | ledger/apply/mockBalances_test.go | 29 | ||||
-rw-r--r-- | ledger/internal/cow_creatables.go | 32 |
3 files changed, 0 insertions, 66 deletions
diff --git a/ledger/apply/apply.go b/ledger/apply/apply.go index ad96d5da7..9acd48454 100644 --- a/ledger/apply/apply.go +++ b/ledger/apply/apply.go @@ -39,29 +39,24 @@ type Balances interface { CloseAccount(basics.Address) error // Methods for accessing app and asset data: - // CountX returns the number of AppParams, AppLocalState, AssetHolding, or AssetParams associated with an account. // GetX returns the app or asset data associated with a given address and app/asset index. // HasX checks when an account has data associated with a given address and app/asset index. // PutX updates or creates app or asset data for an address and app/asset index. // DeleteX deletes the app or asset data associated with an address and app/asset index. - // CountAppParams(addr basics.Address) (int, error) GetAppParams(addr basics.Address, aidx basics.AppIndex) (basics.AppParams, bool, error) PutAppParams(addr basics.Address, aidx basics.AppIndex, params basics.AppParams) error DeleteAppParams(addr basics.Address, aidx basics.AppIndex) error - // CountAppLocalState(addr basics.Address) (int, error) GetAppLocalState(addr basics.Address, aidx basics.AppIndex) (basics.AppLocalState, bool, error) HasAppLocalState(addr basics.Address, aidx basics.AppIndex) (bool, error) PutAppLocalState(addr basics.Address, aidx basics.AppIndex, state basics.AppLocalState) error DeleteAppLocalState(addr basics.Address, aidx basics.AppIndex) error - // CountAssetHolding(addr basics.Address) (int, error) GetAssetHolding(addr basics.Address, aidx basics.AssetIndex) (basics.AssetHolding, bool, error) PutAssetHolding(addr basics.Address, aidx basics.AssetIndex, data basics.AssetHolding) error DeleteAssetHolding(addr basics.Address, aidx basics.AssetIndex) error - // CountAssetParams(addr basics.Address) (int, error) GetAssetParams(addr basics.Address, aidx basics.AssetIndex) (basics.AssetParams, bool, error) HasAssetParams(addr basics.Address, aidx basics.AssetIndex) (bool, error) PutAssetParams(addr basics.Address, aidx basics.AssetIndex, data basics.AssetParams) error diff --git a/ledger/apply/mockBalances_test.go b/ledger/apply/mockBalances_test.go index c458ec221..8ac970177 100644 --- a/ledger/apply/mockBalances_test.go +++ b/ledger/apply/mockBalances_test.go @@ -128,35 +128,6 @@ type accountDataAccessor interface { getAccount(addr basics.Address, withRewards bool) (basics.AccountData, error) } -func (b *mockCreatableBalances) CountAppParams(addr basics.Address) (int, error) { - acct, err := b.access.getAccount(addr, false) - if err != nil { - return 0, err - } - return len(acct.AppParams), nil -} -func (b *mockCreatableBalances) CountAppLocalState(addr basics.Address) (int, error) { - acct, err := b.access.getAccount(addr, false) - if err != nil { - return 0, err - } - return len(acct.AppLocalStates), nil -} -func (b *mockCreatableBalances) CountAssetHolding(addr basics.Address) (int, error) { - acct, err := b.access.getAccount(addr, false) - if err != nil { - return 0, err - } - return len(acct.Assets), nil -} -func (b *mockCreatableBalances) CountAssetParams(addr basics.Address) (int, error) { - acct, err := b.access.getAccount(addr, false) - if err != nil { - return 0, err - } - return len(acct.AssetParams), nil -} - func (b *mockCreatableBalances) GetAppParams(addr basics.Address, aidx basics.AppIndex) (ret basics.AppParams, ok bool, err error) { acct, err := b.access.getAccount(addr, false) if err != nil { diff --git a/ledger/internal/cow_creatables.go b/ledger/internal/cow_creatables.go index 3423248db..9db697742 100644 --- a/ledger/internal/cow_creatables.go +++ b/ledger/internal/cow_creatables.go @@ -26,38 +26,6 @@ import ( // These functions ensure roundCowState satisfies the methods for // accessing asset and app data in the apply.Balances interface. -func (cs *roundCowState) CountAppParams(addr basics.Address) (int, error) { - acct, err := cs.lookup(addr) - if err != nil { - return 0, err - } - return int(acct.TotalAppParams), nil -} - -func (cs *roundCowState) CountAppLocalState(addr basics.Address) (int, error) { - acct, err := cs.lookup(addr) - if err != nil { - return 0, err - } - return int(acct.TotalAppLocalStates), nil -} - -func (cs *roundCowState) CountAssetHolding(addr basics.Address) (int, error) { - acct, err := cs.lookup(addr) - if err != nil { - return 0, err - } - return int(acct.TotalAssets), nil -} - -func (cs *roundCowState) CountAssetParams(addr basics.Address) (int, error) { - acct, err := cs.lookup(addr) - if err != nil { - return 0, err - } - return int(acct.TotalAssetParams), nil -} - func (cs *roundCowState) GetAppParams(addr basics.Address, aidx basics.AppIndex) (ret basics.AppParams, ok bool, err error) { var d ledgercore.AppParamsDelta d, ok, err = cs.lookupAppParams(addr, aidx, false) |