go.mod: Update to the latest SDK

Also, use locode getters instead of the hardcoded ones.

Signed-off-by: Pavel Karpy <[email protected]>

cmd/neofs-node/attributes.go

@@ -6,7 +6,6 @@ import (
 	"github.com/nspcc-dev/locode-db/pkg/locodedb"
 	nodeconfig "github.com/nspcc-dev/neofs-node/cmd/neofs-node/config/node"
 	"github.com/nspcc-dev/neofs-node/pkg/util/attributes"
-	"github.com/nspcc-dev/neofs-sdk-go/netmap"
 )
 
 func parseAttributes(c *cfg) {
@@ -32,28 +31,27 @@ func parseAttributes(c *cfg) {
 	countryCode := locAttr[:locodedb.CountryCodeLen]
 	n := &c.cfgNodeInfo.localInfo
 
-	setLocodeAttr(n, "CountryCode", countryCode)
-	setLocodeAttr(n, "Country", record.Country)
-	setLocodeAttr(n, "Location", record.Location)
-	setLocodeAttr(n, "Continent", record.Cont.String())
-	if subDivCode := record.SubDivCode; subDivCode != "" {
-		setLocodeAttr(n, "SubDivCode", subDivCode)
+	if countryCode != "" && n.CountryCode() == "" {
+		n.SetCountryCode(countryCode)
 	}
-	if subDivName := record.SubDivName; subDivName != "" {
-		setLocodeAttr(n, "SubDiv", subDivName)
+	if record.Country != "" && n.CountryName() == "" {
+		n.SetCountryName(record.Country)
+	}
+	if record.Location != "" && n.LocationName() == "" {
+		n.SetLocationName(record.Location)
+	}
+	if record.Cont.String() != "" && n.ContinentName() == "" {
+		n.SetContinentName(record.Cont.String())
+	}
+	if record.SubDivCode != "" && n.SubdivisionCode() == "" {
+		n.SetSubdivisionCode(record.SubDivCode)
+	}
+	if record.SubDivName != "" && n.SubdivisionName() == "" {
+		n.SetSubdivisionName(record.SubDivName)
 	}
 }
 
 func getRecord(lc string) (locodedb.Record, error) {
 	rec, err := locodedb.Get(lc)
 	return rec, err
 }
-
-func setLocodeAttr(ni *netmap.NodeInfo, key, value string) {
-	valHave := ni.Attribute(key)
-	if valHave != "" {
-		return
-	}
-
-	ni.SetAttribute(key, value)
-}

go.mod

@@ -19,7 +19,7 @@ require (
 	github.com/nspcc-dev/neo-go v0.103.1
 	github.com/nspcc-dev/neofs-api-go/v2 v2.14.0
 	github.com/nspcc-dev/neofs-contract v0.18.0
-	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.11.0.20231113180740-3b24af0410c0
+	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.11.0.20231121125354-d72d76ccb0ba
 	github.com/nspcc-dev/tzhash v1.7.1
 	github.com/olekukonko/tablewriter v0.0.5
 	github.com/panjf2000/ants/v2 v2.8.2

go.sum

@@ -257,8 +257,8 @@ github.com/nspcc-dev/neofs-contract v0.18.0 h1:9g50b16s0mQFFskG93yRSWh4KL7yYOW+x
 github.com/nspcc-dev/neofs-contract v0.18.0/go.mod h1:UQr1rUjg0eibLwJd6vfsJJEUBnmRysCg8XQd1HYiS2w=
 github.com/nspcc-dev/neofs-crypto v0.4.0 h1:5LlrUAM5O0k1+sH/sktBtrgfWtq1pgpDs09fZo+KYi4=
 github.com/nspcc-dev/neofs-crypto v0.4.0/go.mod h1:6XJ8kbXgOfevbI2WMruOtI+qUJXNwSGM/E9eClXxPHs=
-github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.11.0.20231113180740-3b24af0410c0 h1:y24pnVwDLaBAyh8fFcptAvtVfVDay/5jONgtO+cWZfI=
-github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.11.0.20231113180740-3b24af0410c0/go.mod h1:6ok9MU40TP0xAVfzisIg4KP+qhP670hra0mKpIGlWT8=
+github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.11.0.20231121125354-d72d76ccb0ba h1:dQDBBqmT2rlJGgkeeF3UurB3VgG7buMHDHcz5UQ3bro=
+github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.11.0.20231121125354-d72d76ccb0ba/go.mod h1:2PKUuH7kQaAmQ/USBgmiD/k08ssnSvayor6JAFhrC1c=
 github.com/nspcc-dev/rfc6979 v0.2.0 h1:3e1WNxrN60/6N0DW7+UYisLeZJyfqZTNOjeV/toYvOE=
 github.com/nspcc-dev/rfc6979 v0.2.0/go.mod h1:exhIh1PdpDC5vQmyEsGvc4YDM/lyQp/452QxGq/UEso=
 github.com/nspcc-dev/tzhash v1.7.1 h1:6zmexLqdTF/ssbUAh7XJS7RxgKWaw28kdNpE/4UFdEU=

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

@@ -25,39 +25,28 @@ func (v *Validator) Verify(n netmap.NodeInfo) error {
 		return fmt.Errorf("could not get locode record from DB: %w", err)
 	}
 
-	err = checkAttribute(n, "CountryCode", lAttr[:locodedb.CountryCodeLen])
-	if err != nil {
-		return err
+	if want, got := lAttr[:locodedb.CountryCodeLen], n.CountryCode(); want != got {
+		return wrongLocodeAttrErr("country code", want, got)
 	}
-	err = checkAttribute(n, "Country", record.Country)
-	if err != nil {
-		return err
+	if want, got := record.Country, n.CountryName(); want != got {
+		return wrongLocodeAttrErr("country name", want, got)
 	}
-	err = checkAttribute(n, "Location", record.Location)
-	if err != nil {
-		return err
+	if want, got := record.Location, n.LocationName(); want != got {
+		return wrongLocodeAttrErr("location", want, got)
 	}
-	err = checkAttribute(n, "Continent", record.Cont.String())
-	if err != nil {
-		return err
+	if want, got := record.Cont.String(), n.ContinentName(); want != got {
+		return wrongLocodeAttrErr("continent", want, got)
 	}
-	err = checkAttribute(n, "SubDivCode", record.SubDivCode)
-	if err != nil {
-		return err
+	if want, got := record.SubDivCode, n.SubdivisionCode(); want != got {
+		return wrongLocodeAttrErr("subdivision code", want, got)
 	}
-	err = checkAttribute(n, "SubDiv", record.SubDivName)
-	if err != nil {
-		return err
+	if want, got := record.SubDivName, n.SubdivisionName(); want != got {
+		return wrongLocodeAttrErr("subdivision name", want, got)
 	}
 
 	return nil
 }
 
-func checkAttribute(n netmap.NodeInfo, key, expectedVal string) error {
-	val := n.Attribute(key)
-	if val != expectedVal {
-		return fmt.Errorf("wrong '%q' attribute value: want '%q', got '%q'", key, expectedVal, val)
-	}
-
-	return nil
+func wrongLocodeAttrErr(attrName, want, got string) error {
+	return fmt.Errorf("wrong %q attribute value: want '%q', got '%q'", attrName, want, got)
 }