From 088df0e2a9ae02fc7b8c7bc720d3092e5efe4fb2 Mon Sep 17 00:00:00 2001
From: Leonard Lyubich <leonard@nspcc.ru>
Date: Wed, 11 May 2022 17:58:52 +0300
Subject: [PATCH] [#1369] version: Upgrade SDK package

Signed-off-by: Leonard Lyubich <leonard@nspcc.ru>
---
 cmd/neofs-cli/modules/container.go            |   9 +++---
 cmd/neofs-cli/modules/util.go                 |   7 +++-
 cmd/neofs-node/config.go                      |   2 +-
 go.mod                                        |   2 +-
 go.sum                                        | Bin 98064 -> 98064 bytes
 pkg/core/container/fmt_test.go                |   3 +-
 pkg/core/version/version_test.go              |   2 +-
 .../engine/engine_test.go                     |   8 ++---
 pkg/local_object_storage/metabase/db_test.go  |   8 ++---
 pkg/local_object_storage/shard/shard_test.go  |   8 ++---
 pkg/services/netmap/executor.go               |  30 ++++++++++++------
 .../object_manager/transformer/fmt.go         |   3 +-
 pkg/services/util/response/service.go         |  12 ++++---
 13 files changed, 58 insertions(+), 36 deletions(-)

diff --git a/cmd/neofs-cli/modules/container.go b/cmd/neofs-cli/modules/container.go
index 90c1e932..fd58ac61 100644
--- a/cmd/neofs-cli/modules/container.go
+++ b/cmd/neofs-cli/modules/container.go
@@ -171,8 +171,10 @@ It will be stored in sidechain when inner ring will accepts it.`,
 			idOwner = owner.NewIDFromPublicKey(&key.PublicKey)
 		}
 
+		ver := versionSDK.Current()
+
 		cnr := container.New()
-		cnr.SetVersion(versionSDK.Current())
+		cnr.SetVersion(&ver)
 		cnr.SetPlacementPolicy(placementPolicy)
 		cnr.SetBasicACL(basicACL)
 		cnr.SetAttributes(attributes)
@@ -807,9 +809,8 @@ func parseEACL(eaclPath string) (*eacl.Table, error) {
 }
 
 func validateAndFixEACLVersion(table *eacl.Table) {
-	v := table.Version()
-	if !version.IsValid(v) {
-		table.SetVersion(*versionSDK.Current())
+	if !version.IsValid(table.Version()) {
+		table.SetVersion(versionSDK.Current())
 	}
 }
 
diff --git a/cmd/neofs-cli/modules/util.go b/cmd/neofs-cli/modules/util.go
index 0e83f2a9..c9c730ef 100644
--- a/cmd/neofs-cli/modules/util.go
+++ b/cmd/neofs-cli/modules/util.go
@@ -10,6 +10,7 @@ import (
 	"strconv"
 	"time"
 
+	"github.com/nspcc-dev/neofs-api-go/v2/refs"
 	"github.com/nspcc-dev/neofs-node/pkg/util/keyer"
 	locodedb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db"
 	airportsdb "github.com/nspcc-dev/neofs-node/pkg/util/locode/db/airports"
@@ -427,7 +428,11 @@ func completeBearerToken(btok *token.BearerToken) error {
 	if v2 := btok.ToV2(); v2 != nil {
 		// set eACL table version, because it usually omitted
 		table := v2.GetBody().GetEACL()
-		table.SetVersion(version.Current().ToV2())
+
+		var ver refs.Version
+		version.Current().WriteToV2(&ver)
+
+		table.SetVersion(&ver)
 	} else {
 		return errors.New("unsupported bearer token version")
 	}
diff --git a/cmd/neofs-node/config.go b/cmd/neofs-node/config.go
index 6c2bb5ec..904914ff 100644
--- a/cmd/neofs-node/config.go
+++ b/cmd/neofs-node/config.go
@@ -79,7 +79,7 @@ type cfg struct {
 
 	ownerIDFromKey *owner.ID // owner ID calculated from key
 
-	apiVersion *version.Version
+	apiVersion version.Version
 
 	cfgGRPC cfgGRPC
 
diff --git a/go.mod b/go.mod
index cb7624f8..a27e6b32 100644
--- a/go.mod
+++ b/go.mod
@@ -19,7 +19,7 @@ require (
 	github.com/nspcc-dev/neo-go/pkg/interop v0.0.0-20220321144137-d5a9af5860af // indirect
 	github.com/nspcc-dev/neofs-api-go/v2 v2.12.1
 	github.com/nspcc-dev/neofs-contract v0.14.2
-	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.3.0.20220412151250-3e75660802ae
+	github.com/nspcc-dev/neofs-sdk-go v1.0.0-rc.3.0.20220413072812-c961aea14446
 	github.com/nspcc-dev/tzhash v1.5.2
 	github.com/panjf2000/ants/v2 v2.4.0
 	github.com/paulmach/orb v0.2.2
diff --git a/go.sum b/go.sum
index 4c848684db757452c51a63438e488ff85bbe80d4..9f2816c52b9e3baec65b30867f6df5d2803ef08c 100644
GIT binary patch
delta 115
zcmbR6k9ER7)(x4nosA95jVug}bdxR33=>lm4NXi;%oH*Vt(+{9LYxYt%3Qp>y;F;|
z!;PKwlM{=~gB*j>9ZSo6qx>q2%?zuYBLZBqCvTi6KG}a3-{jEQA|lw#+x&C3_+tQr
CP$kO%

delta 115
zcmbR6k9ER7)(x4nosA4l4UJ3<bd6KZP0h><EDVeiQx!4{ttyi9UCUj|qasSpElh$^
z4FdvPjZMpP4INFii$k5m(tS(a-3kK(^85?~CvTi6KG}a3-{jEQA|lw#+x&C3_+tQb
C;w5PS

diff --git a/pkg/core/container/fmt_test.go b/pkg/core/container/fmt_test.go
index 4c65b0f1..e8b4ff48 100644
--- a/pkg/core/container/fmt_test.go
+++ b/pkg/core/container/fmt_test.go
@@ -22,7 +22,8 @@ func TestCheckFormat(t *testing.T) {
 
 	require.Error(t, CheckFormat(c))
 
-	c.SetVersion(version.Current())
+	ver := version.Current()
+	c.SetVersion(&ver)
 
 	require.Error(t, CheckFormat(c))
 
diff --git a/pkg/core/version/version_test.go b/pkg/core/version/version_test.go
index d0ba68d0..8c1b11a0 100644
--- a/pkg/core/version/version_test.go
+++ b/pkg/core/version/version_test.go
@@ -9,7 +9,7 @@ import (
 )
 
 func TestIsValid(t *testing.T) {
-	require.True(t, version.IsValid(*versionSDK.Current()))
+	require.True(t, version.IsValid(versionSDK.Current()))
 
 	var v versionSDK.Version
 
diff --git a/pkg/local_object_storage/engine/engine_test.go b/pkg/local_object_storage/engine/engine_test.go
index 7a0b22f9..04b3faca 100644
--- a/pkg/local_object_storage/engine/engine_test.go
+++ b/pkg/local_object_storage/engine/engine_test.go
@@ -148,9 +148,9 @@ func testOID() *oidSDK.ID {
 }
 
 func generateObjectWithCID(t testing.TB, cid *cid.ID) *object.Object {
-	version := version.New()
-	version.SetMajor(2)
-	version.SetMinor(1)
+	var ver version.Version
+	ver.SetMajor(2)
+	ver.SetMinor(1)
 
 	csum := new(checksum.Checksum)
 	csum.SetSHA256(sha256.Sum256(owner.PublicKeyToIDBytes(&test.DecodeKey(-1).PublicKey)))
@@ -162,7 +162,7 @@ func generateObjectWithCID(t testing.TB, cid *cid.ID) *object.Object {
 	obj.SetID(testOID())
 	obj.SetOwnerID(ownertest.ID())
 	obj.SetContainerID(cid)
-	obj.SetVersion(version)
+	obj.SetVersion(&ver)
 	obj.SetPayloadChecksum(csum)
 	obj.SetPayloadHomomorphicHash(csumTZ)
 	obj.SetPayload([]byte{1, 2, 3, 4, 5})
diff --git a/pkg/local_object_storage/metabase/db_test.go b/pkg/local_object_storage/metabase/db_test.go
index 18273308..a4f15344 100644
--- a/pkg/local_object_storage/metabase/db_test.go
+++ b/pkg/local_object_storage/metabase/db_test.go
@@ -68,9 +68,9 @@ func generateObject(t testing.TB) *object.Object {
 }
 
 func generateObjectWithCID(t testing.TB, cid *cid.ID) *object.Object {
-	version := version.New()
-	version.SetMajor(2)
-	version.SetMinor(1)
+	var ver version.Version
+	ver.SetMajor(2)
+	ver.SetMinor(1)
 
 	csum := new(checksum.Checksum)
 	csum.SetSHA256(sha256.Sum256(owner.PublicKeyToIDBytes(&test.DecodeKey(-1).PublicKey)))
@@ -82,7 +82,7 @@ func generateObjectWithCID(t testing.TB, cid *cid.ID) *object.Object {
 	obj.SetID(testOID())
 	obj.SetOwnerID(ownertest.ID())
 	obj.SetContainerID(cid)
-	obj.SetVersion(version)
+	obj.SetVersion(&ver)
 	obj.SetPayloadChecksum(csum)
 	obj.SetPayloadHomomorphicHash(csumTZ)
 	obj.SetPayload([]byte{1, 2, 3, 4, 5})
diff --git a/pkg/local_object_storage/shard/shard_test.go b/pkg/local_object_storage/shard/shard_test.go
index 634e89da..457aef98 100644
--- a/pkg/local_object_storage/shard/shard_test.go
+++ b/pkg/local_object_storage/shard/shard_test.go
@@ -82,9 +82,9 @@ func generateObjectWithCID(t *testing.T, cid *cid.ID) *object.Object {
 }
 
 func generateObjectWithPayload(cid *cid.ID, data []byte) *object.Object {
-	version := version.New()
-	version.SetMajor(2)
-	version.SetMinor(1)
+	var ver version.Version
+	ver.SetMajor(2)
+	ver.SetMinor(1)
 
 	csum := new(checksum.Checksum)
 	csum.SetSHA256(sha256.Sum256(data))
@@ -96,7 +96,7 @@ func generateObjectWithPayload(cid *cid.ID, data []byte) *object.Object {
 	obj.SetID(generateOID())
 	obj.SetOwnerID(ownertest.ID())
 	obj.SetContainerID(cid)
-	obj.SetVersion(version)
+	obj.SetVersion(&ver)
 	obj.SetPayload(data)
 	obj.SetPayloadChecksum(csum)
 	obj.SetPayloadHomomorphicHash(csumTZ)
diff --git a/pkg/services/netmap/executor.go b/pkg/services/netmap/executor.go
index f957bb9a..5a2ebca5 100644
--- a/pkg/services/netmap/executor.go
+++ b/pkg/services/netmap/executor.go
@@ -2,15 +2,18 @@ package netmap
 
 import (
 	"context"
+	"errors"
 
 	"github.com/nspcc-dev/neofs-api-go/v2/netmap"
 	"github.com/nspcc-dev/neofs-api-go/v2/refs"
-	"github.com/nspcc-dev/neofs-sdk-go/version"
+	"github.com/nspcc-dev/neofs-node/pkg/core/version"
+	versionsdk "github.com/nspcc-dev/neofs-sdk-go/version"
 )
 
 type executorSvc struct {
-	version *version.Version
-	state   NodeState
+	version refs.Version
+
+	state NodeState
 
 	netInfo NetworkInfo
 }
@@ -32,23 +35,32 @@ type NetworkInfo interface {
 	Dump(*refs.Version) (*netmap.NetworkInfo, error)
 }
 
-func NewExecutionService(s NodeState, v *version.Version, netInfo NetworkInfo) Server {
-	if s == nil || v == nil || netInfo == nil {
+func NewExecutionService(s NodeState, v versionsdk.Version, netInfo NetworkInfo) Server {
+	if s == nil || netInfo == nil || !version.IsValid(v) {
 		// this should never happen, otherwise it programmers bug
 		panic("can't create netmap execution service")
 	}
 
-	return &executorSvc{
-		version: v,
+	res := &executorSvc{
 		state:   s,
 		netInfo: netInfo,
 	}
+
+	v.WriteToV2(&res.version)
+
+	return res
 }
 
 func (s *executorSvc) LocalNodeInfo(
 	_ context.Context,
 	req *netmap.LocalNodeInfoRequest) (*netmap.LocalNodeInfoResponse, error) {
-	ver := version.NewFromV2(req.GetMetaHeader().GetVersion())
+	verV2 := req.GetMetaHeader().GetVersion()
+	if verV2 == nil {
+		return nil, errors.New("missing version")
+	}
+
+	var ver versionsdk.Version
+	ver.ReadFromV2(*verV2)
 
 	ni, err := s.state.LocalNodeInfo()
 	if err != nil {
@@ -69,7 +81,7 @@ func (s *executorSvc) LocalNodeInfo(
 	}
 
 	body := new(netmap.LocalNodeInfoResponseBody)
-	body.SetVersion(s.version.ToV2())
+	body.SetVersion(&s.version)
 	body.SetNodeInfo(ni)
 
 	resp := new(netmap.LocalNodeInfoResponse)
diff --git a/pkg/services/object_manager/transformer/fmt.go b/pkg/services/object_manager/transformer/fmt.go
index b6f98a25..3195c447 100644
--- a/pkg/services/object_manager/transformer/fmt.go
+++ b/pkg/services/object_manager/transformer/fmt.go
@@ -63,8 +63,9 @@ func (f *formatter) Write(p []byte) (n int, err error) {
 
 func (f *formatter) Close() (*AccessIdentifiers, error) {
 	curEpoch := f.prm.NetworkState.CurrentEpoch()
+	ver := version.Current()
 
-	f.obj.SetVersion(version.Current())
+	f.obj.SetVersion(&ver)
 	f.obj.SetPayloadSize(f.sz)
 	f.obj.SetSessionToken(f.prm.SessionToken)
 	f.obj.SetCreationEpoch(curEpoch)
diff --git a/pkg/services/util/response/service.go b/pkg/services/util/response/service.go
index 77502570..6e7df925 100644
--- a/pkg/services/util/response/service.go
+++ b/pkg/services/util/response/service.go
@@ -18,15 +18,17 @@ type Service struct {
 type Option func(*cfg)
 
 type cfg struct {
-	version *refs.Version
+	version refs.Version
 
 	state netmap.State
 }
 
 func defaultCfg() *cfg {
-	return &cfg{
-		version: version.Current().ToV2(),
-	}
+	var c cfg
+
+	version.Current().WriteToV2(&c.version)
+
+	return &c
 }
 
 // NewService creates, initializes and returns Service instance.
@@ -44,7 +46,7 @@ func NewService(opts ...Option) *Service {
 
 func setMeta(resp util.ResponseMessage, cfg *cfg) {
 	meta := new(session.ResponseMetaHeader)
-	meta.SetVersion(cfg.version)
+	meta.SetVersion(&cfg.version)
 	meta.SetTTL(1) // FIXME: #1160 TTL must be calculated
 	meta.SetEpoch(cfg.state.CurrentEpoch())