From c5c01192b6ff507bc68600ed2a3f5d3c4bd75b1d Mon Sep 17 00:00:00 2001 From: pk910 Date: Wed, 29 Nov 2023 18:26:43 +0100 Subject: [PATCH] fix staticcheck issues --- cache/tiered_cache.go | 4 ++-- handlers/clients.go | 2 +- handlers/epoch.go | 2 +- handlers/epochs.go | 2 +- handlers/error.go | 2 +- handlers/forks.go | 2 +- handlers/index.go | 2 +- handlers/slot.go | 2 +- handlers/slots.go | 2 +- handlers/slots_filtered.go | 2 +- handlers/validator.go | 2 +- handlers/validator_slots.go | 2 +- handlers/validators.go | 2 +- indexer/cache_logic.go | 10 +++------- services/beaconservice.go | 6 ++---- services/fnsignatures.go | 4 ---- 16 files changed, 19 insertions(+), 29 deletions(-) diff --git a/cache/tiered_cache.go b/cache/tiered_cache.go index a8c62407..d7e64154 100644 --- a/cache/tiered_cache.go +++ b/cache/tiered_cache.go @@ -24,7 +24,7 @@ type cachedValue struct { Value interface{} `json:"v"` } -var CacheMissError error = errors.New("cache miss") +var ErrCacheMiss error = errors.New("cache miss") type RemoteCache interface { Set(ctx context.Context, key string, value any, expiration time.Duration) error @@ -100,7 +100,7 @@ func (cache *TieredCache) Get(key string, returnValue interface{}) (interface{}, } if cache.remoteCache == nil { - return nil, CacheMissError + return nil, ErrCacheMiss } // retrieve the key from the remote cache diff --git a/handlers/clients.go b/handlers/clients.go index eaf160e6..48c8d6f0 100644 --- a/handlers/clients.go +++ b/handlers/clients.go @@ -46,7 +46,7 @@ func getClientsPageData() (*models.ClientsPageData, error) { if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.ClientsPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/epoch.go b/handlers/epoch.go index 161fe43d..c6ecd228 100644 --- a/handlers/epoch.go +++ b/handlers/epoch.go @@ -72,7 +72,7 @@ func getEpochPageData(epoch uint64) (*models.EpochPageData, error) { if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.EpochPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/epochs.go b/handlers/epochs.go index 319524b2..07b6dfe7 100644 --- a/handlers/epochs.go +++ b/handlers/epochs.go @@ -60,7 +60,7 @@ func getEpochsPageData(firstEpoch uint64, pageSize uint64) (*models.EpochsPageDa if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.EpochsPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/error.go b/handlers/error.go index f93a5338..2d5b07a4 100644 --- a/handlers/error.go +++ b/handlers/error.go @@ -15,7 +15,7 @@ import ( "github.com/sirupsen/logrus" ) -var InvalidPageModelError = errors.New("invalid page model") +var ErrInvalidPageModel = errors.New("invalid page model") type customFileServer struct { handler http.Handler diff --git a/handlers/forks.go b/handlers/forks.go index fe7d541c..36904b0e 100644 --- a/handlers/forks.go +++ b/handlers/forks.go @@ -48,7 +48,7 @@ func getForksPageData() (*models.ForksPageData, error) { if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.ForksPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/index.go b/handlers/index.go index 7308b434..c3c93cde 100644 --- a/handlers/index.go +++ b/handlers/index.go @@ -80,7 +80,7 @@ func getIndexPageData() (*models.IndexPageData, error) { if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.IndexPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/slot.go b/handlers/slot.go index 3154a726..a6be7f2e 100644 --- a/handlers/slot.go +++ b/handlers/slot.go @@ -175,7 +175,7 @@ func getSlotPageData(blockSlot int64, blockRoot []byte, loadDuties bool) (*model if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.SlotPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/slots.go b/handlers/slots.go index 2042201a..5af5fdd3 100644 --- a/handlers/slots.go +++ b/handlers/slots.go @@ -61,7 +61,7 @@ func getSlotsPageData(firstSlot uint64, pageSize uint64) (*models.SlotsPageData, if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.SlotsPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/slots_filtered.go b/handlers/slots_filtered.go index b88a9f96..0fc0dc15 100644 --- a/handlers/slots_filtered.go +++ b/handlers/slots_filtered.go @@ -85,7 +85,7 @@ func getFilteredSlotsPageData(pageIdx uint64, pageSize uint64, graffiti string, if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.SlotsFilteredPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/validator.go b/handlers/validator.go index 4b173cee..4241a48b 100644 --- a/handlers/validator.go +++ b/handlers/validator.go @@ -93,7 +93,7 @@ func getValidatorPageData(validatorIndex uint64) (*models.ValidatorPageData, err if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.ValidatorPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/validator_slots.go b/handlers/validator_slots.go index c91aa26a..c3be95f2 100644 --- a/handlers/validator_slots.go +++ b/handlers/validator_slots.go @@ -65,7 +65,7 @@ func getValidatorSlotsPageData(validator uint64, pageIdx uint64, pageSize uint64 if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.ValidatorSlotsPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/handlers/validators.go b/handlers/validators.go index b6578014..e768f202 100644 --- a/handlers/validators.go +++ b/handlers/validators.go @@ -89,7 +89,7 @@ func getValidatorsPageData(firstValIdx uint64, pageSize uint64, sortOrder string if pageErr == nil && pageRes != nil { resData, resOk := pageRes.(*models.ValidatorsPageData) if !resOk { - return nil, InvalidPageModelError + return nil, ErrInvalidPageModel } pageData = resData } diff --git a/indexer/cache_logic.go b/indexer/cache_logic.go index f1874a88..3b8687ee 100644 --- a/indexer/cache_logic.go +++ b/indexer/cache_logic.go @@ -343,16 +343,12 @@ func (cache *indexerCache) processCachePersistence() error { var minPruneSlot int64 = -1 if headEpoch >= uint64(cache.indexer.cachePersistenceDelay) { persistEpoch := headEpoch - uint64(cache.indexer.cachePersistenceDelay) - if persistEpoch >= 0 { - minPersistSlot = int64((persistEpoch+1)*utils.Config.Chain.Config.SlotsPerEpoch) - 1 - minPersistEpoch = int64(persistEpoch) - } + minPersistSlot = int64((persistEpoch+1)*utils.Config.Chain.Config.SlotsPerEpoch) - 1 + minPersistEpoch = int64(persistEpoch) } if headEpoch >= uint64(cache.indexer.inMemoryEpochs) { pruneEpoch := headEpoch - uint64(cache.indexer.inMemoryEpochs) - if pruneEpoch >= 0 { - minPruneSlot = int64((pruneEpoch+1)*utils.Config.Chain.Config.SlotsPerEpoch) - 1 - } + minPruneSlot = int64((pruneEpoch+1)*utils.Config.Chain.Config.SlotsPerEpoch) - 1 } for slot, blocks := range cache.slotMap { if int64(slot) <= minPersistSlot { diff --git a/services/beaconservice.go b/services/beaconservice.go index c13570cc..2804ffa5 100644 --- a/services/beaconservice.go +++ b/services/beaconservice.go @@ -343,10 +343,8 @@ func (bs *BeaconService) GetProposerAssignments(firstEpoch uint64, lastEpoch uin if epochStats != nil { synchronizedEpochs[epoch] = true proposers := epochStats.TryGetProposerAssignments() - if proposers != nil { - for slot, vidx := range proposers { - proposerAssignments[slot] = vidx - } + for slot, vidx := range proposers { + proposerAssignments[slot] = vidx } } } diff --git a/services/fnsignatures.go b/services/fnsignatures.go index 85411bcf..68460e38 100644 --- a/services/fnsignatures.go +++ b/services/fnsignatures.go @@ -19,7 +19,6 @@ import ( ) type TxSignaturesService struct { - mutex sync.Mutex } var GlobalTxSignaturesService *TxSignaturesService @@ -130,16 +129,13 @@ func (tss *TxSignaturesService) LookupSignatures(sigBytes []types.TxSignatureByt } nonfoundLookups := make([]*TxSignaturesLookup, 0) - nonfoundLookupBytes := make([]types.TxSignatureBytes, 0) for _, l := range unresolvedLookups { if l == nil { break } nonfoundLookups = append(nonfoundLookups, l) - nonfoundLookupBytes = append(nonfoundLookupBytes, l.Bytes) } unresolvedLookups = nonfoundLookups - unresolvedLookupBytes = nonfoundLookupBytes } // add pending signature lookups