chore: modernize codebase for go 1.25

cmd/beekeeper/cmd/metrics.go

@@ -17,11 +17,8 @@ func newMetricsPusher(pusherAddress, job string, logger logging.Logger) (*push.P
 	killC := make(chan struct{})
 	var wg sync.WaitGroup
 
-	wg.Add(1)
-
 	// start period flusher
-	go func() {
-		defer wg.Done()
+	wg.Go(func() {
 		for {
 			select {
 			case <-killC:
@@ -32,7 +29,7 @@ func newMetricsPusher(pusherAddress, job string, logger logging.Logger) (*push.P
 				}
 			}
 		}
-	}()
+	})
 	cleanupFn := func() {
 		close(killC)
 		wg.Wait()

pkg/bee/api/api.go

@@ -115,7 +115,7 @@ func newClient(apiURL *url.URL, httpClient *http.Client) (c *Client) {
 // body, creates an HTTP request with provided method on a path with required
 // headers and decodes request body if the v argument is not nil and content type is
 // application/json.
-func (c *Client) requestJSON(ctx context.Context, method, path string, body, v interface{}) (err error) {
+func (c *Client) requestJSON(ctx context.Context, method, path string, body, v any) (err error) {
 	var bodyBuffer io.ReadWriter
 	if body != nil {
 		bodyBuffer = new(bytes.Buffer)
@@ -136,7 +136,7 @@ func (c *Client) getFullURL(path string) (string, error) {
 }
 
 // request handles the HTTP request response cycle.
-func (c *Client) request(ctx context.Context, method, path string, body io.Reader, v interface{}) (err error) {
+func (c *Client) request(ctx context.Context, method, path string, body io.Reader, v any) (err error) {
 	fullURL, err := c.getFullURL(path)
 	if err != nil {
 		return err
@@ -171,7 +171,7 @@ func (c *Client) request(ctx context.Context, method, path string, body io.Reade
 
 // encodeJSON writes a JSON-encoded v object to the provided writer with
 // SetEscapeHTML set to false.
-func encodeJSON(w io.Writer, v interface{}) (err error) {
+func encodeJSON(w io.Writer, v any) (err error) {
 	enc := json.NewEncoder(w)
 	enc.SetEscapeHTML(false)
 	return enc.Encode(v)
@@ -238,7 +238,7 @@ func (c *Client) requestDataGetHeader(ctx context.Context, method, path string,
 }
 
 // requestWithHeader handles the HTTP request response cycle.
-func (c *Client) requestWithHeader(ctx context.Context, method, path string, header http.Header, body io.Reader, v interface{}, headerParser ...func(http.Header)) (err error) {
+func (c *Client) requestWithHeader(ctx context.Context, method, path string, header http.Header, body io.Reader, v any, headerParser ...func(http.Header)) (err error) {
 	fullURL, err := c.getFullURL(path)
 	if err != nil {
 		return err

pkg/bee/client.go

@@ -460,7 +460,7 @@ func (c *Client) CreatePostageBatch(ctx context.Context, amount int64, depth uin
 	exists := false
 	usable := false
 	// wait for the stamp to become usable
-	for i := 0; i < 900; i++ {
+	for range 900 {
 		time.Sleep(1 * time.Second)
 		state, err := c.api.Postage.PostageStamp(ctx, id)
 		if err != nil {
@@ -558,7 +558,7 @@ func (c *Client) TopUpPostageBatch(ctx context.Context, batchID string, amount i
 		return err
 	}
 
-	for i := 0; i < 60; i++ {
+	for range 60 {
 		time.Sleep(time.Second)
 
 		b, err := c.PostageStamp(ctx, batchID)
@@ -587,7 +587,7 @@ func (c *Client) DilutePostageBatch(ctx context.Context, batchID string, depth u
 		return err
 	}
 
-	for i := 0; i < 60; i++ {
+	for range 60 {
 		time.Sleep(time.Second)
 
 		b, err := c.api.Postage.PostageStamp(ctx, batchID)

pkg/beekeeper/beekeeper.go

@@ -10,5 +10,5 @@ import (
 // needs to expose metrics should implement the metrics.Reporter
 // interface.
 type Action interface {
-	Run(ctx context.Context, cluster orchestration.Cluster, o interface{}) (err error)
+	Run(ctx context.Context, cluster orchestration.Cluster, o any) (err error)
 }

pkg/beekeeper/tracing.go

@@ -26,7 +26,7 @@ func NewActionMiddleware(tracer opentracing.Tracer, action Action, actionName st
 }
 
 // Run implements beekeeper.Action
-func (am *actionMiddleware) Run(ctx context.Context, cluster orchestration.Cluster, o interface{}) (err error) {
+func (am *actionMiddleware) Run(ctx context.Context, cluster orchestration.Cluster, o any) (err error) {
 	span := createSpan(ctx, am.tracer, am.actionName)
 	defer span.Finish()
 	ctx = opentracing.ContextWithSpan(ctx, span)

pkg/check/act/act.go

@@ -54,7 +54,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 }
 
 // Run executes act check
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/balances/balances.go

@@ -3,6 +3,7 @@ package balances
 import (
 	"context"
 	"fmt"
+	"maps"
 	"time"
 
 	"github.com/ethersphere/beekeeper/pkg/beekeeper"
@@ -56,7 +57,7 @@ func NewCheck(log logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")
@@ -151,7 +152,7 @@ func dryRun(ctx context.Context, cluster orchestration.Cluster, log logging.Logg
 }
 
 func expectBalancesHaveChanged(balances, newBalances orchestration.NodeGroupBalances, log logging.Logger) error {
-	for t := 0; t < 5; t++ {
+	for t := range 5 {
 		sleepTime := 2 * time.Duration(t) * time.Second
 		log.Infof("Waiting %s before checking balances", sleepTime)
 		time.Sleep(sleepTime)
@@ -212,9 +213,7 @@ func balancesHaveChanged(current, previous orchestration.NodeGroupBalances, log
 func flattenBalances(b orchestration.ClusterBalances) map[string]map[string]int64 {
 	res := make(map[string]map[string]int64)
 	for _, ngb := range b {
-		for n, balances := range ngb {
-			res[n] = balances
-		}
+		maps.Copy(res, ngb)
 	}
 	return res
 }

pkg/check/cashout/cashout.go

@@ -51,7 +51,7 @@ type CashoutAction struct {
 }
 
 // Check executes settlements check
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")
@@ -111,7 +111,7 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts int
 	}
 
 LOOP:
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		time.Sleep(5 * time.Second)
 
 		for _, action := range actions {

pkg/check/datadurability/datadurability.go

@@ -48,7 +48,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 
 // Run runs the check
 // It downloads a file that contains a list of chunks and then attempts to download each chunk in the file.
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, o interface{}) error {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, o any) error {
 	opts, ok := o.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")
@@ -140,7 +140,7 @@ func fetchFile(ctx context.Context, logger logging.Logger, ref swarm.Address, cl
 		nodes = append(nodes, node)
 	}
 
-	for i := 0; i < maxAttempts; i++ {
+	for i := range maxAttempts {
 		node := nodes[i%len(nodes)]
 		d, err := node.Client().DownloadFileBytes(ctx, ref, nil)
 		if err != nil {

pkg/check/feed/feed.go

@@ -51,7 +51,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/fileretrieval/fileretrieval.go

@@ -60,7 +60,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/fullconnectivity/fullconnectivity.go

@@ -40,7 +40,7 @@ func NewDefaultOptions() Options {
 
 var errFullConnectivity = errors.New("full connectivity")
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	lightNodes := opts.(Options).LightNodeNames
 	bootNodes := opts.(Options).BootNodeNames
 	if err := c.checkFullNodesConnectivity(ctx, cluster, lightNodes, bootNodes); err != nil {

pkg/check/gc/reserve.go

@@ -135,7 +135,7 @@ A little bit about how the numbers make sense:
   checks on the pinning API.
 */
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/gsoc/gsoc.go

@@ -60,7 +60,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")
@@ -178,7 +178,7 @@ func run(ctx context.Context, uploadClient *bee.Client, listenClient *bee.Client
 
 	receivedMtx.Lock()
 	defer receivedMtx.Unlock()
-	for i := 0; i < numChunks; i++ {
+	for i := range numChunks {
 		want := fmt.Sprintf("data %d", i)
 		if !received[want] {
 			return fmt.Errorf("message '%s' not received", want)

pkg/check/kademlia/kademlia.go

@@ -40,7 +40,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/load/load.go

@@ -79,7 +79,7 @@ func NewCheck(log logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) error {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) error {
 	o, ok := opts.(Options)
 	if !ok {
 		return errors.New("invalid options type")

pkg/check/longavailability/longavailability.go

@@ -48,7 +48,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, o interface{}) error {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, o any) error {
 	opts, ok := o.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/manifest/manifest.go

@@ -60,7 +60,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")
@@ -258,7 +258,7 @@ func (c *Check) downloadAndVerify(ctx context.Context, client *bee.Client, addre
 	}
 	c.logger.Infof("downloading file: %s/%s", address, fName)
 
-	for i := 0; i < 10; i++ {
+	for range 10 {
 		select {
 		case <-time.After(5 * time.Second):
 			_, hash, err := client.DownloadManifestFile(ctx, address, fName)

pkg/check/networkavailability/check.go

@@ -56,7 +56,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 }
 
 // Run creates file of specified size that is uploaded and downloaded.
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) error {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) error {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")
@@ -162,7 +162,7 @@ func neighborhoods(bits int) []swarm.Address {
 
 	ret := make([]swarm.Address, 0, max)
 
-	for i := 0; i < max; i++ {
+	for i := range max {
 		buf := make([]byte, 4)
 		binary.LittleEndian.PutUint32(buf, uint32(i))
 

pkg/check/peercount/peercount.go

@@ -23,7 +23,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	overlays, err := cluster.Overlays(ctx)
 	if err != nil {
 		return err

pkg/check/pingpong/pingpong.go

@@ -39,7 +39,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 }
 
 // Run executes ping check
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, _ interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, _ any) (err error) {
 	nodeGroups := cluster.NodeGroups()
 	for _, ng := range nodeGroups {
 		nodesClients, err := ng.NodesClients(ctx)
@@ -48,7 +48,7 @@ func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, _ interf
 		}
 
 		for n := range nodeStream(ctx, nodesClients) { // TODO: confirm use case for nodeStream(ctx, ng.NodesClientsAll(ctx))
-			for t := 0; t < 5; t++ {
+			for t := range 5 {
 				time.Sleep(2 * time.Duration(t) * time.Second)
 
 				if n.Error != nil {

pkg/check/postage/postage.go

@@ -48,7 +48,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/pss/pss.go

@@ -57,7 +57,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/pullsync/pullsync.go

@@ -57,7 +57,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 
 var errPullSync = errors.New("pull sync")
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/pushsync/check_lightnode.go

@@ -32,7 +32,7 @@ func checkLightChunks(ctx context.Context, cluster orchestration.Cluster, o Opti
 	lightNodes := cluster.LightNodeNames()
 
 	// prepare postage batches
-	for i := 0; i < len(lightNodes); i++ {
+	for i := range lightNodes {
 		nodeName := lightNodes[i]
 		batchID, err := clients[nodeName].GetOrCreateMutableBatch(ctx, o.PostageTTL, o.PostageDepth, o.PostageLabel)
 		if err != nil {
@@ -61,7 +61,7 @@ func checkLightChunks(ctx context.Context, cluster orchestration.Cluster, o Opti
 
 			var ref swarm.Address
 
-			for i := 0; i < 3; i++ {
+			for range 3 {
 				ref, err = uploader.UploadChunk(ctx, chunk.Data(), api.UploadOptions{BatchID: batchID})
 				if err == nil {
 					break
@@ -83,7 +83,7 @@ func checkLightChunks(ctx context.Context, cluster orchestration.Cluster, o Opti
 			l.Infof("closest node %s overlay %s", closestName, closestAddress)
 
 			var synced bool
-			for i := 0; i < 3; i++ {
+			for range 3 {
 				synced, _ = clients[closestName].HasChunk(ctx, ref)
 				if synced {
 					break

pkg/check/pushsync/pushsync.go

@@ -62,7 +62,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, opts any) (err error) {
 	o, ok := opts.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")

pkg/check/redundancy/redundancy.go

@@ -58,7 +58,7 @@ func NewCheck(logger logging.Logger) beekeeper.Action {
 	}
 }
 
-func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, o interface{}) (err error) {
+func (c *Check) Run(ctx context.Context, cluster orchestration.Cluster, o any) (err error) {
 	opts, ok := o.(Options)
 	if !ok {
 		return fmt.Errorf("invalid options type")