diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d09b11c..27d0e939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -111,16 +111,16 @@ associated with owner id Initial public release -[0.2.0]: https://github.com/nspcc-dev/neofs-proto/compare/v0.1.0...v0.2.0 -[0.2.1]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.0...v0.2.1 -[0.2.2]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.1...v0.2.2 -[0.2.3]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.2...v0.2.3 -[0.2.4]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.3...v0.2.4 -[0.2.5]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.4...v0.2.5 -[0.2.6]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.5...v0.2.6 -[0.2.7]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.6...v0.2.7 -[0.2.8]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.7...v0.2.8 -[0.2.9]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.8...v0.2.9 -[0.2.10]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.9...v0.2.10 -[0.2.11]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.10...v0.2.11 -[0.2.12]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.11...v0.2.12 +[0.2.0]: https://github.com/nspcc-dev/neofs-api/compare/v0.1.0...v0.2.0 +[0.2.1]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.0...v0.2.1 +[0.2.2]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.1...v0.2.2 +[0.2.3]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.2...v0.2.3 +[0.2.4]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.3...v0.2.4 +[0.2.5]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.4...v0.2.5 +[0.2.6]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.5...v0.2.6 +[0.2.7]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.6...v0.2.7 +[0.2.8]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.7...v0.2.8 +[0.2.9]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.8...v0.2.9 +[0.2.10]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.9...v0.2.10 +[0.2.11]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.10...v0.2.11 +[0.2.12]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.11...v0.2.12 diff --git a/accounting/service.go b/accounting/service.go index ac1ceb50..5f8f889a 100644 --- a/accounting/service.go +++ b/accounting/service.go @@ -1,9 +1,9 @@ package accounting import ( - "github.com/nspcc-dev/neofs-proto/decimal" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/decimal" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" ) type ( diff --git a/accounting/service.pb.go b/accounting/service.pb.go index 7a8a0869..4e1127bf 100644 Binary files a/accounting/service.pb.go and b/accounting/service.pb.go differ diff --git a/accounting/service.proto b/accounting/service.proto index f2696c44..c3201068 100644 --- a/accounting/service.proto +++ b/accounting/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package accounting; -option go_package = "github.com/nspcc-dev/neofs-proto/accounting"; +option go_package = "github.com/nspcc-dev/neofs-api/accounting"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/accounting/types.go b/accounting/types.go index 9c76fc75..af883a29 100644 --- a/accounting/types.go +++ b/accounting/types.go @@ -7,11 +7,11 @@ import ( "reflect" "github.com/mr-tron/base58" + "github.com/nspcc-dev/neofs-api/chain" + "github.com/nspcc-dev/neofs-api/decimal" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/chain" - "github.com/nspcc-dev/neofs-proto/decimal" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/pkg/errors" ) diff --git a/accounting/types.pb.go b/accounting/types.pb.go index dd020ec9..f4203553 100644 Binary files a/accounting/types.pb.go and b/accounting/types.pb.go differ diff --git a/accounting/types.proto b/accounting/types.proto index ac512b91..1af83c12 100644 --- a/accounting/types.proto +++ b/accounting/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package accounting; -option go_package = "github.com/nspcc-dev/neofs-proto/accounting"; +option go_package = "github.com/nspcc-dev/neofs-api/accounting"; import "decimal/decimal.proto"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; @@ -85,7 +85,7 @@ message Tx { message Settlement { message Receiver { - // To is the address of funds recipient + // To is the address of funds recipient string To = 1; // Amount is the amount of funds that will be sent decimal.Decimal Amount = 2; diff --git a/accounting/types_test.go b/accounting/types_test.go index c78e5b40..424993a8 100644 --- a/accounting/types_test.go +++ b/accounting/types_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/mr-tron/base58" + "github.com/nspcc-dev/neofs-api/chain" + "github.com/nspcc-dev/neofs-api/decimal" + "github.com/nspcc-dev/neofs-api/refs" "github.com/nspcc-dev/neofs-crypto/test" - "github.com/nspcc-dev/neofs-proto/chain" - "github.com/nspcc-dev/neofs-proto/decimal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/stretchr/testify/require" ) @@ -34,7 +34,7 @@ func TestCheque(t *testing.T) { }) t.Run("marshal/unmarshal", func(t *testing.T) { - var b2 = new(Cheque) + b2 := new(Cheque) key1 := test.DecodeKey(0) key2 := test.DecodeKey(1) @@ -67,7 +67,7 @@ func TestCheque(t *testing.T) { }) t.Run("example from SC", func(t *testing.T) { - var pathToCheque = "fixtures/cheque_data" + pathToCheque := "fixtures/cheque_data" expect, err := ioutil.ReadFile(pathToCheque) require.NoError(t, err) diff --git a/accounting/withdraw.go b/accounting/withdraw.go index 11c56081..735fb85b 100644 --- a/accounting/withdraw.go +++ b/accounting/withdraw.go @@ -3,7 +3,7 @@ package accounting import ( "encoding/binary" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/refs" ) type ( diff --git a/accounting/withdraw.pb.go b/accounting/withdraw.pb.go index d80b01cf..0e299e72 100644 Binary files a/accounting/withdraw.pb.go and b/accounting/withdraw.pb.go differ diff --git a/accounting/withdraw.proto b/accounting/withdraw.proto index a44e47a8..85000b94 100644 --- a/accounting/withdraw.proto +++ b/accounting/withdraw.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package accounting; -option go_package = "github.com/nspcc-dev/neofs-proto/accounting"; +option go_package = "github.com/nspcc-dev/neofs-api/accounting"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/bootstrap/service.go b/bootstrap/service.go index e67ea6df..e0687283 100644 --- a/bootstrap/service.go +++ b/bootstrap/service.go @@ -1,7 +1,7 @@ package bootstrap import ( - "github.com/nspcc-dev/neofs-proto/service" + "github.com/nspcc-dev/neofs-api/service" ) // NodeType type alias. diff --git a/bootstrap/service.pb.go b/bootstrap/service.pb.go index 7165399a..163ff9b1 100644 Binary files a/bootstrap/service.pb.go and b/bootstrap/service.pb.go differ diff --git a/bootstrap/service.proto b/bootstrap/service.proto index f0bf755d..fa0248c4 100644 --- a/bootstrap/service.proto +++ b/bootstrap/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package bootstrap; -option go_package = "github.com/nspcc-dev/neofs-proto/bootstrap"; +option go_package = "github.com/nspcc-dev/neofs-api/bootstrap"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/bootstrap/types.go b/bootstrap/types.go index 6fcf0ed2..6c21b732 100644 --- a/bootstrap/types.go +++ b/bootstrap/types.go @@ -7,7 +7,7 @@ import ( "strings" "github.com/golang/protobuf/proto" - "github.com/nspcc-dev/neofs-proto/object" + "github.com/nspcc-dev/neofs-api/object" ) type ( diff --git a/bootstrap/types.pb.go b/bootstrap/types.pb.go index f2799198..83af13d5 100644 Binary files a/bootstrap/types.pb.go and b/bootstrap/types.pb.go differ diff --git a/bootstrap/types.proto b/bootstrap/types.proto index 5a566dae..02da9ad4 100644 --- a/bootstrap/types.proto +++ b/bootstrap/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package bootstrap; -option go_package = "github.com/nspcc-dev/neofs-proto/bootstrap"; +option go_package = "github.com/nspcc-dev/neofs-api/bootstrap"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/chain/address.go b/chain/address.go index e760d698..bdc8a657 100644 --- a/chain/address.go +++ b/chain/address.go @@ -7,8 +7,8 @@ import ( "encoding/hex" "github.com/mr-tron/base58" + "github.com/nspcc-dev/neofs-api/internal" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/internal" "github.com/pkg/errors" "golang.org/x/crypto/ripemd160" ) diff --git a/container/service.go b/container/service.go index 24727ee7..01d88fa8 100644 --- a/container/service.go +++ b/container/service.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" "github.com/pkg/errors" ) diff --git a/container/service.pb.go b/container/service.pb.go index cac8764c..e202a7cd 100644 Binary files a/container/service.pb.go and b/container/service.pb.go differ diff --git a/container/service.proto b/container/service.proto index 9bd02c94..4576197a 100644 --- a/container/service.proto +++ b/container/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package container; -option go_package = "github.com/nspcc-dev/neofs-proto/container"; +option go_package = "github.com/nspcc-dev/neofs-api/container"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/container/types.go b/container/types.go index d5d5a77d..b7189074 100644 --- a/container/types.go +++ b/container/types.go @@ -4,9 +4,9 @@ import ( "bytes" "github.com/google/uuid" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" "github.com/nspcc-dev/neofs-crypto/test" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/nspcc-dev/netmap" "github.com/pkg/errors" ) diff --git a/container/types.pb.go b/container/types.pb.go index 7a454de6..fb22b139 100644 Binary files a/container/types.pb.go and b/container/types.pb.go differ diff --git a/container/types.proto b/container/types.proto index 4600046b..e53587e2 100644 --- a/container/types.proto +++ b/container/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package container; -option go_package = "github.com/nspcc-dev/neofs-proto/container"; +option go_package = "github.com/nspcc-dev/neofs-api/container"; import "github.com/nspcc-dev/netmap/selector.proto"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/container/types_test.go b/container/types_test.go index cfd5f52a..0a20d54a 100644 --- a/container/types_test.go +++ b/container/types_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/gogo/protobuf/proto" + "github.com/nspcc-dev/neofs-api/refs" "github.com/nspcc-dev/neofs-crypto/test" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/nspcc-dev/netmap" "github.com/stretchr/testify/require" ) diff --git a/decimal/decimal.pb.go b/decimal/decimal.pb.go index d2bed7d3..c0726a48 100644 Binary files a/decimal/decimal.pb.go and b/decimal/decimal.pb.go differ diff --git a/decimal/decimal.proto b/decimal/decimal.proto index 42cf2df4..e0e16d56 100644 --- a/decimal/decimal.proto +++ b/decimal/decimal.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package decimal; -option go_package = "github.com/nspcc-dev/neofs-proto/decimal"; +option go_package = "github.com/nspcc-dev/neofs-api/decimal"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/go.mod b/go.mod index 688905e0..92ae511a 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/nspcc-dev/neofs-proto +module github.com/nspcc-dev/neofs-api go 1.13 diff --git a/hash/hash.go b/hash/hash.go index 36884431..de02491b 100644 --- a/hash/hash.go +++ b/hash/hash.go @@ -4,7 +4,7 @@ import ( "bytes" "github.com/mr-tron/base58" - "github.com/nspcc-dev/neofs-proto/internal" + "github.com/nspcc-dev/neofs-api/internal" "github.com/nspcc-dev/tzhash/tz" "github.com/pkg/errors" ) @@ -70,7 +70,7 @@ func (h Hash) Verify(data []byte) bool { return h.Equal(Sum(data)) } // Validate checks if combined hashes are equal to current Hash. func (h Hash) Validate(hashes []Hash) bool { - var hashBytes = make([][]byte, 0, len(hashes)) + hashBytes := make([][]byte, 0, len(hashes)) for i := range hashes { hashBytes = append(hashBytes, hashes[i].Bytes()) } diff --git a/object/extensions.go b/object/extensions.go index f6b10ab7..a4964137 100644 --- a/object/extensions.go +++ b/object/extensions.go @@ -1,7 +1,8 @@ package object + // todo: all extensions must be transferred to the separate util library -import "github.com/nspcc-dev/neofs-proto/storagegroup" +import "github.com/nspcc-dev/neofs-api/storagegroup" // IsLinking checks if object has children links to another objects. // We have to check payload size because zero-object must have zero diff --git a/object/service.go b/object/service.go index 38dbee17..b0afc551 100644 --- a/object/service.go +++ b/object/service.go @@ -1,11 +1,11 @@ package object import ( - "github.com/nspcc-dev/neofs-proto/hash" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" - "github.com/nspcc-dev/neofs-proto/service" - "github.com/nspcc-dev/neofs-proto/session" + "github.com/nspcc-dev/neofs-api/hash" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" + "github.com/nspcc-dev/neofs-api/service" + "github.com/nspcc-dev/neofs-api/session" ) type ( diff --git a/object/service.pb.go b/object/service.pb.go index 9019cae5..43013fe8 100644 Binary files a/object/service.pb.go and b/object/service.pb.go differ diff --git a/object/service.proto b/object/service.proto index 91c0cbdd..12f97412 100644 --- a/object/service.proto +++ b/object/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package object; -option go_package = "github.com/nspcc-dev/neofs-proto/object"; +option go_package = "github.com/nspcc-dev/neofs-api/object"; import "refs/types.proto"; import "object/types.proto"; diff --git a/object/sg.go b/object/sg.go index 620d24dc..a51123b2 100644 --- a/object/sg.go +++ b/object/sg.go @@ -3,8 +3,8 @@ package object import ( "sort" - "github.com/nspcc-dev/neofs-proto/refs" - "github.com/nspcc-dev/neofs-proto/storagegroup" + "github.com/nspcc-dev/neofs-api/refs" + "github.com/nspcc-dev/neofs-api/storagegroup" ) // Here are defined getter functions for objects that contain storage group diff --git a/object/sg_test.go b/object/sg_test.go index 15cc21bf..ed657b78 100644 --- a/object/sg_test.go +++ b/object/sg_test.go @@ -5,8 +5,8 @@ import ( "sort" "testing" - "github.com/nspcc-dev/neofs-proto/hash" - "github.com/nspcc-dev/neofs-proto/storagegroup" + "github.com/nspcc-dev/neofs-api/hash" + "github.com/nspcc-dev/neofs-api/storagegroup" "github.com/stretchr/testify/require" ) diff --git a/object/types.go b/object/types.go index 79cef655..e5735a57 100644 --- a/object/types.go +++ b/object/types.go @@ -5,9 +5,9 @@ import ( "context" "github.com/gogo/protobuf/proto" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" - "github.com/nspcc-dev/neofs-proto/session" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" + "github.com/nspcc-dev/neofs-api/session" ) type ( diff --git a/object/types.pb.go b/object/types.pb.go index 525b39b3..2be08c96 100644 Binary files a/object/types.pb.go and b/object/types.pb.go differ diff --git a/object/types.proto b/object/types.proto index 293f3470..5a0b98e2 100644 --- a/object/types.proto +++ b/object/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package object; -option go_package = "github.com/nspcc-dev/neofs-proto/object"; +option go_package = "github.com/nspcc-dev/neofs-api/object"; import "refs/types.proto"; import "session/types.proto"; diff --git a/object/utils.go b/object/utils.go index 7e628f1b..baaed0fa 100644 --- a/object/utils.go +++ b/object/utils.go @@ -4,7 +4,7 @@ import ( "io" "strconv" - "github.com/nspcc-dev/neofs-proto/session" + "github.com/nspcc-dev/neofs-api/session" "github.com/pkg/errors" ) diff --git a/object/verification_test.go b/object/verification_test.go index b538023c..053a7dea 100644 --- a/object/verification_test.go +++ b/object/verification_test.go @@ -4,11 +4,11 @@ import ( "testing" "github.com/google/uuid" + "github.com/nspcc-dev/neofs-api/container" + "github.com/nspcc-dev/neofs-api/refs" + "github.com/nspcc-dev/neofs-api/session" crypto "github.com/nspcc-dev/neofs-crypto" "github.com/nspcc-dev/neofs-crypto/test" - "github.com/nspcc-dev/neofs-proto/container" - "github.com/nspcc-dev/neofs-proto/refs" - "github.com/nspcc-dev/neofs-proto/session" "github.com/stretchr/testify/require" ) @@ -128,7 +128,6 @@ func TestObject_Verify(t *testing.T) { // re-sign object obj.Sign(sessionkey) - t.Run("incorrect with bad public key", func(t *testing.T) { err = obj.Verify() require.Error(t, err) diff --git a/query/types.pb.go b/query/types.pb.go index 7223bf88..63e98792 100644 Binary files a/query/types.pb.go and b/query/types.pb.go differ diff --git a/query/types.proto b/query/types.proto index 6eaed5da..90f4bbf1 100644 --- a/query/types.proto +++ b/query/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package query; -option go_package = "github.com/nspcc-dev/neofs-proto/query"; +option go_package = "github.com/nspcc-dev/neofs-api/query"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/refs/address.go b/refs/address.go index be6b6a32..9c9ce7d0 100644 --- a/refs/address.go +++ b/refs/address.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "strings" - "github.com/nspcc-dev/neofs-proto/internal" + "github.com/nspcc-dev/neofs-api/internal" ) const ( diff --git a/refs/owner.go b/refs/owner.go index ff88446f..59c9c25b 100644 --- a/refs/owner.go +++ b/refs/owner.go @@ -5,7 +5,7 @@ import ( "crypto/ecdsa" "github.com/mr-tron/base58" - "github.com/nspcc-dev/neofs-proto/chain" + "github.com/nspcc-dev/neofs-api/chain" "github.com/pkg/errors" ) diff --git a/refs/types.go b/refs/types.go index 785155c6..c0ba85a8 100644 --- a/refs/types.go +++ b/refs/types.go @@ -13,8 +13,8 @@ import ( "crypto/sha256" "github.com/google/uuid" - "github.com/nspcc-dev/neofs-proto/chain" - "github.com/nspcc-dev/neofs-proto/internal" + "github.com/nspcc-dev/neofs-api/chain" + "github.com/nspcc-dev/neofs-api/internal" ) type ( diff --git a/refs/types.pb.go b/refs/types.pb.go index 2ccde2f2..80dcde29 100644 Binary files a/refs/types.pb.go and b/refs/types.pb.go differ diff --git a/refs/types.proto b/refs/types.proto index 8c7d2ebf..c526d56a 100644 --- a/refs/types.proto +++ b/refs/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package refs; -option go_package = "github.com/nspcc-dev/neofs-proto/refs"; +option go_package = "github.com/nspcc-dev/neofs-api/refs"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/service/meta.go b/service/meta.go index 8730386c..95c1b13a 100644 --- a/service/meta.go +++ b/service/meta.go @@ -1,7 +1,7 @@ package service import ( - "github.com/nspcc-dev/neofs-proto/internal" + "github.com/nspcc-dev/neofs-api/internal" "github.com/pkg/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -94,7 +94,7 @@ func IRNonForwarding(role NodeRole) TTLCondition { // ProcessRequestTTL validates and update ttl requests. func ProcessRequestTTL(req MetaHeader, cond ...TTLCondition) error { - var ttl = req.GetTTL() + ttl := req.GetTTL() if ttl == ZeroTTL { return status.New(codes.InvalidArgument, ErrZeroTTL.Error()).Err() diff --git a/service/meta.pb.go b/service/meta.pb.go index d5f58fdf..6ff1a5da 100644 Binary files a/service/meta.pb.go and b/service/meta.pb.go differ diff --git a/service/meta.proto b/service/meta.proto index d3c3005e..f2cfe8f1 100644 --- a/service/meta.proto +++ b/service/meta.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package service; -option go_package = "github.com/nspcc-dev/neofs-proto/service"; +option go_package = "github.com/nspcc-dev/neofs-api/service"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/service/verify.go b/service/verify.go index 2bd1661c..c8bd8d6d 100644 --- a/service/verify.go +++ b/service/verify.go @@ -4,9 +4,9 @@ import ( "crypto/ecdsa" "sync" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/pkg/errors" ) diff --git a/service/verify.pb.go b/service/verify.pb.go index 95a94527..a8f0ea52 100644 Binary files a/service/verify.pb.go and b/service/verify.pb.go differ diff --git a/service/verify.proto b/service/verify.proto index c70015b6..6a4a0e08 100644 --- a/service/verify.proto +++ b/service/verify.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package service; -option go_package = "github.com/nspcc-dev/neofs-proto/service"; +option go_package = "github.com/nspcc-dev/neofs-api/service"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/service/verify_test.go b/service/verify_test.go index 44542c4a..fb6736be 100644 --- a/service/verify_test.go +++ b/service/verify_test.go @@ -7,9 +7,9 @@ import ( "testing" "github.com/gogo/protobuf/proto" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" "github.com/nspcc-dev/neofs-crypto/test" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/pkg/errors" "github.com/stretchr/testify/require" ) diff --git a/service/verify_test.pb.go b/service/verify_test.pb.go index 06e79718..d9200976 100644 Binary files a/service/verify_test.pb.go and b/service/verify_test.pb.go differ diff --git a/service/verify_test.proto b/service/verify_test.proto index c6326151..ce81180a 100644 --- a/service/verify_test.proto +++ b/service/verify_test.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package service; -option go_package = "github.com/nspcc-dev/neofs-proto/service"; +option go_package = "github.com/nspcc-dev/neofs-api/service"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/session/service.go b/session/service.go index d9f889fd..39dfb110 100644 --- a/session/service.go +++ b/session/service.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/refs" ) type ( diff --git a/session/service.pb.go b/session/service.pb.go index 85325239..e554ba1d 100644 Binary files a/session/service.pb.go and b/session/service.pb.go differ diff --git a/session/service.proto b/session/service.proto index 377e77ee..95ea9c59 100644 --- a/session/service.proto +++ b/session/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package session; -option go_package = "github.com/nspcc-dev/neofs-proto/session"; +option go_package = "github.com/nspcc-dev/neofs-api/session"; import "session/types.proto"; import "service/meta.proto"; diff --git a/session/store.go b/session/store.go index 1daf1511..b671a8cb 100644 --- a/session/store.go +++ b/session/store.go @@ -6,8 +6,8 @@ import ( "crypto/rand" "sync" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/refs" ) type simpleStore struct { diff --git a/session/store_test.go b/session/store_test.go index ade0cb03..6ee17adb 100644 --- a/session/store_test.go +++ b/session/store_test.go @@ -5,8 +5,8 @@ import ( "crypto/rand" "testing" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/stretchr/testify/require" ) @@ -61,8 +61,8 @@ func TestTokenStore(t *testing.T) { // create new token token := s.New(TokenParams{ - ObjectID: []ObjectID{oid}, - OwnerID: c.OwnerID, + ObjectID: []ObjectID{oid}, + OwnerID: c.OwnerID, PublicKeys: pk, }) signToken(t, token, c) @@ -74,9 +74,10 @@ func TestTokenStore(t *testing.T) { // create and sign another token by the same client t1 = s.New(TokenParams{ - ObjectID: []ObjectID{oid}, - OwnerID: c.OwnerID, - PublicKeys: pk}) + ObjectID: []ObjectID{oid}, + OwnerID: c.OwnerID, + PublicKeys: pk, + }) signToken(t, t1, c) diff --git a/session/types.go b/session/types.go index 08abec8f..120b8a89 100644 --- a/session/types.go +++ b/session/types.go @@ -5,10 +5,10 @@ import ( "encoding/binary" "sync" + "github.com/nspcc-dev/neofs-api/chain" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/chain" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/pkg/errors" ) @@ -113,7 +113,7 @@ func (m *Token) Sign(key *ecdsa.PrivateKey) error { } // SetPublicKeys sets owner's public keys to the token -func (m *Token) SetPublicKeys(keys... *ecdsa.PublicKey) { +func (m *Token) SetPublicKeys(keys ...*ecdsa.PublicKey) { m.PublicKeys = m.PublicKeys[:0] for i := range keys { m.PublicKeys = append(m.PublicKeys, crypto.MarshalPublicKey(keys[i])) diff --git a/session/types.pb.go b/session/types.pb.go index 5b2f5c4a..e27f0c68 100644 Binary files a/session/types.pb.go and b/session/types.pb.go differ diff --git a/session/types.proto b/session/types.proto index 294928b5..79b24ff5 100644 --- a/session/types.proto +++ b/session/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package session; -option go_package = "github.com/nspcc-dev/neofs-proto/session"; +option go_package = "github.com/nspcc-dev/neofs-api/session"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/state/service.pb.go b/state/service.pb.go index 09cc645e..62f5f4e0 100644 Binary files a/state/service.pb.go and b/state/service.pb.go differ diff --git a/state/service.proto b/state/service.proto index a30af225..7966d43b 100644 --- a/state/service.proto +++ b/state/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package state; -option go_package = "github.com/nspcc-dev/neofs-proto/state"; +option go_package = "github.com/nspcc-dev/neofs-api/state"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/storagegroup/storage.go b/storagegroup/storage.go index a23ef744..d41af495 100644 --- a/storagegroup/storage.go +++ b/storagegroup/storage.go @@ -3,7 +3,7 @@ package storagegroup import ( "context" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/refs" ) type ( diff --git a/storagegroup/types.go b/storagegroup/types.go index 6c6f775f..52c1410c 100644 --- a/storagegroup/types.go +++ b/storagegroup/types.go @@ -7,8 +7,8 @@ import ( "github.com/gogo/protobuf/proto" "github.com/mr-tron/base58" - "github.com/nspcc-dev/neofs-proto/hash" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/hash" + "github.com/nspcc-dev/neofs-api/refs" ) type ( diff --git a/storagegroup/types.pb.go b/storagegroup/types.pb.go index f0528853..aae646a5 100644 Binary files a/storagegroup/types.pb.go and b/storagegroup/types.pb.go differ diff --git a/storagegroup/types.proto b/storagegroup/types.proto index 5014b962..238b4548 100644 --- a/storagegroup/types.proto +++ b/storagegroup/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package storagegroup; -option go_package = "github.com/nspcc-dev/neofs-proto/storagegroup"; +option go_package = "github.com/nspcc-dev/neofs-api/storagegroup"; import "github.com/gogo/protobuf/gogoproto/gogo.proto";