*: Use for-range loops over iterator functions

Possible with Go 1.23 which is min required since f95feb3.

Closes #2918.

Signed-off-by: Leonard Lyubich <leonard@morphbits.io>

cmd/internal/cmdprinter/netmap.go

@@ -26,9 +26,9 @@ func PrettyPrintNodeInfo(cmd *cobra.Command, node netmap.NodeInfo,
 
 	cmd.Printf("%sNode %d: %s %s ", indent, index+1, hex.EncodeToString(node.PublicKey()), strState)
 
-	netmap.IterateNetworkEndpoints(node, func(endpoint string) {
+	for endpoint := range func(f func(string) bool) { node.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
 		cmd.Printf("%s ", endpoint)
-	})
+	}
 	cmd.Println()
 
 	if !short {

cmd/neofs-cli/modules/netmap/nodeinfo.go

@@ -69,9 +69,9 @@ func prettyPrintNodeInfo(cmd *cobra.Command, i netmap.NodeInfo) {
 
 	cmd.Println("state:", stateWord)
 
-	netmap.IterateNetworkEndpoints(i, func(s string) {
+	for s := range func(f func(string) bool) { i.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
 		cmd.Println("address:", s)
-	})
+	}
 
 	i.IterateAttributes(func(key, value string) {
 		cmd.Printf("attribute: %s=%s\n", key, value)

cmd/neofs-node/config/node/config.go

@@ -57,7 +57,7 @@ type stringAddressGroup []string
 
 func (x stringAddressGroup) IterateAddresses(f func(string) bool) {
 	for i := range x {
-		if f(x[i]) {
+		if !f(x[i]) {
 			break
 		}
 	}

cmd/neofs-node/config/node/config_test.go

@@ -1,12 +1,12 @@
 package nodeconfig
 
 import (
+	"slices"
 	"testing"
 
 	"github.com/nspcc-dev/neo-go/pkg/encoding/address"
 	"github.com/nspcc-dev/neofs-node/cmd/neofs-node/config"
 	configtest "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/test"
-	"github.com/nspcc-dev/neofs-node/pkg/network"
 	"github.com/stretchr/testify/require"
 )
 
@@ -68,14 +68,12 @@ func TestNodeSection(t *testing.T) {
 
 		ind := 0
 
-		addrs.IterateAddresses(func(addr network.Address) bool {
+		for addr := range slices.Values(addrs) {
 			require.Equal(t, expectedAddr[ind].str, addr.String())
 			require.Equal(t, expectedAddr[ind].host, addr.URIAddr())
 
 			ind++
-
-			return false
-		})
+		}
 
 		require.Equal(t, true, relay)
 

cmd/neofs-node/netmap.go

@@ -144,7 +144,7 @@ func nodeKeyFromNetmap(c *cfg) []byte {
 
 func (c *cfg) iterateNetworkAddresses(f func(string) bool) {
 	ni := c.cfgNodeInfo.localInfo
-	ni.IterateNetworkEndpoints(f)
+	ni.IterateNetworkEndpoints(func(s string) bool { return !f(s) })
 }
 
 func (c *cfg) addressNum() int {

pkg/core/netmap/nodes.go

@@ -1,6 +1,10 @@
 package netmap
 
-import "github.com/nspcc-dev/neofs-sdk-go/netmap"
+import (
+	"slices"
+
+	"github.com/nspcc-dev/neofs-sdk-go/netmap"
+)
 
 // Node is a named type of netmap.NodeInfo which provides interface needed
 // in the current repository. Node is expected to be used everywhere instead
@@ -17,12 +21,8 @@ func (x Node) PublicKey() []byte {
 // IterateAddresses iterates over all announced network addresses
 // and passes them into f. Handler MUST NOT be nil.
 func (x Node) IterateAddresses(f func(string) bool) {
-	(netmap.NodeInfo)(x).IterateNetworkEndpoints(f)
-	for _, addr := range (netmap.NodeInfo)(x).ExternalAddresses() {
-		if f(addr) {
-			return
-		}
-	}
+	(netmap.NodeInfo)(x).IterateNetworkEndpoints(func(s string) bool { return !f(s) })
+	slices.Values((netmap.NodeInfo)(x).ExternalAddresses())(f)
 }
 
 // NumberOfAddresses returns number of announced network addresses.

pkg/innerring/processors/netmap/nodevalidation/availability/validator.go

@@ -23,33 +23,25 @@ func (v Validator) Verify(nodeInfo netmap.NodeInfo) error {
 	var results []*client.ResEndpointInfo
 	var err error
 
-	nodeInfo.IterateNetworkEndpoints(func(s string) bool {
+	for s := range func(f func(string) bool) { nodeInfo.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
 		var res *client.ResEndpointInfo
 		var c *client.Client
 
 		c, err = createSDKClient(s)
 		if err != nil {
-			err = fmt.Errorf("'%s': client creation: %w", s, err)
-			return true
+			return fmt.Errorf("'%s': client creation: %w", s, err)
 		}
-		defer func() {
-			_ = c.Close()
-		}()
 
 		timeoutContext, cancel := context.WithTimeout(context.Background(), pingTimeout)
-		defer cancel()
 
 		res, err = c.EndpointInfo(timeoutContext, client.PrmEndpointInfo{})
+		cancel()
+		_ = c.Close()
 		if err != nil {
-			err = fmt.Errorf("'%s': could not ping node with `EndpointInfo`: %w", s, err)
-			return true
+			return fmt.Errorf("'%s': could not ping node with `EndpointInfo`: %w", s, err)
 		}
 
 		results = append(results, res)
-		return false
-	})
-	if err != nil {
-		return err
 	}
 
 	for _, res := range results {
@@ -108,21 +100,14 @@ func compareNodeInfos(niExp, niGot netmap.NodeInfo) error {
 	}
 
 	expAddrM := make(map[string]struct{}, niExp.NumberOfAttributes())
-	niExp.IterateNetworkEndpoints(func(s string) bool {
+	for s := range func(f func(string) bool) { niExp.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
 		expAddrM[s] = struct{}{}
-		return false
-	})
+	}
 
-	niGot.IterateNetworkEndpoints(func(s string) bool {
+	for s := range func(f func(string) bool) { niGot.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
 		if _, ok := expAddrM[s]; !ok {
-			err = fmt.Errorf("got unexpected address: %s", s)
-			return true
+			return fmt.Errorf("got unexpected address: %s", s)
 		}
-
-		return false
-	})
-	if err != nil {
-		return err
 	}
 
 	return nil

pkg/morph/client/netmap/add_peer.go

@@ -2,6 +2,7 @@ package netmap
 
 import (
 	"fmt"
+	"slices"
 
 	"github.com/nspcc-dev/neo-go/pkg/crypto/keys"
 	netmaprpc "github.com/nspcc-dev/neofs-contract/rpc/netmap"
@@ -27,10 +28,7 @@ func (c *Client) AddPeer(ni netmap.NodeInfo, pkey *keys.PublicKey) error {
 		Key:        pkey,
 		State:      netmaprpc.NodeStateOnline,
 	}
-	ni.IterateNetworkEndpoints(func(addr string) bool {
-		node.Addresses = append(node.Addresses, addr)
-		return false
-	})
+	node.Addresses = slices.Collect(func(f func(s string) bool) { ni.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) })
 	ni.IterateAttributes(func(k, v string) {
 		node.Attributes[k] = v
 	})

pkg/network/cache/multi.go

@@ -5,6 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"io"
+	"slices"
 	"sync"
 	"time"
 
@@ -100,10 +101,9 @@ func (x *multiClient) createForAddress(addr network.Address) (clientcore.Client,
 func (x *multiClient) updateGroup(group network.AddressGroup) {
 	// Firstly, remove old clients.
 	cache := make([]string, 0, group.Len())
-	group.IterateAddresses(func(a network.Address) bool {
+	for a := range slices.Values(group) {
 		cache = append(cache, a.String())
-		return false
-	})
+	}
 
 	x.addrMtx.RLock()
 	oldGroup := x.addr
@@ -148,11 +148,12 @@ func (x *multiClient) iterateClients(ctx context.Context, f func(clientcore.Clie
 	group := x.addr
 	x.addrMtx.RUnlock()
 
-	group.IterateAddresses(func(addr network.Address) bool {
+loop:
+	for addr := range slices.Values(group) {
 		select {
 		case <-ctx.Done():
 			firstErr = context.Canceled
-			return true
+			break loop
 		default:
 		}
 
@@ -178,8 +179,10 @@ func (x *multiClient) iterateClients(ctx context.Context, f func(clientcore.Clie
 			x.ReportError(err)
 		}
 
-		return success
-	})
+		if success {
+			break
+		}
+	}
 
 	return firstErr
 }

pkg/network/group.go

@@ -21,33 +21,11 @@ type AddressGroup []Address
 func StringifyGroup(x AddressGroup) string {
 	var s string
 
-	iterateAllAddresses(x, func(addr Address) {
+	for addr := range slices.Values(x) {
 		s += addr.String()
-	})
-
-	return s
-}
-
-// IterateAddresses iterates over all network addresses of the node.
-//
-// Breaks iterating on handler's true return.
-//
-// Handler should not be nil.
-func (x AddressGroup) IterateAddresses(f func(Address) bool) {
-	for i := range x {
-		if f(x[i]) {
-			break
-		}
 	}
-}
 
-// iterateAllAddresses iterates over all network addresses of g
-// and passes each of them to f.
-func iterateAllAddresses(g AddressGroup, f func(Address)) {
-	g.IterateAddresses(func(addr Address) bool {
-		f(addr)
-		return false
-	})
+	return s
 }
 
 // Len returns number of addresses in AddressGroup.
@@ -69,7 +47,7 @@ func (x AddressGroup) Swap(i, j int) {
 // MultiAddressIterator is an interface of network address group.
 type MultiAddressIterator interface {
 	// IterateAddresses must iterate over network addresses and pass each one
-	// to the handler until it returns true.
+	// to the handler until it returns false.
 	IterateAddresses(func(string) bool)
 
 	// NumberOfAddresses must return number of addresses in group.
@@ -125,33 +103,31 @@ func (x *AddressGroup) FromIterator(iter MultiAddressIterator) error {
 
 // iterateParsedAddresses parses each address from MultiAddressIterator and passes it to f
 // until 1st parsing failure or f's error.
-func iterateParsedAddresses(iter MultiAddressIterator, f func(s Address) error) (err error) {
-	iter.IterateAddresses(func(s string) bool {
+func iterateParsedAddresses(iter MultiAddressIterator, f func(s Address) error) error {
+	for s := range iter.IterateAddresses {
 		var a Address
 
-		err = a.FromString(s)
+		err := a.FromString(s)
 		if err != nil {
-			err = fmt.Errorf("could not parse address from string: %w", err)
-			return true
+			return fmt.Errorf("could not parse address from string: %w", err)
 		}
 
-		err = f(a)
-
-		return err != nil
-	})
-
-	return
+		if err = f(a); err != nil {
+			return err
+		}
+	}
+	return nil
 }
 
 // WriteToNodeInfo writes AddressGroup to netmap.NodeInfo structure.
 func WriteToNodeInfo(g AddressGroup, ni *netmap.NodeInfo) {
 	num := g.Len()
 	addrs := make([]string, 0, num)
 
-	iterateAllAddresses(g, func(addr Address) {
+	for addr := range slices.Values(g) {
 		ni.SetNetworkEndpoints()
 		addrs = append(addrs, addr.String())
-	})
+	}
 
 	ni.SetNetworkEndpoints(addrs...)
 }

pkg/network/validation.go

@@ -35,7 +35,7 @@ var (
 type NodeEndpointsIterator netmap.NodeInfo
 
 func (x NodeEndpointsIterator) IterateAddresses(f func(string) bool) {
-	(netmap.NodeInfo)(x).IterateNetworkEndpoints(f)
+	(netmap.NodeInfo)(x).IterateNetworkEndpoints(func(s string) bool { return !f(s) })
 }
 
 func (x NodeEndpointsIterator) NumberOfAddresses() int {