From da1fd25f5d20796826134e9f6d76ab38efb423a4 Mon Sep 17 00:00:00 2001 From: Sean McGary Date: Thu, 12 Sep 2024 12:07:12 -0500 Subject: [PATCH] format stuff --- Makefile | 7 +++++++ internal/eigenState/avsOperators/avsOperators.go | 4 ++-- internal/eigenState/avsOperators/avsOperators_test.go | 4 ++-- internal/eigenState/operatorShares/operatorShares.go | 6 +++--- .../eigenState/rewardSubmissions/rewardSubmissions.go | 6 +++--- .../eigenState/stakerDelegations/stakerDelegations.go | 4 ++-- .../stakerDelegations/stakerDelegations_test.go | 4 ++-- internal/eigenState/stakerShares/stakerShares.go | 10 +++++----- .../submittedDistributionRoots.go | 6 +++--- internal/indexer/restakedStrategies_test.go | 2 +- internal/storage/sqlite/sqlite_test.go | 4 ++-- 11 files changed, 32 insertions(+), 25 deletions(-) diff --git a/Makefile b/Makefile index e4ccde7d..e47370d9 100644 --- a/Makefile +++ b/Makefile @@ -58,3 +58,10 @@ ci-test: test .PHONY: lint lint: golangci-lint run + +fmt: + gofmt -s -w . + +fmt-check: + gofmt -l . + diff --git a/internal/eigenState/avsOperators/avsOperators.go b/internal/eigenState/avsOperators/avsOperators.go index 229f57ee..1f5ee48d 100644 --- a/internal/eigenState/avsOperators/avsOperators.go +++ b/internal/eigenState/avsOperators/avsOperators.go @@ -155,7 +155,7 @@ func (a *AvsOperatorsModel) GetStateTransitions() (types.StateTransitions[Accumu // Create an ordered list of block numbers blockNumbers := make([]uint64, 0) - for blockNumber, _ := range stateChanges { + for blockNumber := range stateChanges { blockNumbers = append(blockNumbers, blockNumber) } sort.Slice(blockNumbers, func(i, j int) bool { @@ -170,7 +170,7 @@ func (a *AvsOperatorsModel) GetStateTransitions() (types.StateTransitions[Accumu func (a *AvsOperatorsModel) getContractAddressesForEnvironment() map[string][]string { contracts := a.globalConfig.GetContractsMapForEnvAndNetwork() return map[string][]string{ - contracts.AvsDirectory: []string{ + contracts.AvsDirectory: { "OperatorAVSRegistrationStatusUpdated", }, } diff --git a/internal/eigenState/avsOperators/avsOperators_test.go b/internal/eigenState/avsOperators/avsOperators_test.go index 74438d69..686b15e8 100644 --- a/internal/eigenState/avsOperators/avsOperators_test.go +++ b/internal/eigenState/avsOperators/avsOperators_test.go @@ -142,7 +142,7 @@ func Test_AvsOperatorState(t *testing.T) { } logs := []*storage.TransactionLog{ - &storage.TransactionLog{ + { TransactionHash: "some hash", TransactionIndex: 100, BlockNumber: blocks[0], @@ -155,7 +155,7 @@ func Test_AvsOperatorState(t *testing.T) { UpdatedAt: time.Time{}, DeletedAt: time.Time{}, }, - &storage.TransactionLog{ + { TransactionHash: "some hash", TransactionIndex: 100, BlockNumber: blocks[1], diff --git a/internal/eigenState/operatorShares/operatorShares.go b/internal/eigenState/operatorShares/operatorShares.go index c446d3b8..01f1df4b 100644 --- a/internal/eigenState/operatorShares/operatorShares.go +++ b/internal/eigenState/operatorShares/operatorShares.go @@ -172,7 +172,7 @@ func (osm *OperatorSharesModel) GetStateTransitions() (types.StateTransitions[Ac // Create an ordered list of block numbers blockNumbers := make([]uint64, 0) - for blockNumber, _ := range stateChanges { + for blockNumber := range stateChanges { blockNumbers = append(blockNumbers, blockNumber) } sort.Slice(blockNumbers, func(i, j int) bool { @@ -186,7 +186,7 @@ func (osm *OperatorSharesModel) GetStateTransitions() (types.StateTransitions[Ac func (osm *OperatorSharesModel) getContractAddressesForEnvironment() map[string][]string { contracts := osm.globalConfig.GetContractsMapForEnvAndNetwork() return map[string][]string{ - contracts.DelegationManager: []string{ + contracts.DelegationManager: { "OperatorSharesIncreased", "OperatorSharesDecreased", }, @@ -258,7 +258,7 @@ func (osm *OperatorSharesModel) prepareState(blockNumber uint64) ([]OperatorShar } slotIds := make([]SlotId, 0) - for slotId, _ := range accumulatedState { + for slotId := range accumulatedState { slotIds = append(slotIds, slotId) } diff --git a/internal/eigenState/rewardSubmissions/rewardSubmissions.go b/internal/eigenState/rewardSubmissions/rewardSubmissions.go index f95247d5..5b9ada92 100644 --- a/internal/eigenState/rewardSubmissions/rewardSubmissions.go +++ b/internal/eigenState/rewardSubmissions/rewardSubmissions.go @@ -206,7 +206,7 @@ func (rs *RewardSubmissionsModel) GetStateTransitions() (types.StateTransitions[ // Create an ordered list of block numbers blockNumbers := make([]uint64, 0) - for blockNumber, _ := range stateChanges { + for blockNumber := range stateChanges { blockNumbers = append(blockNumbers, blockNumber) } sort.Slice(blockNumbers, func(i, j int) bool { @@ -220,7 +220,7 @@ func (rs *RewardSubmissionsModel) GetStateTransitions() (types.StateTransitions[ func (rs *RewardSubmissionsModel) getContractAddressesForEnvironment() map[string][]string { contracts := rs.globalConfig.GetContractsMapForEnvAndNetwork() return map[string][]string{ - contracts.RewardsCoordinator: []string{ + contracts.RewardsCoordinator: { "RangePaymentForAllCreated", "RewardsSubmissionForAllCreated", "RangePaymentCreated", @@ -435,7 +435,7 @@ func (rs *RewardSubmissionsModel) sortRewardSubmissionsForMerkelization(submissi } avsAddresses := make([]string, 0) - for key, _ := range mappedByAvs { + for key := range mappedByAvs { avsAddresses = append(avsAddresses, key) } diff --git a/internal/eigenState/stakerDelegations/stakerDelegations.go b/internal/eigenState/stakerDelegations/stakerDelegations.go index e91bf4cd..b414c982 100644 --- a/internal/eigenState/stakerDelegations/stakerDelegations.go +++ b/internal/eigenState/stakerDelegations/stakerDelegations.go @@ -139,7 +139,7 @@ func (s *StakerDelegationsModel) GetStateTransitions() (types.StateTransitions[A // Create an ordered list of block numbers blockNumbers := make([]uint64, 0) - for blockNumber, _ := range stateChanges { + for blockNumber := range stateChanges { blockNumbers = append(blockNumbers, blockNumber) } sort.Slice(blockNumbers, func(i, j int) bool { @@ -153,7 +153,7 @@ func (s *StakerDelegationsModel) GetStateTransitions() (types.StateTransitions[A func (s *StakerDelegationsModel) getContractAddressesForEnvironment() map[string][]string { contracts := s.globalConfig.GetContractsMapForEnvAndNetwork() return map[string][]string{ - contracts.DelegationManager: []string{ + contracts.DelegationManager: { "StakerUndelegated", "StakerDelegated", }, diff --git a/internal/eigenState/stakerDelegations/stakerDelegations_test.go b/internal/eigenState/stakerDelegations/stakerDelegations_test.go index a59c73e6..85c58534 100644 --- a/internal/eigenState/stakerDelegations/stakerDelegations_test.go +++ b/internal/eigenState/stakerDelegations/stakerDelegations_test.go @@ -150,7 +150,7 @@ func Test_DelegatedStakersState(t *testing.T) { } logs := []*storage.TransactionLog{ - &storage.TransactionLog{ + { TransactionHash: "some hash", TransactionIndex: 100, BlockNumber: blocks[0], @@ -163,7 +163,7 @@ func Test_DelegatedStakersState(t *testing.T) { UpdatedAt: time.Time{}, DeletedAt: time.Time{}, }, - &storage.TransactionLog{ + { TransactionHash: "some hash", TransactionIndex: 100, BlockNumber: blocks[1], diff --git a/internal/eigenState/stakerShares/stakerShares.go b/internal/eigenState/stakerShares/stakerShares.go index 16f4e22e..f81759c3 100644 --- a/internal/eigenState/stakerShares/stakerShares.go +++ b/internal/eigenState/stakerShares/stakerShares.go @@ -436,7 +436,7 @@ func (ss *StakerSharesModel) GetStateTransitions() (types.StateTransitions[Accum // Create an ordered list of block numbers blockNumbers := make([]uint64, 0) - for blockNumber, _ := range stateChanges { + for blockNumber := range stateChanges { blockNumbers = append(blockNumbers, blockNumber) } sort.Slice(blockNumbers, func(i, j int) bool { @@ -450,15 +450,15 @@ func (ss *StakerSharesModel) GetStateTransitions() (types.StateTransitions[Accum func (ss *StakerSharesModel) getContractAddressesForEnvironment() map[string][]string { contracts := ss.globalConfig.GetContractsMapForEnvAndNetwork() return map[string][]string{ - contracts.DelegationManager: []string{ + contracts.DelegationManager: { "WithdrawalMigrated", "WithdrawalQueued", }, - contracts.StrategyManager: []string{ + contracts.StrategyManager: { "Deposit", "ShareWithdrawalQueued", }, - contracts.EigenpodManager: []string{ + contracts.EigenpodManager: { "PodSharesUpdated", }, } @@ -529,7 +529,7 @@ func (ss *StakerSharesModel) prepareState(blockNumber uint64) ([]StakerSharesDif } slotIds := make([]SlotId, 0) - for slotId, _ := range accumulatedState { + for slotId := range accumulatedState { slotIds = append(slotIds, slotId) } diff --git a/internal/eigenState/submittedDistributionRoots/submittedDistributionRoots.go b/internal/eigenState/submittedDistributionRoots/submittedDistributionRoots.go index 17c29e00..24e3d32f 100644 --- a/internal/eigenState/submittedDistributionRoots/submittedDistributionRoots.go +++ b/internal/eigenState/submittedDistributionRoots/submittedDistributionRoots.go @@ -181,7 +181,7 @@ func (sdr *SubmittedDistributionRootsModel) GetStateTransitions() (types.StateTr // Create an ordered list of block numbers blockNumbers := make([]uint64, 0) - for blockNumber, _ := range stateChanges { + for blockNumber := range stateChanges { blockNumbers = append(blockNumbers, blockNumber) } sort.Slice(blockNumbers, func(i, j int) bool { @@ -195,7 +195,7 @@ func (sdr *SubmittedDistributionRootsModel) GetStateTransitions() (types.StateTr func (sdr *SubmittedDistributionRootsModel) getContractAddressesForEnvironment() map[string][]string { contracts := sdr.globalConfig.GetContractsMapForEnvAndNetwork() return map[string][]string{ - contracts.RewardsCoordinator: []string{ + contracts.RewardsCoordinator: { "DistributionRootSubmitted", }, } @@ -270,7 +270,7 @@ func (sdr *SubmittedDistributionRootsModel) prepareState(blockNumber uint64) ([] } slotIds := make([]SlotId, 0) - for slotId, _ := range accumulatedState { + for slotId := range accumulatedState { slotIds = append(slotIds, slotId) } diff --git a/internal/indexer/restakedStrategies_test.go b/internal/indexer/restakedStrategies_test.go index d5063ed4..a5a4e167 100644 --- a/internal/indexer/restakedStrategies_test.go +++ b/internal/indexer/restakedStrategies_test.go @@ -167,7 +167,7 @@ func Test_IndexerRestakedStrategies(t *testing.T) { } avsOperator := []*contractCaller.OperatorRestakedStrategy{ - &contractCaller.OperatorRestakedStrategy{ + { Avs: avs, Operator: operator, }, diff --git a/internal/storage/sqlite/sqlite_test.go b/internal/storage/sqlite/sqlite_test.go index c017c180..60a5c008 100644 --- a/internal/storage/sqlite/sqlite_test.go +++ b/internal/storage/sqlite/sqlite_test.go @@ -146,7 +146,7 @@ func Test_SqliteBlockstore(t *testing.T) { LogIndex: 0, Address: "log-address", Arguments: []parser.Argument{ - parser.Argument{ + { Name: "arg1", Type: "string", Value: "some-value", @@ -191,7 +191,7 @@ func Test_SqliteBlockstore(t *testing.T) { LogIndex: 0, Address: "log-address", Arguments: []parser.Argument{ - parser.Argument{ + { Name: "arg1", Type: "string", Value: "some-value",