Merge pull request #844 from onflow/mpeter/modernize-go-codebase

m-Peter · web-flow · commit d46ae329f26c · 2025-07-14T12:01:22.000+03:00
Run Go modernize tool to simplify code-base
diff --git a/api/api.go b/api/api.go
@@ -134,7 +134,7 @@ func (b *BlockChainAPI) BlockNumber(ctx context.Context) (hexutil.Uint64, error)
 // - startingBlock: block number this node started to synchronize from
 // - currentBlock:  block number this node is currently importing
 // - highestBlock:  block number of the highest block header this node has received from peers
-func (b *BlockChainAPI) Syncing(ctx context.Context) (interface{}, error) {
+func (b *BlockChainAPI) Syncing(ctx context.Context) (any, error) {
 	if err := b.rateLimiter.Apply(ctx, EthSyncing); err != nil {
 		return nil, err
 	}
@@ -322,7 +322,7 @@ func (b *BlockChainAPI) GetTransactionByBlockNumberAndIndex(
 func (b *BlockChainAPI) GetTransactionReceipt(
 	ctx context.Context,
 	hash common.Hash,
-) (map[string]interface{}, error) {
+) (map[string]any, error) {
 	l := b.logger.With().
 		Str("endpoint", EthGetTransactionReceipt).
 		Str("hash", hash.String()).
@@ -334,17 +334,17 @@ func (b *BlockChainAPI) GetTransactionReceipt(
 
 	tx, err := b.transactions.Get(hash)
 	if err != nil {
-		return handleError[map[string]interface{}](err, l, b.collector)
+		return handleError[map[string]any](err, l, b.collector)
 	}
 
 	receipt, err := b.receipts.GetByTransactionID(hash)
 	if err != nil {
-		return handleError[map[string]interface{}](err, l, b.collector)
+		return handleError[map[string]any](err, l, b.collector)
 	}
 
 	txReceipt, err := ethTypes.MarshalReceipt(receipt, tx)
 	if err != nil {
-		return handleError[map[string]interface{}](err, l, b.collector)
+		return handleError[map[string]any](err, l, b.collector)
 	}
 
 	return txReceipt, nil
@@ -809,10 +809,7 @@ func (b *BlockChainAPI) FeeHistory(
 		gasUsedRatios []float64
 	)
 
-	maxCount := uint64(blockCount)
-	if maxCount > lastBlockNumber {
-		maxCount = lastBlockNumber
-	}
+	maxCount := min(uint64(blockCount), lastBlockNumber)
 
 	blockRewards := make([]*hexutil.Big, len(rewardPercentiles))
 	for i := range rewardPercentiles {
diff --git a/api/server.go b/api/server.go
@@ -436,9 +436,9 @@ type responseHandler struct {
 const errCodePanic = -32603
 
 type jsonError struct {
-	Code    int         `json:"code"`
-	Message string      `json:"message"`
-	Data    interface{} `json:"data,omitempty"`
+	Code    int    `json:"code"`
+	Message string `json:"message"`
+	Data    any    `json:"data,omitempty"`
 }
 
 type jsonMessage struct {
diff --git a/bootstrap/bootstrap.go b/bootstrap/bootstrap.go
@@ -531,7 +531,7 @@ func retryInterceptor(maxDuration, pauseDuration time.Duration) grpcOpts.UnaryCl
 	return func(
 		ctx context.Context,
 		method string,
-		req, reply interface{},
+		req, reply any,
 		cc *grpcOpts.ClientConn,
 		invoker grpcOpts.UnaryInvoker,
 		opts ...grpcOpts.CallOption,
diff --git a/bootstrap/create-multi-key-account.go b/bootstrap/create-multi-key-account.go
@@ -81,7 +81,7 @@ func CreateMultiKeyAccount(
 	}
 
 	accountKeys := make([]*flow.AccountKey, keyCount)
-	for i := 0; i < keyCount; i++ {
+	for i := range keyCount {
 		accountKeys[i] = &flow.AccountKey{
 			Index:     uint32(i),
 			PublicKey: privateKey.PublicKey(),
diff --git a/eth/types/types.go b/eth/types/types.go
@@ -468,7 +468,7 @@ type Block struct {
 	GasLimit         hexutil.Uint64   `json:"gasLimit"`
 	GasUsed          hexutil.Uint64   `json:"gasUsed"`
 	Timestamp        hexutil.Uint64   `json:"timestamp"`
-	Transactions     interface{}      `json:"transactions"`
+	Transactions     any              `json:"transactions"`
 	Uncles           []common.Hash    `json:"uncles"`
 	MixHash          common.Hash      `json:"mixHash"`
 	BaseFeePerGas    hexutil.Big      `json:"baseFeePerGas"`
@@ -504,15 +504,15 @@ type SyncStatus struct {
 func MarshalReceipt(
 	receipt *models.Receipt,
 	tx models.Transaction,
-) (map[string]interface{}, error) {
+) (map[string]any, error) {
 	from, err := tx.From()
 	if err != nil {
-		return map[string]interface{}{}, err
+		return map[string]any{}, err
 	}
 
 	txHash := tx.Hash()
 
-	fields := map[string]interface{}{
+	fields := map[string]any{
 		"blockHash":         receipt.BlockHash,
 		"blockNumber":       hexutil.Uint64(receipt.BlockNumber.Uint64()),
 		"transactionHash":   txHash,
diff --git a/models/errors/errors.go b/models/errors/errors.go
@@ -92,7 +92,7 @@ func (e *RevertError) ErrorCode() int {
 }
 
 // ErrorData returns the hex encoded revert reason.
-func (e *RevertError) ErrorData() interface{} {
+func (e *RevertError) ErrorData() any {
 	return e.Reason
 }
 
diff --git a/models/events_test.go b/models/events_test.go
@@ -69,7 +69,7 @@ func TestNewSingleBlockEvents(t *testing.T) {
 	events := make([]flow.Event, 0)
 
 	// generate txs
-	for i := 0; i < txCount; i++ {
+	for i := range txCount {
 		tx, _, txEvent, err := newTransaction(uint64(i), uint16(i))
 		require.NoError(t, err)
 		hashes[i] = tx.Hash()
@@ -246,7 +246,7 @@ func TestNewSingleBlockEvents(t *testing.T) {
 
 		// assert that EVM transactions & receipts are sorted by their
 		// TransactionIndex field
-		for i := 0; i < txCount; i++ {
+		for i := range txCount {
 			tx := cdcEvents.transactions[i]
 			receipt := cdcEvents.receipts[i]
 			assert.Equal(t, tx.Hash(), receipt.TxHash)
@@ -315,7 +315,7 @@ func TestNewMultiBlockEvents(t *testing.T) {
 	evmTxEvents := make([]flow.BlockEvents, txCount)
 
 	// generate txs
-	for i := 0; i < txCount; i++ {
+	for i := range txCount {
 		tx, _, txEvent, err := newTransaction(uint64(i), uint16(i))
 		require.NoError(t, err)
 		hashes[i] = tx.Hash()
@@ -338,7 +338,7 @@ func TestNewMultiBlockEvents(t *testing.T) {
 
 		// Below we add all the EVM transaction events, but we have omitted
 		// the EVM.BlockExecuted event.
-		for i := 0; i < txCount; i++ {
+		for i := range txCount {
 			blockEvents.Events = append(blockEvents.Events, evmTxEvents[i].Events...)
 		}
 
@@ -388,7 +388,7 @@ func TestNewMultiBlockEvents(t *testing.T) {
 		}
 
 		// Below we add all the EVM transaction events
-		for i := 0; i < txCount; i++ {
+		for i := range txCount {
 			blockEvents.Events = append(blockEvents.Events, evmTxEvents[i].Events...)
 		}
 
@@ -508,7 +508,7 @@ func Test_EventDecoding(t *testing.T) {
 	}
 
 	// generate txs
-	for i := 0; i < txCount; i++ {
+	for i := range txCount {
 		var err error
 		txs[i], results[i], txEvents[i], err = newTransaction(uint64(i), uint16(i))
 		require.NoError(t, err)
@@ -535,7 +535,7 @@ func Test_EventDecoding(t *testing.T) {
 
 	cumulative := uint64(1)
 	logIndex := uint(0)
-	for i := 0; i < txCount; i++ {
+	for i := range txCount {
 		tx := cadenceEvents.Transactions()[i]
 		rcp := cadenceEvents.Receipts()[i]
 		blockHash, err := block.Hash()
diff --git a/models/stream_test.go b/models/stream_test.go
@@ -76,11 +76,11 @@ func Test_Stream(t *testing.T) {
 		// and then unsubscribe all
 		waitAllSubscribed.Add(10)
 		waitAllUnsubscribed.Add(10)
-		for i := 0; i < 10; i++ {
+		for range 10 {
 			go func() {
 				subscriptions := make([]*mockSubscription, 10)
 
-				for j := 0; j < 10; j++ {
+				for j := range 10 {
 					s := newMockSubscription()
 					subscriptions[j] = s
 					p.Subscribe(s)
@@ -90,7 +90,7 @@ func Test_Stream(t *testing.T) {
 				waitAllSubscribed.Wait()
 
 				// wait for all subscribers to receive data
-				for i := 0; i < 10; i++ {
+				for range 10 {
 					<-published
 				}
 
@@ -99,7 +99,7 @@ func Test_Stream(t *testing.T) {
 				}
 
 				// there should be at least 1 call
-				for j := 0; j < 10; j++ {
+				for j := range 10 {
 					require.GreaterOrEqual(t, subscriptions[j].CallCount(), uint64(10))
 				}
 
diff --git a/services/ingestion/engine_test.go b/services/ingestion/engine_test.go
@@ -496,7 +496,7 @@ func TestBlockAndTransactionIngestion(t *testing.T) {
 		eventCount := 5
 		txHashes := make([]gethCommon.Hash, eventCount)
 
-		for i := 0; i < eventCount; i++ {
+		for i := range eventCount {
 			txCdc, txEvent, transaction, res, err := newTransaction(evmHeight)
 			txHashes[i] = res.TxHash
 			require.NoError(t, err)
diff --git a/services/ingestion/event_subscriber.go b/services/ingestion/event_subscriber.go
@@ -272,10 +272,7 @@ func (r *RPCEventSubscriber) backfillSporkFromHeight(ctx context.Context, fromCa
 		r.logger.Debug().Msg(fmt.Sprintf("backfilling [%d / %d] ...", fromCadenceHeight, lastHeight))
 
 		startHeight := fromCadenceHeight
-		endHeight := fromCadenceHeight + maxRangeForGetEvents
-		if endHeight > lastHeight {
-			endHeight = lastHeight
-		}
+		endHeight := min(fromCadenceHeight+maxRangeForGetEvents, lastHeight)
 
 		blocks, err := r.client.GetEventsForHeightRange(ctx, blockExecutedEvent, startHeight, endHeight)
 		if err != nil {
diff --git a/services/ingestion/event_subscriber_test.go b/services/ingestion/event_subscriber_test.go
@@ -207,7 +207,7 @@ func Test_SubscribingWithRetryOnError(t *testing.T) {
 
 		if eventHeight == cadenceHeight {
 			require.Equal(t, evmBlock, ev.Events.Block())
-			for i := 0; i < len(txHashes); i++ {
+			for i := range txHashes {
 				tx := ev.Events.Transactions()[i]
 				require.Equal(t, txHashes[i], tx.Hash())
 			}
@@ -352,7 +352,7 @@ func generateEvmTxEvents(t *testing.T, cadenceHeight uint64) (
 	flowEvents := make([]flow.Event, 0)
 
 	// generate txs
-	for i := 0; i < txCount; i++ {
+	for i := range txCount {
 		cdcEvent, txEvent, tx, _, err := newTransaction(cadenceHeight)
 		require.NoError(t, err)
 		hashes[i] = tx.Hash()
diff --git a/services/requester/requester.go b/services/requester/requester.go
@@ -400,13 +400,11 @@ func (e *EVM) EstimateGas(
 		if float64(passingGasLimit-failingGasLimit)/float64(passingGasLimit) < estimateGasErrorRatio {
 			break
 		}
-		mid := (passingGasLimit + failingGasLimit) / 2
-		if mid > failingGasLimit*2 {
+		mid := min((passingGasLimit+failingGasLimit)/2,
 			// Most txs don't need much higher gas limit than their gas used, and most txs don't
 			// require near the full block limit of gas, so the selection of where to bisect the
 			// range here is skewed to favor the low side.
-			mid = failingGasLimit * 2
-		}
+			failingGasLimit*2)
 		result, err := dryRun(mid)
 		if err != nil {
 			return 0, err
diff --git a/storage/index_test.go b/storage/index_test.go
@@ -151,7 +151,7 @@ func (b *BlockTestSuite) TestStore() {
 
 	b.Run("store multiple blocks, and get one", func() {
 
-		for i := 0; i < 10; i++ {
+		for i := range 10 {
 			batch := b.DB.NewBatch()
 
 			err := b.Blocks.Store(uint64(i+5), flow.Identifier{byte(i)}, mocks.NewBlock(uint64(10+i)), batch)
@@ -175,7 +175,7 @@ func (b *BlockTestSuite) TestStore() {
 func (b *BlockTestSuite) TestHeights() {
 
 	b.Run("last EVM height", func() {
-		for i := 0; i < 5; i++ {
+		for i := range 5 {
 			lastHeight := uint64(100 + i)
 			batch := b.DB.NewBatch()
 
@@ -221,7 +221,7 @@ func (b *BlockTestSuite) TestHeights() {
 	})
 
 	b.Run("last Cadence height", func() {
-		for i := 0; i < 5; i++ {
+		for i := range 5 {
 			lastHeight := uint64(100 + i)
 			batch := b.DB.NewBatch()
 			err := b.Blocks.Store(lastHeight, flow.Identifier{byte(i)}, mocks.NewBlock(lastHeight-10), batch)
@@ -427,7 +427,7 @@ func (s *ReceiptTestSuite) TestBloomsForBlockRange() {
 		s.Require().NoError(err)
 		s.Require().Len(bloomsHeights, subsetSize)
 
-		for i := 0; i < subsetSize; i++ {
+		for i := range subsetSize {
 			s.Require().Len(bloomsHeights[i].Blooms, 1)
 			s.Require().Equal(bloomsHeights[i].Blooms[0], testBlooms[i])
 			s.Require().Equal(bloomsHeights[i].Height, testHeights[i])
@@ -622,7 +622,7 @@ func (s *TransactionTestSuite) TestGetTransaction() {
 
 	s.Run("store multiple transactions and get single", func() {
 		var tx models.Transaction
-		for i := 0; i < 10; i++ {
+		for i := range 10 {
 			tx = mocks.NewTransaction(uint64(10 + i))
 			batch := s.DB.NewBatch()
 			err := s.TransactionIndexer.Store(tx, batch)
@@ -670,7 +670,7 @@ func (s *TraceTestSuite) TestStore() {
 	})
 
 	s.Run("overwrite existing trace", func() {
-		for i := 0; i < 2; i++ {
+		for range 2 {
 			id := common.Hash{0x01}
 			trace := json.RawMessage(`{ "test": "foo" }`)
 
diff --git a/storage/mocks/mocks.go b/storage/mocks/mocks.go
@@ -48,7 +48,7 @@ func NewReceipt(height uint64, ID common.Hash) *models.Receipt {
 				TxIndex:     1,
 				BlockHash:   ID,
 				Index:       0,
-				Data:        []byte(fmt.Sprintf("data-1%d", height)),
+				Data:        fmt.Appendf(nil, "data-1%d", height),
 			},
 			{
 				Address:     common.BytesToAddress([]byte{0x02, 0x22}),
@@ -58,7 +58,7 @@ func NewReceipt(height uint64, ID common.Hash) *models.Receipt {
 				TxIndex:     1,
 				BlockHash:   ID,
 				Index:       1,
-				Data:        []byte(fmt.Sprintf("data-2%d", height)),
+				Data:        fmt.Appendf(nil, "data-2%d", height),
 			},
 		},
 		TxHash:            txHash,
diff --git a/storage/pebble/storage_test.go b/storage/pebble/storage_test.go
@@ -141,7 +141,7 @@ func TestBatch(t *testing.T) {
 	runDB("multiple batch stores", t, func(t *testing.T, db *Storage) {
 		blocks := NewBlocks(db, flowGo.Emulator)
 
-		for i := 0; i < 5; i++ {
+		for i := range 5 {
 			cadenceHeight := uint64(1 + i)
 			evmHeight := uint64(10 + i)
 			bl := mocks.NewBlock(evmHeight)

Original file line number	Diff line number	Diff line change
`@@ -81,7 +81,7 @@ func CreateMultiKeyAccount(`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`accountKeys := make([]*flow.AccountKey, keyCount)`
`84`		`- for i := 0; i < keyCount; i++ {`
	`84`	`+ for i := range keyCount {`
`85`	`85`	`accountKeys[i] = &flow.AccountKey{`
`86`	`86`	`Index: uint32(i),`
`87`	`87`	`PublicKey: privateKey.PublicKey(),`
Original file line number	Diff line number	Diff line change
`@@ -92,7 +92,7 @@ func (e *RevertError) ErrorCode() int {`
`92`	`92`	`}`
`93`	`93`
`94`	`94`	`// ErrorData returns the hex encoded revert reason.`
`95`		`-func (e *RevertError) ErrorData() interface{} {`
	`95`	`+func (e *RevertError) ErrorData() any {`
`96`	`96`	`return e.Reason`
`97`	`97`	`}`
`98`	`98`