*: Use new iterators from NeoFS SDK

Completes 8340c91. No more wrappers and
closures needed.

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

Author: cthulhu-rider

cmd/internal/cmdprinter/netmap.go

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

cmd/neofs-cli/modules/container/get.go

@@ -105,9 +105,9 @@ func prettyPrintContainer(cmd *cobra.Command, cnr container.Container, jsonEncod
 	cmd.Println("created:", cnr.CreatedAt())
 
 	cmd.Println("attributes:")
-	cnr.IterateAttributes(func(key, val string) {
+	for key, val := range cnr.Attributes() {
 		cmd.Printf("\t%s=%s\n", key, val)
-	})
+	}
 
 	cmd.Println("placement policy:")
 	if err := cnr.PlacementPolicy().WriteStringTo((*stringWriter)(cmd)); err != nil {

cmd/neofs-cli/modules/container/list.go

@@ -73,9 +73,9 @@ var listContainersCmd = &cobra.Command{
 
 				res, err := internalclient.GetContainer(ctx, prmGet)
 				if err == nil {
-					res.Container().IterateUserAttributes(func(key, val string) {
+					for key, val := range res.Container().UserAttributes() {
 						cmd.Printf("  %s: %s\n", key, val)
-					})
+					}
 				} else {
 					cmd.Printf("  failed to read attributes: %v\n", err)
 				}

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

@@ -60,9 +60,9 @@ var netInfoCmd = &cobra.Command{
 		cmd.Printf(format, "Maintenance mode allowed", netInfo.MaintenanceModeAllowed())
 
 		cmd.Println("NeoFS network configuration (other)")
-		netInfo.IterateRawNetworkParameters(func(name string, value []byte) {
+		for name, value := range netInfo.RawNetworkParameters() {
 			cmd.Printf(format, name, hex.EncodeToString(value))
-		})
+		}
 		return nil
 	},
 }

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

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

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(func(s string) bool { return !f(s) })
+	ni.NetworkEndpoints()(f)
 }
 
 func (c *cfg) addressNum() int {

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/nspcc-dev/neo-go v0.108.1
 	github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea
 	github.com/nspcc-dev/neofs-contract v0.21.0
-	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13
+	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250311165714-441b37a4bc03
 	github.com/nspcc-dev/tzhash v1.8.2
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/panjf2000/ants/v2 v2.9.0

go.sum

@@ -192,8 +192,8 @@ github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea h1:mK
 github.com/nspcc-dev/neofs-api-go/v2 v2.14.1-0.20240827150555-5ce597aa14ea/go.mod h1:YzhD4EZmC9Z/PNyd7ysC7WXgIgURc9uCG1UWDeV027Y=
 github.com/nspcc-dev/neofs-contract v0.21.0 h1:dJkrZr7C8ngMiShwdUl27nbLCGez1KD7W1l7RRXFoN8=
 github.com/nspcc-dev/neofs-contract v0.21.0/go.mod h1:TKR2DJiZCdzq9CPljI101c9S3uK5CsVK5WQrX4C+Y7A=
-github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13 h1:q1ne/4d10NuHSqs+fA5XVVBRJ9jSap4cjrsxYzNvYZA=
-github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13/go.mod h1:ycdDlPq8Wy+w5ePCmCfbHuEWQXbP7ZjBL5rj3QDiiM0=
+github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250311165714-441b37a4bc03 h1:hHAt6pUuhkmcCRXKKYa93FGwDMC13kN7sAq3mXR1YAw=
+github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.13.0.20250311165714-441b37a4bc03/go.mod h1:ycdDlPq8Wy+w5ePCmCfbHuEWQXbP7ZjBL5rj3QDiiM0=
 github.com/nspcc-dev/rfc6979 v0.2.3 h1:QNVykGZ3XjFwM/88rGfV3oj4rKNBy+nYI6jM7q19hDI=
 github.com/nspcc-dev/rfc6979 v0.2.3/go.mod h1:q3sCL1Ed7homjqYK8KmFSzEmm+7Ngyo7PePbZanhaDE=
 github.com/nspcc-dev/tzhash v1.8.2 h1:ebRCbPoEuoqrhC6sSZmrT/jI3h1SzCWakxxV6gp5QAg=

pkg/core/netmap/nodes.go

@@ -21,7 +21,7 @@ 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(func(s string) bool { return !f(s) })
+	(netmap.NodeInfo)(x).NetworkEndpoints()(f)
 	slices.Values((netmap.NodeInfo)(x).ExternalAddresses())(f)
 }
 

pkg/innerring/processors/container/process_container.go

@@ -78,20 +78,16 @@ func (cp *Processor) checkPutContainer(ctx *putContainerContext) error {
 		return fmt.Errorf("invalid binary container: %w", err)
 	}
 
-	var denyErr error
-	ctx.cnr.IterateAttributes(func(k, v string) {
-		if denyErr == nil && strings.HasPrefix(k, sysAttrPrefix) {
+	for k := range ctx.cnr.Attributes() {
+		if strings.HasPrefix(k, sysAttrPrefix) {
 			if _, ok := allowedSystemAttributes[k]; !ok {
-				denyErr = fmt.Errorf("system attribute %s is not allowed", k)
+				return fmt.Errorf("system attribute %s is not allowed", k)
 			}
 
 			if k == sysAttrChainMeta && !cp.metaEnabled {
-				denyErr = fmt.Errorf("chain meta data attribute is not allowed")
+				return fmt.Errorf("chain meta data attribute is not allowed")
 			}
 		}
-	})
-	if denyErr != nil {
-		return denyErr
 	}
 
 	err = cp.verifySignature(signatureVerificationData{

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

@@ -23,7 +23,7 @@ func (v Validator) Verify(nodeInfo netmap.NodeInfo) error {
 	var results []*client.ResEndpointInfo
 	var err error
 
-	for s := range func(f func(string) bool) { nodeInfo.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
+	for s := range nodeInfo.NetworkEndpoints() {
 		var res *client.ResEndpointInfo
 		var c *client.Client
 
@@ -75,8 +75,6 @@ func compareNodeInfos(niExp, niGot netmap.NodeInfo) error {
 		return nil
 	}
 
-	var err error
-
 	if exp, got := niExp.PublicKey(), niGot.PublicKey(); !bytes.Equal(exp, got) {
 		return fmt.Errorf("public key: got %x, expect %x", got, exp)
 	}
@@ -85,26 +83,23 @@ func compareNodeInfos(niExp, niGot netmap.NodeInfo) error {
 		return fmt.Errorf("attr number: got %d, expect %d", got, exp)
 	}
 
-	niExp.IterateAttributes(func(key, value string) {
+	for key, value := range niExp.Attributes() {
 		vGot := niGot.Attribute(key)
 		if vGot != value {
-			err = fmt.Errorf("non-equal %s attribute: got %s, expect %s", key, vGot, value)
+			return fmt.Errorf("non-equal %s attribute: got %s, expect %s", key, vGot, value)
 		}
-	})
-	if err != nil {
-		return err
 	}
 
 	if exp, got := niExp.NumberOfNetworkEndpoints(), niGot.NumberOfNetworkEndpoints(); exp != got {
 		return fmt.Errorf("address number: got %d, expect %d", got, exp)
 	}
 
 	expAddrM := make(map[string]struct{}, niExp.NumberOfAttributes())
-	for s := range func(f func(string) bool) { niExp.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
+	for s := range niExp.NetworkEndpoints() {
 		expAddrM[s] = struct{}{}
 	}
 
-	for s := range func(f func(string) bool) { niGot.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
+	for s := range niGot.NetworkEndpoints() {
 		if _, ok := expAddrM[s]; !ok {
 			return fmt.Errorf("got unexpected address: %s", s)
 		}

pkg/innerring/processors/netmap/nodevalidation/structure/calls.go

@@ -15,13 +15,12 @@ func (v *Validator) Verify(n netmap.NodeInfo) error {
 	}
 
 	attrM := make(map[string]struct{}, n.NumberOfAttributes())
-	n.IterateAttributes(func(key, _ string) {
+	for key := range n.Attributes() {
 		if _, alreadyHave := attrM[key]; alreadyHave {
-			err = fmt.Errorf("repeating node attribute: '%s'", key)
-			return
+			return fmt.Errorf("repeating node attribute: '%s'", key)
 		}
 		attrM[key] = struct{}{}
-	})
+	}
 
-	return err
+	return nil
 }

pkg/innerring/processors/netmap/nodevalidation/structure/calls_test.go

@@ -18,6 +18,6 @@ func TestValidator_Verify(t *testing.T) {
 			{"key1", "val3"},
 			{"key2", "val4"},
 		})
-		require.EqualError(t, v.Verify(n), "repeating node attribute: 'key2'")
+		require.EqualError(t, v.Verify(n), "repeating node attribute: 'key1'")
 	})
 }

pkg/morph/client/netmap/add_peer.go

@@ -28,10 +28,10 @@ func (c *Client) AddPeer(ni netmap.NodeInfo, pkey *keys.PublicKey) error {
 		Key:        pkey,
 		State:      netmaprpc.NodeStateOnline,
 	}
-	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.Addresses = slices.Collect(ni.NetworkEndpoints())
+	for k, v := range ni.Attributes() {
 		node.Attributes[k] = v
-	})
+	}
 
 	prm := client.InvokePrm{}
 	prm.SetMethod(addNodeMethod)

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(func(s string) bool { return !f(s) })
+	(netmap.NodeInfo)(x).NetworkEndpoints()(f)
 }
 
 func (x NodeEndpointsIterator) NumberOfAddresses() int {

pkg/services/reputation/common/managers.go

@@ -62,7 +62,7 @@ func (x nodeServer) PublicKey() []byte {
 }
 
 func (x nodeServer) IterateAddresses(f func(string) bool) {
-	(apiNetmap.NodeInfo)(x).IterateNetworkEndpoints(func(s string) bool { return !f(s) })
+	(apiNetmap.NodeInfo)(x).NetworkEndpoints()(f)
 }
 
 func (x nodeServer) NumberOfAddresses() int {

pkg/services/tree/redirect.go

@@ -22,7 +22,7 @@ func (s *Service) forEachNode(ctx context.Context, cntNodes []netmapSDK.NodeInfo
 
 	var called bool
 	for _, n := range cntNodes {
-		for endpoint := range func(f func(string) bool) { n.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
+		for endpoint := range n.NetworkEndpoints() {
 			c, err := s.cache.get(endpoint)
 			if err != nil {
 				continue

pkg/services/tree/replicator.go

@@ -62,7 +62,7 @@ func (s *Service) replicationWorker(ctx context.Context) {
 			var lastErr error
 			var lastAddr string
 
-			for addr := range func(f func(string) bool) { task.n.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
+			for addr := range task.n.NetworkEndpoints() {
 				lastAddr = addr
 
 				c, err := s.cache.get(addr)

pkg/services/tree/sync.go

@@ -147,7 +147,7 @@ func (s *Service) synchronizeTree(ctx context.Context, d pilorama.CIDDescriptor,
 	for _, n := range nodes {
 		height := from
 	loop:
-		for addr := range func(f func(string) bool) { n.IterateNetworkEndpoints(func(s string) bool { return !f(s) }) } {
+		for addr := range n.NetworkEndpoints() {
 			var a network.Address
 			if err := a.FromString(addr); err != nil {
 				continue

pkg/util/attributes/parser_test.go

@@ -23,12 +23,12 @@ func testAttributeMap(t *testing.T, mSrc, mExp map[string]string) {
 		mExp = mSrc
 	}
 
-	node.IterateAttributes(func(key, value string) {
+	for key, value := range node.Attributes() {
 		v, ok := mExp[key]
 		require.True(t, ok)
 		require.Equal(t, value, v)
 		delete(mExp, key)
-	})
+	}
 
 	require.Empty(t, mExp)
 }