container/container.go

@@ -356,8 +356,7 @@ func (x Container) IterateUserAttributes(f func(key, val string)) {
 	attrs := x.v2.GetAttributes()
 	for _, attr := range attrs {
 		key := attr.GetKey()
-		if !strings.HasPrefix(key, container.SysAttributePrefix) &&
+		if !strings.HasPrefix(key, container.SysAttributePrefix) {
-			!strings.HasPrefix(key, container.SysAttributePrefixNeoFS) {
 			f(key, attr.GetValue())
 		}
 	}
@@ -417,8 +416,7 @@ func DisableHomomorphicHashing(cnr *Container) {
 //
 // Zero Container has enabled hashing.
 func IsHomomorphicHashingDisabled(cnr Container) bool {
-	return cnr.Attribute(container.SysAttributeHomomorphicHashing) == attributeHomoHashEnabled ||
+	return cnr.Attribute(container.SysAttributeHomomorphicHashing) == attributeHomoHashEnabled
-		cnr.Attribute(container.SysAttributeHomomorphicHashingNeoFS) == attributeHomoHashEnabled
 }
 
 // Domain represents information about container domain registered in the NNS
@@ -467,9 +465,6 @@ func ReadDomain(cnr Container) (res Domain) {
 	if name := cnr.Attribute(container.SysAttributeName); name != "" {
 		res.SetName(name)
 		res.SetZone(cnr.Attribute(container.SysAttributeZone))
-	} else if name = cnr.Attribute(container.SysAttributeNameNeoFS); name != "" {
-		res.SetName(name)
-		res.SetZone(cnr.Attribute(container.SysAttributeZoneNeoFS))
 	}
 
 	return

container/container_test.go

@@ -150,7 +150,7 @@ func assertContainsAttribute(t *testing.T, m v2container.Container, key, val str
 }
 
 func TestContainer_Attribute(t *testing.T) {
-	const attrKey1, attrKey2 = v2container.SysAttributePrefix + "key1", v2container.SysAttributePrefixNeoFS + "key2"
+	const attrKey1, attrKey2 = v2container.SysAttributePrefix + "key1", v2container.SysAttributePrefix + "key2"
 	const attrVal1, attrVal2 = "val1", "val2"
 
 	val := containertest.Container()

object/object.go

@@ -324,10 +324,7 @@ func (o *Object) UserAttributes() []Attribute {
 	res := make([]Attribute, 0, len(attrs))
 
 	for _, attr := range attrs {
-		key := attr.GetKey()
+		if !strings.HasPrefix(attr.GetKey(), container.SysAttributePrefix) {
-
-		if !strings.HasPrefix(key, container.SysAttributePrefix) &&
-			!strings.HasPrefix(key, container.SysAttributePrefixNeoFS) {
 			res = append(res, *NewAttributeFromV2(&attr))
 		}
 	}