diff --git a/pkg/util/locode/column/country.go b/pkg/util/locode/column/country.go index 1abedca8..d407495b 100644 --- a/pkg/util/locode/column/country.go +++ b/pkg/util/locode/column/country.go @@ -1,6 +1,8 @@ package locodecolumn import ( + "fmt" + "github.com/nspcc-dev/neofs-node/pkg/util/locode" ) @@ -16,8 +18,11 @@ func (cc *CountryCode) Symbols() [countryCodeLen]uint8 { // CountryCodeFromString parses a string and returns the country code. func CountryCodeFromString(s string) (*CountryCode, error) { - if len(s) != countryCodeLen { - return nil, locode.ErrInvalidString + if l := len(s); l != countryCodeLen { + return nil, fmt.Errorf("incorrect country code length: expect: %d, got: %d", + countryCodeLen, + l, + ) } for i := range s { diff --git a/pkg/util/locode/column/location.go b/pkg/util/locode/column/location.go index 5c1225eb..c9b38d49 100644 --- a/pkg/util/locode/column/location.go +++ b/pkg/util/locode/column/location.go @@ -1,6 +1,8 @@ package locodecolumn import ( + "fmt" + "github.com/nspcc-dev/neofs-node/pkg/util/locode" ) @@ -16,8 +18,11 @@ func (lc *LocationCode) Symbols() [locationCodeLen]uint8 { // LocationCodeFromString parses a string and returns the location code. func LocationCodeFromString(s string) (*LocationCode, error) { - if len(s) != locationCodeLen { - return nil, locode.ErrInvalidString + if l := len(s); l != locationCodeLen { + return nil, fmt.Errorf("incorrect location code length: expect: %d, got: %d", + locationCodeLen, + l, + ) } for i := range s { diff --git a/pkg/util/locode/record.go b/pkg/util/locode/record.go index b9922b74..7db746ff 100644 --- a/pkg/util/locode/record.go +++ b/pkg/util/locode/record.go @@ -2,6 +2,7 @@ package locode import ( "errors" + "fmt" "strings" ) @@ -51,11 +52,18 @@ var ErrInvalidString = errors.New("invalid string format in UN/Locode") // // If string has incorrect format, ErrInvalidString returns. func FromString(s string) (*LOCODE, error) { - const locationSeparator = " " + const ( + locationSeparator = " " + locodePartsNumber = 2 + ) words := strings.Split(s, locationSeparator) - if ln := len(words); ln != 1 && ln != 2 { - return nil, ErrInvalidString + if ln := len(words); ln != locodePartsNumber { + return nil, fmt.Errorf( + "incorrect locode: it must consist of %d codes separated with a witespase, got: %d", + locodePartsNumber, + ln, + ) } l := new(LOCODE)