From b42537f8d8b68766eb26c2a44738def8d81e4267 Mon Sep 17 00:00:00 2001 From: Evgeniy Kulikov Date: Thu, 30 Jan 2020 15:47:05 +0300 Subject: [PATCH 1/3] Use separated proto repository Workflow: - update goland dependencies - remove old `*.proto` and `*.pb.go` files - download specific version of neofs-proto (will be published soon) - extract proto files into `vendor/proto` - walk throw `vendor/proto` folders that contains `*.proto` files and override in repo --- Makefile | 39 ++++++++++++++++++++++++++++++++------- 1 file changed, 32 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 9609923..43f4642 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,34 @@ +PROTO_VERSION=master +PROTO_URL=https://bitbucket.org/nspcc-dev/neofs-proto/get/$(PROTO_VERSION).tar.gz + B=\033[0;1m G=\033[0;92m R=\033[0m +.PHONY: deps format docgen protoc + +# Dependencies +deps: + @echo "${B}${G}=> Golang modules ${R}" + @go mod tidy -v + @go mod vendor + + @echo "${B}${G}=> Cleanup old files ${R}" + @find . -type f -name '*.pb.go' -not -path './vendor/*' -exec rm {} \; + @find . -type f -name '*.proto' -not -path './vendor/*' -not -name '*_test.proto' -exec rm {} \; + + @echo "${B}${G}=> NeoFS Proto files ${R}" + @mkdir -p ./vendor/proto + @curl -sL -o ./vendor/proto.tar.gz $(PROTO_URL) + @tar -xzf ./vendor/proto.tar.gz --strip-components 1 -C ./vendor/proto + @for f in `find ./vendor/proto -type f -name '*.proto' -exec dirname {} \; | sort -u `; do \ + cp $$f/*.proto ./$$(basename $$f); \ + done + + @echo "${B}${G}=> Cleanup ${R}" + @rm -rf ./vendor/proto + @rm -rf ./vendor/proto.tar.gz + # Reformat code format: @[ ! -z `which goimports` ] || (echo "install goimports" && exit 2) @@ -11,7 +38,7 @@ format: done # Regenerate documentation for protot files: -docgen: +docgen: deps @for f in `find . -type f -name '*.proto' -not -path './vendor/*' -exec dirname {} \; | sort -u `; do \ echo "${B}${G}⇒ Documentation for $$(basename $$f) ${R}"; \ protoc \ @@ -21,14 +48,12 @@ docgen: done # Regenerate proto files: -protoc: - @go mod tidy -v - @go mod vendor - # Install specific version for gogo-proto +protoc: deps + @echo "${B}${G}=> Install specific version for gogo-proto ${R}" @go list -f '{{.Path}}/...@{{.Version}}' -m github.com/gogo/protobuf | xargs go get -v - # Install specific version for protobuf lib + @echo "${B}${G}=> Install specific version for protobuf lib ${R}" @go list -f '{{.Path}}/...@{{.Version}}' -m github.com/golang/protobuf | xargs go get -v - # Protoc generate + @echo "${B}${G}=> Protoc generate ${R}" @for f in `find . -type f -name '*.proto' -not -path './vendor/*'`; do \ echo "${B}${G}⇒ Processing $$f ${R}"; \ protoc \ From 53af48372fba4ddcfd6153cbeb440e480f7152f7 Mon Sep 17 00:00:00 2001 From: Evgeniy Kulikov Date: Thu, 30 Jan 2020 16:32:50 +0300 Subject: [PATCH 2/3] prepare to rename neofs-proto to neofs-api --- CHANGELOG.md | 26 ++++---- accounting/service.go | 6 +- accounting/service.pb.go | 54 ++++++++-------- accounting/service.proto | 2 +- accounting/types.go | 8 +-- accounting/types.pb.go | 106 +++++++++++++++---------------- accounting/types.proto | 4 +- accounting/types_test.go | 10 +-- accounting/withdraw.go | 2 +- accounting/withdraw.pb.go | 78 +++++++++++------------ accounting/withdraw.proto | 2 +- bootstrap/service.go | 2 +- bootstrap/service.pb.go | 46 +++++++------- bootstrap/service.proto | 2 +- bootstrap/types.go | 2 +- bootstrap/types.pb.go | 46 +++++++------- bootstrap/types.proto | 2 +- chain/address.go | 2 +- container/service.go | 4 +- container/service.pb.go | 12 ++-- container/service.proto | 2 +- container/types.go | 4 +- container/types.pb.go | 45 +++++++------- container/types.proto | 2 +- container/types_test.go | 2 +- decimal/decimal.pb.go | 12 ++-- decimal/decimal.proto | 2 +- go.mod | 2 +- hash/hash.go | 4 +- object/extensions.go | 3 +- object/service.go | 10 +-- object/service.pb.go | 114 +++++++++++++++++----------------- object/service.proto | 2 +- object/sg.go | 4 +- object/sg_test.go | 4 +- object/types.go | 6 +- object/types.pb.go | 120 ++++++++++++++++++------------------ object/types.proto | 2 +- object/utils.go | 2 +- object/verification_test.go | 7 +-- query/types.pb.go | 12 ++-- query/types.proto | 2 +- refs/address.go | 2 +- refs/owner.go | 2 +- refs/types.go | 4 +- refs/types.pb.go | 10 +-- refs/types.proto | 2 +- service/meta.go | 4 +- service/meta.pb.go | 10 +-- service/meta.proto | 2 +- service/verify.go | 4 +- service/verify.pb.go | 10 +-- service/verify.proto | 2 +- service/verify_test.go | 2 +- service/verify_test.pb.go | 44 ++++++------- service/verify_test.proto | 2 +- session/service.go | 2 +- session/service.pb.go | 50 +++++++-------- session/service.proto | 2 +- session/store.go | 2 +- session/store_test.go | 13 ++-- session/types.go | 8 +-- session/types.pb.go | 48 +++++++-------- session/types.proto | 2 +- state/service.pb.go | 64 +++++++++---------- state/service.proto | 2 +- storagegroup/storage.go | 2 +- storagegroup/types.go | 4 +- storagegroup/types.pb.go | 48 +++++++-------- storagegroup/types.proto | 2 +- 70 files changed, 565 insertions(+), 563 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d09b11..27d0e93 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 ac1ceb5..5f8f889 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 7a8a086..4e1127b 100644 --- a/accounting/service.pb.go +++ b/accounting/service.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - decimal "github.com/nspcc-dev/neofs-proto/decimal" - service "github.com/nspcc-dev/neofs-proto/service" + decimal "github.com/nspcc-dev/neofs-api/decimal" + service "github.com/nspcc-dev/neofs-api/service" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -132,31 +132,31 @@ func init() { func init() { proto.RegisterFile("accounting/service.proto", fileDescriptor_7f9514b8f1d4c7fe) } var fileDescriptor_7f9514b8f1d4c7fe = []byte{ - // 381 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x91, 0xbd, 0x6e, 0xdb, 0x30, - 0x14, 0x85, 0xcd, 0xb6, 0xb0, 0x0b, 0xda, 0xa8, 0x0b, 0xf6, 0x07, 0x82, 0x0a, 0xc8, 0x86, 0x27, - 0xb7, 0x85, 0x25, 0x40, 0x1d, 0xda, 0xd5, 0x82, 0x87, 0x16, 0x68, 0xd1, 0x40, 0x43, 0x86, 0x6c, - 0x14, 0x7d, 0xad, 0x08, 0xb1, 0x49, 0x45, 0xa4, 0x14, 0xf8, 0x4d, 0xf2, 0x2e, 0x79, 0x01, 0x8f, - 0x1e, 0x83, 0x0c, 0x46, 0xa0, 0xbc, 0x48, 0x60, 0x8a, 0xf2, 0x4f, 0x92, 0x89, 0xe4, 0x77, 0xee, - 0xb9, 0xbc, 0x3c, 0xc4, 0x16, 0x65, 0x4c, 0xe4, 0x5c, 0x25, 0x3c, 0xf6, 0x24, 0x64, 0x45, 0xc2, - 0xc0, 0x4d, 0x33, 0xa1, 0x04, 0xc1, 0x7b, 0xc5, 0x26, 0x46, 0xf2, 0x16, 0xa0, 0x68, 0xa5, 0xdb, - 0x1f, 0x6b, 0x56, 0x40, 0x96, 0xcc, 0x96, 0x86, 0x7e, 0x9a, 0x02, 0x4b, 0x16, 0x74, 0xee, 0x99, - 0xd5, 0xe0, 0xcf, 0x07, 0xd7, 0xa8, 0x65, 0x0a, 0xd2, 0xf0, 0x51, 0x9c, 0xa8, 0xf3, 0x3c, 0x72, - 0x99, 0x58, 0x78, 0xb1, 0x88, 0x85, 0xa7, 0x71, 0x94, 0xcf, 0xf4, 0x49, 0x1f, 0xf4, 0xae, 0x2a, - 0x1f, 0xdc, 0x20, 0xfc, 0x2e, 0xa0, 0x73, 0xca, 0x19, 0x84, 0x70, 0x99, 0x83, 0x54, 0xe4, 0x2b, - 0x6e, 0xfd, 0xbf, 0xe2, 0x90, 0xfd, 0x99, 0x58, 0xa8, 0x8f, 0x86, 0x9d, 0xa0, 0xbb, 0xda, 0xf4, - 0x1a, 0x77, 0x9b, 0x5e, 0x8d, 0xc3, 0x7a, 0x43, 0x7e, 0xe1, 0x37, 0xff, 0x40, 0x51, 0x2b, 0xea, - 0xa3, 0x61, 0xdb, 0xb7, 0xdd, 0xfa, 0xbd, 0xa6, 0xd5, 0x56, 0xfb, 0x0d, 0x74, 0x0a, 0x59, 0xf0, - 0x76, 0xdb, 0x63, 0xbd, 0xe9, 0xa1, 0x50, 0x3b, 0xc8, 0x04, 0x37, 0x4f, 0xf5, 0x2b, 0x2d, 0xa6, - 0xbd, 0x83, 0xa7, 0x5e, 0xad, 0x26, 0x8c, 0xaa, 0x44, 0xf0, 0x67, 0x3d, 0x8c, 0x77, 0x50, 0xe0, - 0xee, 0x6e, 0x78, 0x99, 0x0a, 0x2e, 0x81, 0x7c, 0xc3, 0x2d, 0x83, 0xf4, 0xf4, 0x6d, 0xff, 0xbd, - 0x5b, 0x07, 0x37, 0xa9, 0xd6, 0xb0, 0x2e, 0x20, 0x3f, 0x71, 0xe7, 0xaf, 0x60, 0x17, 0xe3, 0x2a, - 0x49, 0x69, 0xbd, 0xea, 0xbf, 0x1e, 0xb6, 0xfd, 0x0f, 0xee, 0x3e, 0x5a, 0xd7, 0x68, 0xe1, 0x51, - 0xa1, 0x7f, 0x82, 0xf1, 0x78, 0x57, 0x43, 0x82, 0xdd, 0x95, 0xc4, 0x3e, 0xf4, 0x1e, 0xe7, 0x6a, - 0x7f, 0x79, 0x51, 0xab, 0xc6, 0x0e, 0xc6, 0xab, 0xd2, 0x41, 0xeb, 0xd2, 0x41, 0xb7, 0xa5, 0x83, - 0xee, 0x4b, 0x07, 0x5d, 0x3f, 0x38, 0x8d, 0xb3, 0xef, 0x07, 0x9f, 0xc9, 0x65, 0xca, 0xd8, 0x68, - 0x0a, 0x85, 0xc7, 0x41, 0xcc, 0xe4, 0xa8, 0xfa, 0xca, 0x7d, 0xcb, 0xa8, 0xa9, 0xc9, 0x8f, 0xc7, - 0x00, 0x00, 0x00, 0xff, 0xff, 0xf9, 0xca, 0x86, 0x87, 0x81, 0x02, 0x00, 0x00, + // 379 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xbb, 0xae, 0xd3, 0x30, + 0x18, 0xae, 0x01, 0xb5, 0xc8, 0xad, 0x28, 0x32, 0x17, 0x45, 0x41, 0x4a, 0xab, 0x4e, 0x2d, 0x52, + 0x13, 0x29, 0x0c, 0xb0, 0xa1, 0x46, 0x1d, 0x40, 0x02, 0x81, 0x32, 0x30, 0xb0, 0x39, 0xee, 0xdf, + 0x60, 0xd1, 0xda, 0x21, 0x76, 0x82, 0xfa, 0x26, 0xbc, 0x0b, 0x2f, 0xd0, 0xb1, 0x23, 0x62, 0xa8, + 0x8e, 0x72, 0x5e, 0xe4, 0xa8, 0x8e, 0xd3, 0xcb, 0x39, 0x67, 0xb2, 0xfd, 0xdd, 0xfc, 0xfb, 0x33, + 0x76, 0x28, 0x63, 0xb2, 0x10, 0x9a, 0x8b, 0x34, 0x50, 0x90, 0x97, 0x9c, 0x81, 0x9f, 0xe5, 0x52, + 0x4b, 0x82, 0x4f, 0x8c, 0x4b, 0x2c, 0x15, 0xac, 0x41, 0xd3, 0x9a, 0x77, 0x9f, 0x37, 0x58, 0x09, + 0x39, 0x5f, 0x6e, 0x2c, 0xfa, 0x62, 0x01, 0x8c, 0xaf, 0xe9, 0x2a, 0xb0, 0xab, 0x85, 0x5f, 0x9e, + 0x5d, 0xa3, 0x37, 0x19, 0x28, 0x8b, 0x4f, 0x53, 0xae, 0x7f, 0x14, 0x89, 0xcf, 0xe4, 0x3a, 0x48, + 0x65, 0x2a, 0x03, 0x03, 0x27, 0xc5, 0xd2, 0x9c, 0xcc, 0xc1, 0xec, 0x6a, 0xf9, 0xe8, 0x2f, 0xc2, + 0x4f, 0x22, 0xba, 0xa2, 0x82, 0x41, 0x0c, 0xbf, 0x0a, 0x50, 0x9a, 0x4c, 0x70, 0xe7, 0xcb, 0x6f, + 0x01, 0xf9, 0xc7, 0xb9, 0x83, 0x86, 0x68, 0xdc, 0x8b, 0xfa, 0xdb, 0xfd, 0xa0, 0xf5, 0x7f, 0x3f, + 0x68, 0xe0, 0xb8, 0xd9, 0x90, 0x77, 0xf8, 0xd1, 0x67, 0xd0, 0xd4, 0x49, 0x86, 0x68, 0xdc, 0x0d, + 0x5d, 0xbf, 0x79, 0xaf, 0x8d, 0x3a, 0x70, 0x1f, 0x80, 0x2e, 0x20, 0x8f, 0x1e, 0x1f, 0x32, 0x76, + 0xfb, 0x01, 0x8a, 0x8d, 0x83, 0xcc, 0x71, 0xfb, 0x9b, 0x79, 0xa5, 0xc3, 0x8c, 0x77, 0x74, 0xdb, + 0x6b, 0x58, 0xce, 0xa8, 0xe6, 0x52, 0xdc, 0xc9, 0xb0, 0xde, 0x51, 0x89, 0xfb, 0xc7, 0xe1, 0x55, + 0x26, 0x85, 0x02, 0xf2, 0x1a, 0x77, 0x2c, 0x64, 0xa6, 0xef, 0x86, 0x4f, 0xfd, 0xa6, 0xb8, 0x79, + 0xbd, 0xc6, 0x8d, 0x80, 0xbc, 0xc5, 0xbd, 0x4f, 0x92, 0xfd, 0x9c, 0xd5, 0x4d, 0x2a, 0xe7, 0xc1, + 0xf0, 0xe1, 0xb8, 0x1b, 0x3e, 0xf3, 0x4f, 0xd5, 0xfa, 0x96, 0x8b, 0x2f, 0x84, 0xe1, 0x57, 0x8c, + 0x67, 0x47, 0x0d, 0x89, 0x8e, 0x57, 0x12, 0xf7, 0xdc, 0x7b, 0xd9, 0xab, 0xfb, 0xea, 0x5e, 0xae, + 0x1e, 0x3b, 0x7a, 0xbf, 0xad, 0x3c, 0xb4, 0xab, 0x3c, 0xf4, 0xaf, 0xf2, 0xd0, 0x55, 0xe5, 0xa1, + 0x3f, 0xd7, 0x5e, 0xeb, 0xfb, 0xe4, 0xec, 0x33, 0x85, 0xca, 0x18, 0x9b, 0x2e, 0xa0, 0x0c, 0x04, + 0xc8, 0xa5, 0x9a, 0xd2, 0x8c, 0x07, 0xa7, 0xc0, 0xa4, 0x6d, 0xfe, 0xf3, 0xcd, 0x4d, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x4f, 0x3c, 0xca, 0x62, 0x7f, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/accounting/service.proto b/accounting/service.proto index f2696c4..c320106 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 9c76fc7..af883a2 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 dd020ec..f420355 100644 --- a/accounting/types.pb.go +++ b/accounting/types.pb.go @@ -7,7 +7,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - decimal "github.com/nspcc-dev/neofs-proto/decimal" + decimal "github.com/nspcc-dev/neofs-api/decimal" io "io" math "math" math_bits "math/bits" @@ -801,59 +801,59 @@ func init() { func init() { proto.RegisterFile("accounting/types.proto", fileDescriptor_437c556d7375b726) } var fileDescriptor_437c556d7375b726 = []byte{ - // 821 bytes of a gzipped FileDescriptorProto + // 823 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x55, 0x4d, 0x6f, 0xe3, 0x44, - 0x18, 0xce, 0x38, 0x69, 0x3e, 0xde, 0x64, 0x83, 0x35, 0xbb, 0x5b, 0x85, 0x48, 0xa4, 0xc1, 0xe2, - 0x10, 0x84, 0xea, 0x88, 0xae, 0x68, 0xb9, 0x70, 0x88, 0x13, 0xca, 0x56, 0xac, 0xba, 0xd5, 0xd4, - 0x05, 0x01, 0x27, 0xd7, 0x99, 0xa6, 0x56, 0x93, 0x99, 0x60, 0x8f, 0xfb, 0xf1, 0x27, 0x38, 0x73, - 0xe1, 0xc4, 0x8f, 0xe0, 0x2f, 0xec, 0x11, 0x6e, 0x88, 0x43, 0x85, 0xc2, 0x1f, 0x41, 0x33, 0x1e, - 0x3b, 0x76, 0x95, 0xc0, 0x25, 0x79, 0x3f, 0x9e, 0xf7, 0x99, 0xf7, 0x6b, 0xc6, 0xb0, 0xeb, 0xf9, - 0x3e, 0x8f, 0x99, 0x08, 0xd8, 0x6c, 0x28, 0x1e, 0x96, 0x34, 0xb2, 0x97, 0x21, 0x17, 0x1c, 0xc3, - 0xda, 0xde, 0x7d, 0x39, 0xa5, 0x7e, 0xb0, 0xf0, 0xe6, 0x43, 0xfd, 0x9f, 0x40, 0xba, 0xfb, 0xb3, - 0x40, 0x5c, 0xc7, 0x97, 0xb6, 0xcf, 0x17, 0xc3, 0x19, 0x9f, 0xf1, 0xa1, 0x32, 0x5f, 0xc6, 0x57, - 0x4a, 0x53, 0x8a, 0x92, 0x12, 0xb8, 0xf5, 0x87, 0x01, 0xb5, 0x51, 0x42, 0x8a, 0x3f, 0x86, 0xda, - 0xdb, 0x3b, 0x46, 0xc3, 0x93, 0x49, 0x07, 0xf5, 0xd1, 0xa0, 0xe5, 0xbc, 0xf7, 0xee, 0x71, 0xaf, - 0xf4, 0xd7, 0xe3, 0x5e, 0x6a, 0x26, 0xa9, 0x80, 0x3b, 0x50, 0x1b, 0x4d, 0xa7, 0x21, 0x8d, 0xa2, - 0x8e, 0xd1, 0x47, 0x83, 0x06, 0x49, 0x55, 0xfc, 0x11, 0x3c, 0x3b, 0xf3, 0x42, 0xca, 0x44, 0xea, - 0x2f, 0x2b, 0x7f, 0xd1, 0x88, 0x0f, 0xa0, 0x39, 0xf2, 0x45, 0x70, 0x4b, 0x8f, 0x63, 0x36, 0x8d, - 0x3a, 0x95, 0x3e, 0x1a, 0x34, 0x0f, 0x4c, 0x3b, 0x2d, 0x65, 0x92, 0xfc, 0x93, 0x3c, 0x08, 0x1f, - 0x42, 0xfd, 0x4d, 0x70, 0x45, 0x45, 0xb0, 0xa0, 0x9d, 0x1d, 0x15, 0xf0, 0xc2, 0x5e, 0xf7, 0xc3, - 0x4e, 0x7d, 0x4e, 0x45, 0x66, 0x4d, 0x32, 0x2c, 0x3e, 0x04, 0x78, 0xc3, 0xfd, 0x1b, 0xd7, 0x0b, - 0x67, 0x54, 0x74, 0xaa, 0x2a, 0x72, 0xb7, 0x10, 0x99, 0x79, 0x49, 0x0e, 0x89, 0x8f, 0xa0, 0x25, - 0x35, 0xdd, 0x9d, 0xa8, 0x53, 0xeb, 0x97, 0x07, 0xcd, 0x83, 0xe7, 0xf9, 0x48, 0xed, 0x23, 0x05, - 0xa0, 0xf5, 0x1b, 0xca, 0x9f, 0x88, 0x27, 0xd0, 0xfe, 0x36, 0x10, 0xd7, 0xd3, 0xd0, 0xbb, 0xd3, - 0x39, 0x20, 0x95, 0x43, 0x37, 0xcf, 0x54, 0x44, 0xbc, 0x2e, 0x91, 0x27, 0x31, 0xf8, 0x3b, 0x78, - 0x39, 0xe6, 0x4c, 0x78, 0x01, 0xa3, 0xe1, 0x38, 0xa4, 0x9e, 0xa0, 0x9a, 0xcc, 0x50, 0x64, 0x1f, - 0xe6, 0xc9, 0x36, 0x02, 0x5f, 0x97, 0xc8, 0x66, 0x06, 0xa7, 0x0e, 0xd5, 0x44, 0xb2, 0x46, 0x50, - 0x77, 0xbc, 0xb9, 0xc7, 0x7c, 0x1a, 0xe1, 0xcf, 0xa0, 0x9e, 0x95, 0x8e, 0xb6, 0x96, 0x9e, 0x76, - 0x3b, 0x2b, 0xfe, 0x07, 0xd8, 0x39, 0xf3, 0x1e, 0x4e, 0xde, 0xca, 0x15, 0x71, 0xe6, 0xdc, 0xbf, - 0xd1, 0xdb, 0x54, 0x21, 0xa9, 0x8a, 0x3f, 0x87, 0x96, 0x1b, 0x7a, 0x2c, 0xf2, 0x7c, 0x11, 0x70, - 0x26, 0x37, 0x48, 0xb2, 0xb7, 0xf3, 0xec, 0xee, 0xbd, 0x26, 0x2e, 0x20, 0xad, 0x9f, 0xd0, 0x7a, - 0x07, 0xf0, 0x11, 0x54, 0x62, 0x16, 0x24, 0xdd, 0x6c, 0x1f, 0xbc, 0xbf, 0x69, 0x17, 0xec, 0x0b, - 0x16, 0x08, 0xa7, 0xbe, 0x7a, 0xdc, 0xab, 0x48, 0x89, 0xa8, 0x00, 0xfc, 0x02, 0x76, 0xbe, 0xf1, - 0xe6, 0x31, 0x55, 0xad, 0x2b, 0x93, 0x44, 0xb1, 0x5e, 0x81, 0xc2, 0xe0, 0x67, 0xd0, 0xb8, 0x60, - 0xf3, 0x60, 0x11, 0x08, 0x3a, 0x35, 0x4b, 0xb8, 0x0d, 0x70, 0x4a, 0xf9, 0xf1, 0xf9, 0x97, 0x4b, - 0xee, 0x5f, 0x9b, 0x08, 0xb7, 0xa0, 0x7e, 0x4a, 0xb9, 0x2a, 0xc5, 0x34, 0xac, 0x47, 0x04, 0x86, - 0x7b, 0x8f, 0x3f, 0x85, 0x8a, 0xbc, 0xa6, 0x3a, 0x95, 0xe7, 0xc5, 0x4a, 0x6c, 0xf7, 0x61, 0x49, - 0x93, 0x24, 0xa4, 0x44, 0x14, 0x14, 0x63, 0xa8, 0x1c, 0x87, 0x7c, 0xa1, 0xaf, 0x8f, 0x92, 0x71, - 0x1b, 0x0c, 0x97, 0xeb, 0x0b, 0x63, 0xb8, 0x1c, 0x0f, 0xa0, 0x3a, 0x5a, 0x48, 0xa2, 0xad, 0x17, - 0x44, 0xfb, 0x71, 0x0f, 0xe0, 0x2c, 0xbe, 0x9c, 0x07, 0xfe, 0xd7, 0xf4, 0x21, 0x52, 0xb7, 0xa3, - 0x45, 0x72, 0x16, 0xeb, 0x08, 0xd4, 0xd9, 0xb8, 0x09, 0xb5, 0x0b, 0x76, 0xc3, 0xf8, 0x1d, 0x33, - 0x4b, 0xb2, 0x94, 0x74, 0xc9, 0x4c, 0x84, 0x1b, 0x7a, 0x70, 0xa6, 0x21, 0xc5, 0x13, 0xc6, 0x68, - 0x68, 0x96, 0xad, 0x5f, 0xca, 0x00, 0xe7, 0x54, 0x88, 0x39, 0x5d, 0x50, 0xa6, 0x5a, 0xa7, 0x1a, - 0xa1, 0x47, 0x9a, 0x28, 0xf8, 0x8b, 0x8d, 0x03, 0x2d, 0x4c, 0x64, 0xcd, 0x61, 0xbb, 0xf7, 0xc5, - 0xa9, 0x76, 0x27, 0x50, 0x27, 0xd4, 0xa7, 0xc1, 0x2d, 0x0d, 0x75, 0x0b, 0xd0, 0x86, 0x16, 0x18, - 0xff, 0xdd, 0x82, 0xee, 0x29, 0x34, 0xb2, 0xf5, 0xc6, 0x1f, 0x40, 0x79, 0x9c, 0x3d, 0x63, 0x4d, - 0xfd, 0x8c, 0x49, 0x13, 0x91, 0x3f, 0xd8, 0x82, 0x9d, 0xf3, 0xaf, 0x4e, 0x26, 0x49, 0xa6, 0x2d, - 0xa7, 0xa5, 0x01, 0x15, 0x69, 0x24, 0x89, 0xab, 0xfb, 0x6b, 0x32, 0xda, 0x74, 0x4e, 0x28, 0x37, - 0xa7, 0x49, 0xee, 0x28, 0x9d, 0x57, 0x7f, 0x4b, 0xb1, 0x19, 0x4e, 0xef, 0x73, 0x2e, 0xc7, 0x31, - 0x34, 0xd2, 0xb2, 0xe5, 0x2b, 0x29, 0x5b, 0xb6, 0xb7, 0x85, 0x25, 0xc5, 0xa5, 0x24, 0x59, 0x9c, - 0x75, 0xb8, 0xe5, 0x59, 0xf8, 0x9f, 0x0e, 0x58, 0x83, 0xa7, 0x8f, 0x12, 0xde, 0x85, 0xea, 0xf8, - 0x9a, 0xfe, 0x18, 0x53, 0x5d, 0xaa, 0xd6, 0x9c, 0xd1, 0xbb, 0x55, 0x0f, 0xfd, 0xbe, 0xea, 0xa1, - 0x3f, 0x57, 0x3d, 0xf4, 0xf7, 0xaa, 0x87, 0x7e, 0xfe, 0xa7, 0x57, 0xfa, 0xfe, 0x93, 0xdc, 0x67, - 0x86, 0x45, 0x4b, 0xdf, 0xdf, 0x9f, 0xd2, 0xdb, 0x21, 0xa3, 0xfc, 0x2a, 0xda, 0x4f, 0x3e, 0x32, - 0xeb, 0x4a, 0x2e, 0xab, 0xca, 0xf2, 0xea, 0xdf, 0x00, 0x00, 0x00, 0xff, 0xff, 0x3c, 0x2d, 0x7e, - 0x6b, 0xd7, 0x06, 0x00, 0x00, + 0x18, 0xce, 0x38, 0x69, 0x3e, 0xde, 0x64, 0x43, 0x34, 0xbb, 0x5b, 0x85, 0x48, 0xa4, 0xc1, 0xe2, + 0x90, 0x3d, 0x34, 0x11, 0x5d, 0xd1, 0x72, 0x41, 0x28, 0x4e, 0x28, 0x5b, 0xb1, 0xea, 0x56, 0x53, + 0x17, 0x04, 0x9c, 0x5c, 0x67, 0x9a, 0x8e, 0x9a, 0xcc, 0x04, 0x7b, 0xdc, 0x8f, 0x3f, 0xc1, 0x99, + 0x0b, 0x27, 0x7e, 0x04, 0x7f, 0x61, 0x8f, 0x70, 0x43, 0x1c, 0x2a, 0x14, 0xfe, 0x08, 0x9a, 0xf1, + 0xd8, 0xb1, 0x57, 0x09, 0x7b, 0x49, 0xde, 0x8f, 0xe7, 0x7d, 0xe6, 0xfd, 0x9a, 0x31, 0xec, 0x7a, + 0xbe, 0x2f, 0x22, 0x2e, 0x19, 0x9f, 0x0d, 0xe5, 0xc3, 0x92, 0x86, 0x83, 0x65, 0x20, 0xa4, 0xc0, + 0xb0, 0xb6, 0x77, 0x9e, 0x4f, 0xa9, 0xcf, 0x16, 0xde, 0x7c, 0x68, 0xfe, 0x63, 0x48, 0x67, 0x7f, + 0xc6, 0xe4, 0x75, 0x74, 0x39, 0xf0, 0xc5, 0x62, 0x38, 0x13, 0x33, 0x31, 0xd4, 0xe6, 0xcb, 0xe8, + 0x4a, 0x6b, 0x5a, 0xd1, 0x52, 0x0c, 0xb7, 0xff, 0xb4, 0xa0, 0x32, 0x8a, 0x49, 0xf1, 0x0b, 0xa8, + 0xbc, 0xb9, 0xe3, 0x34, 0x38, 0x99, 0xb4, 0x51, 0x0f, 0xf5, 0x1b, 0xce, 0x07, 0x6f, 0x1f, 0xf7, + 0x0a, 0x7f, 0x3f, 0xee, 0x25, 0x66, 0x92, 0x08, 0xb8, 0x0d, 0x95, 0xd1, 0x74, 0x1a, 0xd0, 0x30, + 0x6c, 0x5b, 0x3d, 0xd4, 0xaf, 0x91, 0x44, 0xc5, 0x9f, 0xc0, 0x93, 0x33, 0x2f, 0xa0, 0x5c, 0x26, + 0xfe, 0xa2, 0xf6, 0xe7, 0x8d, 0xf8, 0x00, 0xea, 0x23, 0x5f, 0xb2, 0x5b, 0x7a, 0x1c, 0xf1, 0x69, + 0xd8, 0x2e, 0xf5, 0x50, 0xbf, 0x7e, 0xd0, 0x1a, 0x24, 0xa5, 0x4c, 0xe2, 0x7f, 0x92, 0x05, 0xe1, + 0x43, 0xa8, 0xbe, 0x66, 0x57, 0x54, 0xb2, 0x05, 0x6d, 0xef, 0xe8, 0x80, 0x67, 0x83, 0x75, 0x3f, + 0x06, 0x89, 0xcf, 0x29, 0xa9, 0xac, 0x49, 0x8a, 0xc5, 0x87, 0x00, 0xaf, 0x85, 0x7f, 0xe3, 0x7a, + 0xc1, 0x8c, 0xca, 0x76, 0x59, 0x47, 0xee, 0xe6, 0x22, 0x53, 0x2f, 0xc9, 0x20, 0xf1, 0x11, 0x34, + 0x94, 0x66, 0xba, 0x13, 0xb6, 0x2b, 0xbd, 0x62, 0xbf, 0x7e, 0xf0, 0x34, 0x1b, 0x69, 0x7c, 0x24, + 0x07, 0xb4, 0x7f, 0x47, 0xd9, 0x13, 0xf1, 0x04, 0x9a, 0xdf, 0x31, 0x79, 0x3d, 0x0d, 0xbc, 0x3b, + 0x93, 0x03, 0xd2, 0x39, 0x74, 0xb2, 0x4c, 0x79, 0xc4, 0xab, 0x02, 0x79, 0x27, 0x06, 0x7f, 0x0f, + 0xcf, 0xc7, 0x82, 0x4b, 0x8f, 0x71, 0x1a, 0x8c, 0x03, 0xea, 0x49, 0x6a, 0xc8, 0x2c, 0x4d, 0xf6, + 0x71, 0x96, 0x6c, 0x23, 0xf0, 0x55, 0x81, 0x6c, 0x66, 0x70, 0xaa, 0x50, 0x8e, 0x25, 0x7b, 0x04, + 0x55, 0xc7, 0x9b, 0x7b, 0xdc, 0xa7, 0x21, 0xfe, 0x0c, 0xaa, 0x69, 0xe9, 0x68, 0x6b, 0xe9, 0x49, + 0xb7, 0xd3, 0xe2, 0x7f, 0x84, 0x9d, 0x33, 0xef, 0xe1, 0xe4, 0x8d, 0x5a, 0x11, 0x67, 0x2e, 0xfc, + 0x1b, 0xb3, 0x4d, 0x25, 0x92, 0xa8, 0xf8, 0x73, 0x68, 0xb8, 0x81, 0xc7, 0x43, 0xcf, 0x97, 0x4c, + 0x70, 0xb5, 0x41, 0x8a, 0xbd, 0x99, 0x65, 0x77, 0xef, 0x0d, 0x71, 0x0e, 0x69, 0xff, 0x8c, 0xd6, + 0x3b, 0x80, 0x8f, 0xa0, 0x14, 0x71, 0x16, 0x77, 0xb3, 0x79, 0xf0, 0xe1, 0xa6, 0x5d, 0x18, 0x5c, + 0x70, 0x26, 0x9d, 0xea, 0xea, 0x71, 0xaf, 0xa4, 0x24, 0xa2, 0x03, 0xf0, 0x33, 0xd8, 0xf9, 0xd6, + 0x9b, 0x47, 0x54, 0xb7, 0xae, 0x48, 0x62, 0xc5, 0x7e, 0x09, 0x1a, 0x83, 0x9f, 0x40, 0xed, 0x82, + 0xcf, 0xd9, 0x82, 0x49, 0x3a, 0x6d, 0x15, 0x70, 0x13, 0xe0, 0x94, 0x8a, 0xe3, 0xf3, 0xaf, 0x96, + 0xc2, 0xbf, 0x6e, 0x21, 0xdc, 0x80, 0xea, 0x29, 0x15, 0xba, 0x94, 0x96, 0x65, 0x3f, 0x22, 0xb0, + 0xdc, 0x7b, 0xfc, 0x29, 0x94, 0xd4, 0x35, 0x35, 0xa9, 0x3c, 0xcd, 0x57, 0x32, 0x70, 0x1f, 0x96, + 0x34, 0x4e, 0x42, 0x49, 0x44, 0x43, 0x31, 0x86, 0xd2, 0x71, 0x20, 0x16, 0xe6, 0xfa, 0x68, 0x19, + 0x37, 0xc1, 0x72, 0x85, 0xb9, 0x30, 0x96, 0x2b, 0x70, 0x1f, 0xca, 0xa3, 0x85, 0x22, 0xda, 0x7a, + 0x41, 0x8c, 0x1f, 0x77, 0x01, 0xce, 0xa2, 0xcb, 0x39, 0xf3, 0xbf, 0xa1, 0x0f, 0xa1, 0xbe, 0x1d, + 0x0d, 0x92, 0xb1, 0xd8, 0x47, 0xa0, 0xcf, 0xc6, 0x75, 0xa8, 0x5c, 0xf0, 0x1b, 0x2e, 0xee, 0x78, + 0xab, 0xa0, 0x4a, 0x49, 0x96, 0xac, 0x85, 0x70, 0xcd, 0x0c, 0xae, 0x65, 0x29, 0xf1, 0x84, 0x73, + 0x1a, 0xb4, 0x8a, 0xf6, 0xaf, 0x45, 0x80, 0x73, 0x2a, 0xe5, 0x9c, 0x2e, 0x28, 0xd7, 0xad, 0xd3, + 0x8d, 0x30, 0x23, 0x8d, 0x15, 0xfc, 0xc5, 0xc6, 0x81, 0xe6, 0x26, 0xb2, 0xe6, 0x18, 0xb8, 0xf7, + 0xf9, 0xa9, 0x76, 0x26, 0x50, 0x25, 0xd4, 0xa7, 0xec, 0x96, 0x06, 0xa6, 0x05, 0x68, 0x43, 0x0b, + 0xac, 0xff, 0x6f, 0x41, 0xe7, 0x14, 0x6a, 0xe9, 0x7a, 0xe3, 0x8f, 0xa0, 0x38, 0x4e, 0x9f, 0xb1, + 0xba, 0x79, 0xc6, 0x94, 0x89, 0xa8, 0x1f, 0x6c, 0xc3, 0xce, 0xf9, 0xd7, 0x27, 0x93, 0x38, 0xd3, + 0x86, 0xd3, 0x30, 0x80, 0x92, 0x32, 0x92, 0xd8, 0xd5, 0xf9, 0x2d, 0x1e, 0x6d, 0x32, 0x27, 0x94, + 0x99, 0xd3, 0x24, 0x73, 0x94, 0xc9, 0xab, 0xb7, 0xa5, 0xd8, 0x14, 0x67, 0xf6, 0x39, 0x93, 0xe3, + 0x18, 0x6a, 0x49, 0xd9, 0xea, 0x95, 0x54, 0x2d, 0xdb, 0xdb, 0xc2, 0x92, 0xe0, 0x12, 0x92, 0x34, + 0xce, 0x3e, 0xdc, 0xf2, 0x2c, 0xbc, 0xa7, 0x03, 0x76, 0xff, 0xdd, 0x47, 0x09, 0xef, 0x42, 0x79, + 0x7c, 0x4d, 0x7f, 0x8a, 0xa8, 0x29, 0xd5, 0x68, 0xce, 0x97, 0x6f, 0x57, 0x5d, 0xf4, 0xc7, 0xaa, + 0x8b, 0xfe, 0x5a, 0x75, 0xd1, 0x3f, 0xab, 0x2e, 0xfa, 0xe5, 0xdf, 0x6e, 0xe1, 0x87, 0x17, 0x99, + 0xcf, 0x0c, 0x0f, 0x97, 0xbe, 0xbf, 0x3f, 0xa5, 0xb7, 0x43, 0x4e, 0xc5, 0x55, 0xb8, 0xef, 0x2d, + 0xd9, 0x70, 0x5d, 0xc7, 0x65, 0x59, 0x7f, 0x69, 0x5e, 0xfe, 0x17, 0x00, 0x00, 0xff, 0xff, 0x8f, + 0x4d, 0xeb, 0x13, 0xd5, 0x06, 0x00, 0x00, } func (m *Account) Marshal() (dAtA []byte, err error) { diff --git a/accounting/types.proto b/accounting/types.proto index ac512b9..1af83c1 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 c78e5b4..424993a 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 11c5608..735fb85 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 d80b01c..0e299e7 100644 --- a/accounting/withdraw.pb.go +++ b/accounting/withdraw.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - decimal "github.com/nspcc-dev/neofs-proto/decimal" - service "github.com/nspcc-dev/neofs-proto/service" + decimal "github.com/nspcc-dev/neofs-api/decimal" + service "github.com/nspcc-dev/neofs-api/service" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -461,45 +461,45 @@ func init() { func init() { proto.RegisterFile("accounting/withdraw.proto", fileDescriptor_b3a38a4dc2575267) } var fileDescriptor_b3a38a4dc2575267 = []byte{ - // 600 bytes of a gzipped FileDescriptorProto + // 602 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x55, 0xc1, 0x6e, 0xd3, 0x4c, 0x10, 0xee, 0xda, 0x69, 0xda, 0x7f, 0xd2, 0x1f, 0xca, 0x0a, 0x8a, 0xeb, 0x43, 0x1a, 0xf9, 0x80, - 0x82, 0x20, 0xb6, 0x54, 0xa4, 0x08, 0xc4, 0x01, 0x35, 0x58, 0x6a, 0x2d, 0x51, 0x11, 0xf9, 0x00, - 0x12, 0x37, 0xc7, 0x99, 0x38, 0x96, 0x12, 0x3b, 0xd8, 0xeb, 0x44, 0x7d, 0x08, 0xee, 0x3c, 0x03, - 0x17, 0xae, 0x3c, 0x42, 0x8f, 0x3d, 0x02, 0x87, 0x08, 0x85, 0x77, 0xe0, 0x8c, 0xbc, 0x5e, 0xd7, - 0x4e, 0x53, 0x89, 0x0a, 0x81, 0x2a, 0x4e, 0xd9, 0x9d, 0x6f, 0x66, 0x77, 0xe6, 0xfb, 0xbe, 0x8d, - 0x61, 0xd7, 0x71, 0xdd, 0x30, 0x09, 0x98, 0x1f, 0x78, 0xc6, 0xcc, 0x67, 0xc3, 0x7e, 0xe4, 0xcc, - 0xf4, 0x49, 0x14, 0xb2, 0x90, 0x42, 0x01, 0xa9, 0x34, 0xc6, 0x68, 0xea, 0xbb, 0x68, 0x8c, 0x91, - 0x39, 0x19, 0xae, 0xde, 0xce, 0x63, 0x53, 0x8c, 0xfc, 0xc1, 0x89, 0x88, 0xde, 0xe9, 0xa3, 0xeb, - 0x8f, 0x9d, 0x91, 0x21, 0x7e, 0x45, 0xb8, 0xe5, 0xf9, 0x6c, 0x98, 0xf4, 0x74, 0x37, 0x1c, 0x1b, - 0x5e, 0xe8, 0x85, 0x06, 0x0f, 0xf7, 0x92, 0x01, 0xdf, 0xf1, 0x0d, 0x5f, 0x65, 0xe9, 0xda, 0x47, - 0x02, 0x15, 0x8b, 0xe1, 0x98, 0x36, 0x40, 0xb2, 0x4c, 0x85, 0x34, 0x48, 0x73, 0xab, 0xb3, 0x7d, - 0x3a, 0xdf, 0x5b, 0xfb, 0x3a, 0xdf, 0xdb, 0x7c, 0x3e, 0xc4, 0xb7, 0x09, 0x5a, 0xa6, 0x2d, 0x59, - 0x26, 0xbd, 0x0f, 0x1b, 0x2f, 0x67, 0x01, 0x46, 0x96, 0xa9, 0x48, 0x3c, 0xed, 0xa6, 0x48, 0xcb, - 0xc3, 0x76, 0xbe, 0xa0, 0x4d, 0xa8, 0x1e, 0x8c, 0xd3, 0x91, 0x14, 0xb9, 0x41, 0x9a, 0xb5, 0xfd, - 0x6d, 0x3d, 0x6f, 0xd2, 0xcc, 0x7e, 0x6d, 0x81, 0xd3, 0x1d, 0xa8, 0x1e, 0xa1, 0xef, 0x0d, 0x99, - 0x52, 0x69, 0x90, 0x66, 0xc5, 0x16, 0x3b, 0xaa, 0xc0, 0x46, 0xd7, 0x39, 0x19, 0x85, 0x4e, 0x5f, - 0x59, 0x4f, 0x2f, 0xb3, 0xf3, 0xad, 0xf6, 0x85, 0x00, 0x1c, 0x22, 0xb3, 0xd3, 0xce, 0x62, 0xf6, - 0x67, 0xfb, 0x7e, 0x0c, 0x95, 0x63, 0x64, 0x8e, 0xd2, 0xe3, 0x5d, 0xab, 0xba, 0x20, 0x5e, 0x17, - 0x97, 0xa5, 0xd8, 0x11, 0x3a, 0x7d, 0x8c, 0x3a, 0x9b, 0xe9, 0x19, 0x67, 0xf3, 0x3d, 0x62, 0xf3, - 0x0a, 0x6a, 0x42, 0xf5, 0x15, 0x57, 0x47, 0x71, 0x79, 0xad, 0x76, 0xb1, 0x96, 0xa3, 0xbe, 0xeb, - 0x30, 0x3f, 0x0c, 0x56, 0xce, 0x10, 0xb5, 0xda, 0x53, 0xa8, 0xf1, 0xd1, 0xe2, 0x49, 0x18, 0xc4, - 0x48, 0x1f, 0xc2, 0xe6, 0x6b, 0x61, 0x15, 0x3e, 0x61, 0x4a, 0x64, 0xe1, 0x15, 0x3d, 0xd5, 0xcd, - 0x3e, 0xcf, 0xd0, 0x3e, 0x48, 0x00, 0xdd, 0xe4, 0x9c, 0x98, 0xd2, 0xd8, 0xe4, 0xca, 0x72, 0x49, - 0x57, 0x96, 0x4b, 0x5e, 0x92, 0xcb, 0x80, 0xff, 0x8e, 0x31, 0x8e, 0x1d, 0x0f, 0x2d, 0x93, 0x2b, - 0xb9, 0xd5, 0xb9, 0x25, 0xae, 0x2b, 0x00, 0xbb, 0x58, 0x5e, 0x3b, 0xd3, 0x06, 0xd4, 0x38, 0x57, - 0x82, 0xe9, 0x5f, 0xba, 0x48, 0xfb, 0x44, 0xa0, 0xf6, 0xc2, 0x8f, 0x7f, 0x87, 0xde, 0xeb, 0x9e, - 0xb5, 0x0d, 0x5b, 0x59, 0xe7, 0x62, 0xd8, 0x7b, 0xb0, 0x9e, 0x5a, 0x27, 0x56, 0x48, 0x43, 0xbe, - 0xd4, 0x53, 0x19, 0xac, 0xbd, 0x93, 0xe0, 0x7f, 0x13, 0x47, 0xc8, 0xf0, 0xaf, 0x3c, 0xb6, 0x25, - 0xcf, 0xc8, 0xff, 0x80, 0x67, 0xb6, 0xe1, 0x46, 0x4e, 0x47, 0xc6, 0xe4, 0xfe, 0x0f, 0x52, 0xbc, - 0x50, 0xda, 0x06, 0xf9, 0x10, 0x19, 0xdd, 0x29, 0xd3, 0x59, 0xfc, 0x51, 0xa9, 0x77, 0x57, 0xe2, - 0x42, 0x8e, 0x36, 0xc8, 0xdd, 0xe4, 0x42, 0x5d, 0xf1, 0x8e, 0x97, 0xeb, 0xca, 0x9e, 0x7d, 0x02, - 0x95, 0x54, 0x56, 0xba, 0x94, 0x50, 0xb2, 0xa8, 0xaa, 0xac, 0x02, 0xa2, 0xf4, 0x19, 0x54, 0xb3, - 0x49, 0xe8, 0x6e, 0x39, 0x67, 0x49, 0x6c, 0x55, 0xbd, 0x0c, 0xca, 0x0e, 0xe8, 0x1c, 0x9c, 0x2e, - 0xea, 0xe4, 0x6c, 0x51, 0x27, 0x9f, 0x17, 0x75, 0xf2, 0x6d, 0x51, 0x27, 0xef, 0xbf, 0xd7, 0xd7, - 0xde, 0x3c, 0x28, 0x7d, 0x7b, 0x82, 0x78, 0xe2, 0xba, 0xad, 0x3e, 0x4e, 0x8d, 0x00, 0xc3, 0x41, - 0xdc, 0xca, 0xbe, 0x3c, 0xc5, 0x89, 0xbd, 0x2a, 0x8f, 0x3c, 0xfa, 0x19, 0x00, 0x00, 0xff, 0xff, - 0x39, 0x77, 0x4b, 0x08, 0x19, 0x07, 0x00, 0x00, + 0x52, 0x89, 0xd8, 0x52, 0x91, 0x22, 0x10, 0x87, 0x8a, 0x60, 0xa9, 0xb5, 0x44, 0x45, 0xe4, 0x03, + 0x48, 0xdc, 0x1c, 0x67, 0xe2, 0x58, 0x4a, 0xec, 0x60, 0xaf, 0x13, 0xf5, 0x21, 0xb8, 0xf3, 0x0c, + 0x5c, 0xb8, 0xf2, 0x08, 0x3d, 0xf6, 0x08, 0x1c, 0x22, 0x14, 0xde, 0x81, 0x33, 0xf2, 0x7a, 0x5d, + 0x3b, 0x4d, 0x25, 0x2a, 0x04, 0xaa, 0x38, 0x65, 0x77, 0xbe, 0x99, 0xdd, 0x99, 0xef, 0xfb, 0x36, + 0x86, 0x5d, 0xc7, 0x75, 0xc3, 0x24, 0x60, 0x7e, 0xe0, 0x19, 0x33, 0x9f, 0x0d, 0xfb, 0x91, 0x33, + 0xd3, 0x27, 0x51, 0xc8, 0x42, 0x0a, 0x05, 0xa4, 0xd2, 0x18, 0xa3, 0xa9, 0xef, 0xa2, 0x31, 0x46, + 0xe6, 0x64, 0xb8, 0x7a, 0x37, 0x8f, 0x4d, 0x31, 0xf2, 0x07, 0xa7, 0x22, 0x7a, 0xaf, 0x8f, 0xae, + 0x3f, 0x76, 0x46, 0x86, 0xf8, 0x15, 0xe1, 0x96, 0xe7, 0xb3, 0x61, 0xd2, 0xd3, 0xdd, 0x70, 0x6c, + 0x78, 0xa1, 0x17, 0x1a, 0x3c, 0xdc, 0x4b, 0x06, 0x7c, 0xc7, 0x37, 0x7c, 0x95, 0xa5, 0x6b, 0x1f, + 0x09, 0x54, 0x2c, 0x86, 0x63, 0xda, 0x00, 0xc9, 0x32, 0x15, 0xd2, 0x20, 0xcd, 0xad, 0xce, 0xf6, + 0xd9, 0x7c, 0x6f, 0xed, 0xeb, 0x7c, 0x6f, 0xf3, 0xf9, 0x10, 0xdf, 0x26, 0x68, 0x99, 0xb6, 0x64, + 0x99, 0x74, 0x1f, 0x36, 0x5e, 0xce, 0x02, 0x8c, 0x2c, 0x53, 0x91, 0x78, 0xda, 0x6d, 0x91, 0x96, + 0x87, 0xed, 0x7c, 0x41, 0x9b, 0x50, 0x7d, 0x36, 0x4e, 0x47, 0x52, 0xe4, 0x06, 0x69, 0xd6, 0x0e, + 0xb6, 0xf5, 0xbc, 0x49, 0x33, 0xfb, 0xb5, 0x05, 0x4e, 0x77, 0xa0, 0x7a, 0x8c, 0xbe, 0x37, 0x64, + 0x4a, 0xa5, 0x41, 0x9a, 0x15, 0x5b, 0xec, 0xa8, 0x02, 0x1b, 0x5d, 0xe7, 0x74, 0x14, 0x3a, 0x7d, + 0x65, 0x3d, 0xbd, 0xcc, 0xce, 0xb7, 0xda, 0x17, 0x02, 0x70, 0x84, 0xcc, 0x4e, 0x3b, 0x8b, 0xd9, + 0x9f, 0xed, 0xfb, 0x31, 0x54, 0x4e, 0x90, 0x39, 0x4a, 0x8f, 0x77, 0xad, 0xea, 0x82, 0x78, 0x5d, + 0x5c, 0x96, 0x62, 0xc7, 0xe8, 0xf4, 0x31, 0xea, 0x6c, 0xa6, 0x67, 0x9c, 0xcf, 0xf7, 0x88, 0xcd, + 0x2b, 0xa8, 0x09, 0xd5, 0x57, 0x5c, 0x1d, 0xc5, 0xe5, 0xb5, 0xda, 0xe5, 0x5a, 0x8e, 0xfa, 0xae, + 0xc3, 0xfc, 0x30, 0x58, 0x39, 0x43, 0xd4, 0x6a, 0x4f, 0xa1, 0xc6, 0x47, 0x8b, 0x27, 0x61, 0x10, + 0x23, 0x7d, 0x08, 0x9b, 0xaf, 0x85, 0x55, 0xf8, 0x84, 0x29, 0x91, 0x85, 0x57, 0xf4, 0x54, 0x37, + 0xfb, 0x22, 0x43, 0xfb, 0x20, 0x01, 0x74, 0x93, 0x0b, 0x62, 0x4a, 0x63, 0x93, 0x6b, 0xcb, 0x25, + 0x5d, 0x5b, 0x2e, 0x79, 0x49, 0x2e, 0x03, 0xfe, 0x3b, 0xc1, 0x38, 0x76, 0x3c, 0xb4, 0x4c, 0xae, + 0xe4, 0x56, 0xe7, 0x8e, 0xb8, 0xae, 0x00, 0xec, 0x62, 0x79, 0xe3, 0x4c, 0x1b, 0x50, 0xe3, 0x5c, + 0x09, 0xa6, 0x7f, 0xe9, 0x22, 0xed, 0x13, 0x81, 0xda, 0x0b, 0x3f, 0xfe, 0x1d, 0x7a, 0x6f, 0x7a, + 0xd6, 0x36, 0x6c, 0x65, 0x9d, 0x8b, 0x61, 0x1f, 0xc0, 0x7a, 0x6a, 0x9d, 0x58, 0x21, 0x0d, 0xf9, + 0x4a, 0x4f, 0x65, 0xb0, 0xf6, 0x4e, 0x82, 0xff, 0x4d, 0x1c, 0x21, 0xc3, 0xbf, 0xf2, 0xd8, 0x96, + 0x3c, 0x23, 0xff, 0x03, 0x9e, 0xd9, 0x86, 0x5b, 0x39, 0x1d, 0x19, 0x93, 0x07, 0x3f, 0x48, 0xf1, + 0x42, 0x69, 0x1b, 0xe4, 0x23, 0x64, 0x74, 0xa7, 0x4c, 0x67, 0xf1, 0x47, 0xa5, 0xde, 0x5f, 0x89, + 0x0b, 0x39, 0xda, 0x20, 0x77, 0x93, 0x4b, 0x75, 0xc5, 0x3b, 0x5e, 0xae, 0x2b, 0x7b, 0xf6, 0x09, + 0x54, 0x52, 0x59, 0xe9, 0x52, 0x42, 0xc9, 0xa2, 0xaa, 0xb2, 0x0a, 0x88, 0xd2, 0x43, 0xa8, 0x66, + 0x93, 0xd0, 0xdd, 0x72, 0xce, 0x92, 0xd8, 0xaa, 0x7a, 0x15, 0x94, 0x1d, 0xd0, 0x39, 0x3c, 0x5b, + 0xd4, 0xc9, 0xf9, 0xa2, 0x4e, 0x3e, 0x2f, 0xea, 0xe4, 0xdb, 0xa2, 0x4e, 0xde, 0x7f, 0xaf, 0xaf, + 0xbd, 0xd9, 0x2f, 0x7d, 0x7b, 0x82, 0x78, 0xe2, 0xba, 0xad, 0x3e, 0x4e, 0x8d, 0x00, 0xc3, 0x41, + 0xdc, 0x72, 0x26, 0xbe, 0x51, 0x9c, 0xd7, 0xab, 0xf2, 0xcf, 0xcf, 0xa3, 0x9f, 0x01, 0x00, 0x00, + 0xff, 0xff, 0xe2, 0xb5, 0x2a, 0x26, 0x17, 0x07, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/accounting/withdraw.proto b/accounting/withdraw.proto index a44e47a..85000b9 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 e67ea6d..e068728 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 7165399..163ff9b 100644 --- a/bootstrap/service.pb.go +++ b/bootstrap/service.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - service "github.com/nspcc-dev/neofs-proto/service" + service "github.com/nspcc-dev/neofs-api/service" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -86,28 +86,28 @@ func init() { proto.RegisterFile("bootstrap/service.proto", fileDescriptor_21bce var fileDescriptor_21bce759c9d8eb63 = []byte{ // 342 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x50, 0xbd, 0x4e, 0xeb, 0x30, - 0x14, 0xae, 0xaf, 0x72, 0xfb, 0xe3, 0xbb, 0xf9, 0x16, 0x11, 0x65, 0x48, 0xaa, 0x4e, 0x15, 0x22, - 0x89, 0xd4, 0x2e, 0x8c, 0x55, 0xc4, 0x00, 0x43, 0x11, 0x0a, 0x88, 0x81, 0xcd, 0x71, 0x4e, 0x4a, - 0x86, 0xc6, 0xc6, 0x76, 0x2b, 0xf5, 0x4d, 0x78, 0xa4, 0x8e, 0x1d, 0x11, 0x43, 0x84, 0x82, 0xc4, - 0x73, 0xa0, 0xb8, 0x69, 0xa9, 0x60, 0xb2, 0xcf, 0xf7, 0xe7, 0xe3, 0x0f, 0x9f, 0x26, 0x9c, 0x6b, - 0xa5, 0x25, 0x15, 0xa1, 0x02, 0xb9, 0xca, 0x19, 0x04, 0x42, 0x72, 0xcd, 0x49, 0xef, 0x40, 0x38, - 0xa4, 0x61, 0xc2, 0x05, 0x68, 0xba, 0xa3, 0x9d, 0xfe, 0x1e, 0x5b, 0x81, 0xcc, 0xb3, 0x75, 0x83, - 0x9e, 0x7c, 0xa7, 0xe9, 0xb5, 0x00, 0xd5, 0xc0, 0xfe, 0x3c, 0xd7, 0x4f, 0xcb, 0x24, 0x60, 0x7c, - 0x11, 0xce, 0xf9, 0x9c, 0x87, 0x06, 0x4e, 0x96, 0x99, 0x99, 0xcc, 0x60, 0x6e, 0x3b, 0xf9, 0xf0, - 0x13, 0xe1, 0x4e, 0x0c, 0xcf, 0x4b, 0x50, 0x9a, 0x9c, 0x63, 0xab, 0x4e, 0xb2, 0xd1, 0x00, 0x8d, - 0xfe, 0x46, 0xf6, 0xa6, 0xf4, 0x5a, 0x6f, 0xa5, 0xd7, 0xbd, 0xe1, 0x29, 0xdc, 0xaf, 0x05, 0x54, - 0xa5, 0x67, 0xd5, 0x67, 0x6c, 0x54, 0xc4, 0xc7, 0x56, 0x5e, 0x64, 0xdc, 0xfe, 0x33, 0x40, 0xa3, - 0x7f, 0xe3, 0xff, 0xc1, 0x61, 0x9d, 0xa0, 0x36, 0x5c, 0x17, 0x19, 0x8f, 0xac, 0x3a, 0x22, 0x36, - 0x32, 0x72, 0x81, 0xad, 0x19, 0x68, 0x6a, 0x27, 0x46, 0xee, 0x04, 0xfb, 0x06, 0x9a, 0xc7, 0x6b, - 0xee, 0x0a, 0x68, 0x0a, 0x32, 0xea, 0xd6, 0xae, 0x6d, 0xe9, 0xa1, 0xd8, 0x38, 0xc8, 0x25, 0x6e, - 0x3f, 0x98, 0x8f, 0xdb, 0xcc, 0x78, 0x87, 0x3f, 0xbd, 0x86, 0xcd, 0x19, 0xd5, 0x39, 0x2f, 0x7e, - 0x65, 0x34, 0xde, 0xf1, 0x14, 0xf7, 0xa2, 0xfd, 0x86, 0x64, 0x82, 0x3b, 0xb7, 0x92, 0x33, 0x50, - 0x8a, 0x90, 0xa3, 0xc5, 0x9b, 0x3c, 0xa7, 0x7f, 0x84, 0xdd, 0x09, 0x09, 0x34, 0x9d, 0x51, 0x11, - 0x4d, 0x37, 0x95, 0x8b, 0xb6, 0x95, 0x8b, 0x5e, 0x2b, 0x17, 0xbd, 0x57, 0x2e, 0x7a, 0xf9, 0x70, - 0x5b, 0x8f, 0x67, 0x47, 0x7d, 0x17, 0x4a, 0x30, 0xe6, 0xa7, 0xb0, 0x0a, 0x0b, 0xe0, 0x99, 0xf2, - 0x77, 0x6d, 0x1f, 0xb2, 0x92, 0xb6, 0x01, 0x26, 0x5f, 0x01, 0x00, 0x00, 0xff, 0xff, 0xfe, 0xcb, - 0xf7, 0x92, 0x09, 0x02, 0x00, 0x00, + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x50, 0xbb, 0x4e, 0xf3, 0x30, + 0x14, 0xae, 0x7f, 0xe5, 0xef, 0xc5, 0x6c, 0xa6, 0x88, 0x28, 0x43, 0x52, 0x75, 0xea, 0x40, 0x12, + 0xa9, 0x5d, 0x98, 0x10, 0x8a, 0x18, 0x60, 0x28, 0x42, 0x01, 0x31, 0xb0, 0x39, 0xc9, 0x49, 0xf1, + 0xd0, 0xd8, 0xd8, 0x6e, 0xa5, 0xbe, 0x09, 0x8f, 0xd4, 0xb1, 0x23, 0x62, 0x88, 0x50, 0x90, 0x78, + 0x0e, 0x14, 0x37, 0x2d, 0x15, 0x4c, 0xf6, 0xf9, 0x6e, 0x3e, 0xfe, 0xf0, 0x69, 0xc2, 0xb9, 0x56, + 0x5a, 0x52, 0x11, 0x2a, 0x90, 0x4b, 0x96, 0x42, 0x20, 0x24, 0xd7, 0x9c, 0xf4, 0xf6, 0x84, 0x43, + 0x1a, 0x26, 0x9c, 0x83, 0xa6, 0x5b, 0xda, 0xe9, 0xef, 0xb0, 0x25, 0x48, 0x96, 0xaf, 0x1a, 0xf4, + 0xe4, 0x27, 0x4d, 0xaf, 0x04, 0xa8, 0x06, 0xf6, 0x67, 0x4c, 0x3f, 0x2f, 0x92, 0x20, 0xe5, 0xf3, + 0x70, 0xc6, 0x67, 0x3c, 0x34, 0x70, 0xb2, 0xc8, 0xcd, 0x64, 0x06, 0x73, 0xdb, 0xca, 0x87, 0x5f, + 0x08, 0x77, 0x62, 0x78, 0x59, 0x80, 0xd2, 0xe4, 0x0c, 0x5b, 0x75, 0x92, 0x8d, 0x06, 0x68, 0xf4, + 0x3f, 0xb2, 0xd7, 0xa5, 0xd7, 0x7a, 0x2f, 0xbd, 0xee, 0x2d, 0xcf, 0xe0, 0x61, 0x25, 0xa0, 0x2a, + 0x3d, 0xab, 0x3e, 0x63, 0xa3, 0x22, 0x3e, 0xb6, 0x58, 0x91, 0x73, 0xfb, 0xdf, 0x00, 0x8d, 0x8e, + 0xc6, 0xc7, 0xc1, 0x7e, 0x9d, 0xa0, 0x36, 0xdc, 0x14, 0x39, 0x8f, 0xac, 0x3a, 0x22, 0x36, 0x32, + 0x72, 0x8e, 0xad, 0x29, 0x68, 0x6a, 0x27, 0x46, 0xee, 0x04, 0xbb, 0x06, 0x9a, 0xc7, 0x6b, 0xee, + 0x1a, 0x68, 0x06, 0x32, 0xea, 0xd6, 0xae, 0x4d, 0xe9, 0xa1, 0xd8, 0x38, 0xc8, 0x15, 0x6e, 0x3f, + 0x9a, 0x8f, 0xdb, 0xa9, 0xf1, 0x0e, 0x7f, 0x7b, 0x0d, 0xcb, 0x52, 0xaa, 0x19, 0x2f, 0xfe, 0x64, + 0x34, 0xde, 0xf1, 0x25, 0xee, 0x45, 0xbb, 0x0d, 0xc9, 0x04, 0x77, 0xee, 0x24, 0x4f, 0x41, 0x29, + 0x42, 0x0e, 0x16, 0x6f, 0xf2, 0x9c, 0xfe, 0x01, 0x76, 0x2f, 0x24, 0xd0, 0x6c, 0x4a, 0x45, 0x74, + 0xb1, 0xae, 0x5c, 0xb4, 0xa9, 0x5c, 0xf4, 0x56, 0xb9, 0xe8, 0xa3, 0x72, 0xd1, 0xeb, 0xa7, 0xdb, + 0x7a, 0x1a, 0x1d, 0xf4, 0x5d, 0x28, 0x91, 0xa6, 0x7e, 0x06, 0xcb, 0xb0, 0x00, 0x9e, 0x2b, 0x9f, + 0x0a, 0x16, 0xee, 0x93, 0x92, 0xb6, 0x69, 0x7c, 0xf2, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xa2, + 0x5a, 0xfd, 0x07, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/bootstrap/service.proto b/bootstrap/service.proto index f0bf755..fa0248c 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 6fcf0ed..6c21b73 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 f279919..83af13d 100644 --- a/bootstrap/types.pb.go +++ b/bootstrap/types.pb.go @@ -146,29 +146,29 @@ func init() { func init() { proto.RegisterFile("bootstrap/types.proto", fileDescriptor_423083266369adee) } var fileDescriptor_423083266369adee = []byte{ - // 345 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xcb, 0x4a, 0xc3, 0x40, - 0x18, 0x85, 0x33, 0x6d, 0x4d, 0xcd, 0xd4, 0x85, 0xc6, 0x16, 0x82, 0x48, 0x12, 0x0a, 0x42, 0x90, - 0x36, 0xc1, 0xcb, 0x0b, 0x18, 0x10, 0x14, 0x69, 0x95, 0xd4, 0x95, 0xbb, 0x5c, 0xa6, 0x17, 0xa4, - 0xf9, 0x87, 0xcc, 0x44, 0xc8, 0xce, 0xc7, 0xf0, 0x89, 0xa4, 0x4b, 0x97, 0xc5, 0x45, 0xd0, 0xb8, - 0xcb, 0x53, 0x48, 0x27, 0x6d, 0xe9, 0xee, 0x3f, 0xe7, 0x7c, 0x33, 0xf3, 0xcf, 0xc1, 0x9d, 0x00, - 0x80, 0x33, 0x9e, 0xf8, 0xd4, 0xe1, 0x19, 0x25, 0xcc, 0xa6, 0x09, 0x70, 0x50, 0x95, 0xad, 0x7d, - 0xd2, 0x9f, 0xcc, 0xf8, 0x34, 0x0d, 0xec, 0x10, 0xe6, 0xce, 0x04, 0x26, 0xe0, 0x08, 0x22, 0x48, - 0xc7, 0x42, 0x09, 0x21, 0xa6, 0xea, 0x64, 0xf7, 0x19, 0x2b, 0x23, 0x9a, 0x10, 0x3f, 0x1a, 0xf8, - 0x54, 0x6d, 0xe3, 0xbd, 0x5b, 0x0a, 0xe1, 0x54, 0x43, 0x26, 0xb2, 0x1a, 0x5e, 0x25, 0xd4, 0x0b, - 0x2c, 0x0f, 0x09, 0x1f, 0xf8, 0x54, 0xab, 0x99, 0x75, 0xab, 0x75, 0x79, 0x6c, 0x6f, 0x5f, 0xb3, - 0x87, 0x10, 0x91, 0xfb, 0x78, 0x0c, 0x6e, 0x63, 0x91, 0x1b, 0x92, 0xb7, 0x06, 0xbb, 0x9f, 0x08, - 0xef, 0x6f, 0x22, 0xf5, 0x0c, 0x37, 0x6f, 0xa2, 0x28, 0x21, 0x8c, 0x89, 0x7b, 0x15, 0xb7, 0x55, - 0xe6, 0x46, 0xd3, 0xaf, 0x2c, 0x6f, 0x93, 0xa9, 0x3d, 0x2c, 0x3f, 0xa5, 0xc1, 0x03, 0xc9, 0xb4, - 0x9a, 0x89, 0xac, 0x03, 0xb7, 0x5d, 0xe6, 0xc6, 0x21, 0x4d, 0x83, 0x57, 0x92, 0xf5, 0x60, 0x3e, - 0xe3, 0x64, 0x4e, 0x79, 0xe6, 0xad, 0x19, 0xd5, 0xc1, 0xcd, 0x47, 0xca, 0x67, 0x10, 0x33, 0xad, - 0x6e, 0xd6, 0x2d, 0xc5, 0xed, 0x94, 0xb9, 0x71, 0x04, 0x95, 0xb5, 0xc3, 0x6f, 0x28, 0xf5, 0x1a, - 0xcb, 0x23, 0xee, 0xf3, 0x94, 0x69, 0x8d, 0xd5, 0xe7, 0xdc, 0xd3, 0xd5, 0xc2, 0xdf, 0xb9, 0x81, - 0x57, 0x7b, 0x56, 0x49, 0x99, 0x1b, 0x32, 0x13, 0x93, 0xb7, 0x66, 0xdd, 0xbb, 0xe5, 0xaf, 0x2e, - 0xbd, 0x17, 0xba, 0xb4, 0x28, 0x74, 0xf4, 0x55, 0xe8, 0x68, 0x59, 0xe8, 0xe8, 0xa7, 0xd0, 0xd1, - 0xc7, 0x9f, 0x2e, 0xbd, 0x9c, 0xef, 0x74, 0x1d, 0x33, 0x1a, 0x86, 0xfd, 0x88, 0xbc, 0x39, 0x31, - 0x81, 0x31, 0xeb, 0x57, 0x4d, 0x6f, 0x9b, 0x0a, 0x64, 0x61, 0x5c, 0xfd, 0x07, 0x00, 0x00, 0xff, - 0xff, 0x71, 0xeb, 0x37, 0x57, 0xc2, 0x01, 0x00, 0x00, + // 348 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x4c, 0x90, 0xcd, 0x4a, 0xfb, 0x40, + 0x14, 0xc5, 0x33, 0x6d, 0xff, 0xe9, 0x3f, 0x53, 0x17, 0x1a, 0x5b, 0x08, 0x22, 0x49, 0x28, 0x08, + 0x59, 0xb4, 0x09, 0x7e, 0xbc, 0x80, 0x01, 0x05, 0x91, 0x56, 0x49, 0x5d, 0xb9, 0xcb, 0xc7, 0xb4, + 0x0d, 0xd2, 0xdc, 0x21, 0x33, 0x11, 0xb2, 0xf3, 0x31, 0x7c, 0x22, 0xe9, 0xd2, 0x65, 0x71, 0x11, + 0x34, 0xee, 0xf2, 0x14, 0xd2, 0x49, 0x5b, 0xba, 0xbb, 0xe7, 0x9c, 0xdf, 0xcc, 0xdc, 0x39, 0xb8, + 0x17, 0x00, 0x70, 0xc6, 0x53, 0x9f, 0x3a, 0x3c, 0xa7, 0x84, 0xd9, 0x34, 0x05, 0x0e, 0xaa, 0xb2, + 0xb3, 0x4f, 0x86, 0xb3, 0x98, 0xcf, 0xb3, 0xc0, 0x0e, 0x61, 0xe1, 0xcc, 0x60, 0x06, 0x8e, 0x20, + 0x82, 0x6c, 0x2a, 0x94, 0x10, 0x62, 0xaa, 0x4f, 0xf6, 0x9f, 0xb0, 0x32, 0xa1, 0x29, 0xf1, 0xa3, + 0x91, 0x4f, 0xd5, 0x2e, 0xfe, 0x77, 0x43, 0x21, 0x9c, 0x6b, 0xc8, 0x44, 0x56, 0xcb, 0xab, 0x85, + 0x7a, 0x8e, 0xe5, 0x31, 0xe1, 0x23, 0x9f, 0x6a, 0x0d, 0xb3, 0x69, 0x75, 0x2e, 0x8e, 0xed, 0xdd, + 0x6b, 0xf6, 0x18, 0x22, 0x72, 0x97, 0x4c, 0xc1, 0x6d, 0x2d, 0x0b, 0x43, 0xf2, 0x36, 0x60, 0xff, + 0x03, 0xe1, 0xff, 0xdb, 0x48, 0x3d, 0xc3, 0xed, 0xeb, 0x28, 0x4a, 0x09, 0x63, 0xe2, 0x5e, 0xc5, + 0xed, 0x54, 0x85, 0xd1, 0xf6, 0x6b, 0xcb, 0xdb, 0x66, 0xea, 0x00, 0xcb, 0x8f, 0x59, 0x70, 0x4f, + 0x72, 0xad, 0x61, 0x22, 0xeb, 0xc0, 0xed, 0x56, 0x85, 0x71, 0x48, 0xb3, 0xe0, 0x85, 0xe4, 0x03, + 0x58, 0xc4, 0x9c, 0x2c, 0x28, 0xcf, 0xbd, 0x0d, 0xa3, 0x3a, 0xb8, 0xfd, 0x40, 0x79, 0x0c, 0x09, + 0xd3, 0x9a, 0x66, 0xd3, 0x52, 0xdc, 0x5e, 0x55, 0x18, 0x47, 0x50, 0x5b, 0x7b, 0xfc, 0x96, 0x52, + 0xaf, 0xb0, 0x3c, 0xe1, 0x3e, 0xcf, 0x98, 0xd6, 0x5a, 0x7f, 0xce, 0x3d, 0x5d, 0x2f, 0xfc, 0x55, + 0x18, 0x78, 0xbd, 0x67, 0x9d, 0x54, 0x85, 0x21, 0x33, 0x31, 0x79, 0x1b, 0xd6, 0xbd, 0x5d, 0xfd, + 0xe8, 0xd2, 0x5b, 0xa9, 0x4b, 0xcb, 0x52, 0x47, 0x9f, 0xa5, 0x8e, 0x56, 0xa5, 0x8e, 0xbe, 0x4b, + 0x1d, 0xbd, 0xff, 0xea, 0xd2, 0xb3, 0xb5, 0xd7, 0x75, 0xc2, 0x68, 0x18, 0x0e, 0x23, 0xf2, 0xea, + 0x24, 0x04, 0xa6, 0x6c, 0xe8, 0xd3, 0xd8, 0xd9, 0xf5, 0x14, 0xc8, 0xa2, 0xed, 0xcb, 0xbf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xc2, 0x29, 0x27, 0x0e, 0xc0, 0x01, 0x00, 0x00, } func (m *SpreadMap) Marshal() (dAtA []byte, err error) { diff --git a/bootstrap/types.proto b/bootstrap/types.proto index 5a566da..02da9ad 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 e760d69..bdc8a65 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 24727ee..01d88fa 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 cac8764..e202a7c 100644 --- a/container/service.pb.go +++ b/container/service.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - service "github.com/nspcc-dev/neofs-proto/service" + service "github.com/nspcc-dev/neofs-api/service" netmap "github.com/nspcc-dev/netmap" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" @@ -391,10 +391,10 @@ func init() { func init() { proto.RegisterFile("container/service.proto", fileDescriptor_e1fa9d7ab2e7ae06) } var fileDescriptor_e1fa9d7ab2e7ae06 = []byte{ - // 580 bytes of a gzipped FileDescriptorProto + // 582 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x54, 0xcb, 0x6e, 0xd3, 0x40, 0x14, 0xed, 0x34, 0xe9, 0x23, 0xd7, 0xe5, 0x35, 0x6a, 0x5a, 0x63, 0x89, 0x24, 0xf2, 0x2a, 0x20, - 0x62, 0x8b, 0x50, 0x09, 0x36, 0x48, 0x34, 0x89, 0x14, 0x2a, 0x51, 0x11, 0x19, 0x89, 0x05, 0x3b, + 0x62, 0x8b, 0x50, 0x09, 0x36, 0x20, 0x35, 0x89, 0x14, 0x2a, 0x51, 0x11, 0x19, 0x89, 0x05, 0x3b, 0x67, 0x7a, 0x13, 0x2c, 0x25, 0xb6, 0xf1, 0x8c, 0x83, 0xf2, 0x27, 0xfc, 0x03, 0x12, 0x6b, 0x3e, 0xa1, 0xcb, 0x2e, 0x11, 0x8b, 0x08, 0x85, 0x25, 0xe2, 0x1f, 0x90, 0xc7, 0xcf, 0xa4, 0x05, 0x96, 0x15, 0x1b, 0x6b, 0xe6, 0x9c, 0x7b, 0xee, 0xdb, 0x03, 0x87, 0xcc, 0x73, 0x85, 0xed, 0xb8, 0x18, @@ -426,9 +426,9 @@ var fileDescriptor_e1fa9d7ab2e7ae06 = []byte{ 0xd9, 0x78, 0xed, 0xee, 0x15, 0x4c, 0x22, 0x3f, 0x82, 0x52, 0x1f, 0x57, 0x83, 0xe6, 0xab, 0xb6, 0x12, 0xb4, 0x38, 0xd4, 0x27, 0x50, 0x8e, 0xaa, 0xa4, 0x45, 0xbe, 0x30, 0x30, 0xed, 0xf0, 0x12, 0x1e, 0x0b, 0x3b, 0xcf, 0xcf, 0x97, 0x35, 0x72, 0xb1, 0xac, 0x91, 0xaf, 0xcb, 0x1a, 0xf9, 0xbe, - 0xac, 0x91, 0x8f, 0x3f, 0x6a, 0x1b, 0x6f, 0xff, 0xf4, 0x34, 0x7b, 0x23, 0xde, 0x8a, 0x1f, 0xdb, - 0xcc, 0xdd, 0x70, 0x5b, 0x02, 0x8f, 0x7f, 0x07, 0x00, 0x00, 0xff, 0xff, 0x31, 0xf8, 0x4f, 0x34, - 0x34, 0x06, 0x00, 0x00, + 0xac, 0x91, 0x8f, 0x3f, 0x6a, 0x1b, 0x6f, 0x9b, 0x7f, 0x78, 0x9a, 0xbd, 0x11, 0x6f, 0xd9, 0xbe, + 0x63, 0x66, 0xce, 0x86, 0xdb, 0xf2, 0xc1, 0x7d, 0xfc, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x31, 0xf8, + 0x12, 0xa0, 0x32, 0x06, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/container/service.proto b/container/service.proto index 9bd02c9..4576197 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 d5d5a77..b718907 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 7a454de..fb22b13 100644 --- a/container/types.pb.go +++ b/container/types.pb.go @@ -190,30 +190,31 @@ func init() { func init() { proto.RegisterFile("container/types.proto", fileDescriptor_1432e52ab0b53e3e) } var fileDescriptor_1432e52ab0b53e3e = []byte{ - // 368 bytes of a gzipped FileDescriptorProto + // 371 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x91, 0x4f, 0x4b, 0xfb, 0x30, 0x1c, 0xc6, 0x97, 0xad, 0xfb, 0xfd, 0x5c, 0x36, 0x11, 0x03, 0x93, 0x32, 0xa4, 0x2b, 0x3b, 0x55, - 0xa1, 0xad, 0x4e, 0xf0, 0xac, 0xdb, 0x44, 0x06, 0x8a, 0x52, 0xd9, 0x45, 0xbc, 0x74, 0x59, 0x36, - 0x0b, 0x5d, 0x53, 0x92, 0x54, 0xd9, 0x3b, 0xf1, 0x25, 0xed, 0xe8, 0x51, 0x3c, 0x4c, 0xa9, 0x6f, - 0x44, 0x9a, 0x6c, 0x75, 0x30, 0xbd, 0xe5, 0x79, 0xf2, 0x79, 0x92, 0xef, 0x1f, 0x58, 0xc7, 0x34, - 0x12, 0x7e, 0x10, 0x11, 0xe6, 0x8a, 0x59, 0x4c, 0xb8, 0x13, 0x33, 0x2a, 0x28, 0xaa, 0xe4, 0x76, - 0xe3, 0x70, 0x12, 0x88, 0xc7, 0x64, 0xe8, 0x60, 0x3a, 0x75, 0x23, 0x1e, 0x63, 0x6c, 0x8f, 0xc8, - 0x93, 0x1b, 0x11, 0x31, 0xf5, 0x63, 0x97, 0x93, 0x90, 0x60, 0x41, 0x99, 0x8a, 0x35, 0xec, 0x35, - 0x76, 0x42, 0x27, 0xd4, 0x95, 0xf6, 0x30, 0x19, 0x4b, 0x25, 0x85, 0x3c, 0x29, 0xbc, 0xf5, 0x01, - 0x60, 0xa5, 0xbb, 0xfa, 0x08, 0x1d, 0xc0, 0xff, 0x37, 0xcf, 0x11, 0x61, 0xfd, 0x9e, 0x0e, 0x4c, - 0x60, 0xd5, 0x3a, 0x3b, 0xf3, 0x45, 0xb3, 0xf0, 0xbe, 0x68, 0xae, 0x6c, 0x6f, 0x75, 0x40, 0x26, - 0xd4, 0xee, 0xfc, 0x50, 0xe8, 0x45, 0xc9, 0xd5, 0x96, 0x9c, 0x36, 0x18, 0xf4, 0x7b, 0x9e, 0xbc, - 0x41, 0x0d, 0xb8, 0xd5, 0xf5, 0x63, 0x1f, 0x07, 0x62, 0xa6, 0x97, 0x4c, 0x60, 0x69, 0x5e, 0xae, - 0xd1, 0x31, 0x2c, 0x7b, 0x49, 0x48, 0xb8, 0xae, 0x99, 0xc0, 0xaa, 0xb6, 0xeb, 0x8e, 0x6a, 0xc6, - 0xb9, 0x0d, 0x7d, 0x4c, 0xa6, 0x24, 0x12, 0xd9, 0x6d, 0x47, 0xcb, 0x5e, 0xf5, 0x14, 0x89, 0x4e, - 0xa1, 0x76, 0x15, 0x70, 0xa1, 0x97, 0x65, 0x62, 0xdf, 0xc9, 0xc7, 0xe3, 0x9c, 0x63, 0x4c, 0x38, - 0xcf, 0xba, 0x60, 0x34, 0xcc, 0x98, 0x65, 0x50, 0xf2, 0xad, 0x07, 0x58, 0x55, 0xc0, 0x25, 0xa3, - 0x49, 0x8c, 0x0c, 0x08, 0x95, 0xbc, 0xa6, 0x23, 0x22, 0xbb, 0xdc, 0xf6, 0xd6, 0x1c, 0x64, 0xc3, - 0xca, 0x80, 0x13, 0x26, 0x61, 0xbd, 0x68, 0x96, 0x7e, 0x1b, 0xc2, 0x0f, 0xd1, 0xba, 0x80, 0xbb, - 0x1b, 0xdf, 0xa3, 0xa3, 0x65, 0xa9, 0xc0, 0x2c, 0x59, 0xd5, 0xf6, 0xde, 0x46, 0xa9, 0x32, 0xba, - 0x5e, 0x64, 0xe7, 0x6c, 0x9e, 0x1a, 0xe0, 0x35, 0x35, 0xc0, 0x5b, 0x6a, 0x80, 0xcf, 0xd4, 0x00, - 0x2f, 0x5f, 0x46, 0xe1, 0xfe, 0xaf, 0xbd, 0xd3, 0x31, 0xb7, 0xd5, 0x26, 0xf3, 0x97, 0x87, 0xff, - 0xa4, 0x71, 0xf2, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x13, 0x1b, 0x01, 0x24, 0x4e, 0x02, 0x00, 0x00, + 0xa1, 0xad, 0x4e, 0xf0, 0x28, 0xb8, 0x4d, 0x64, 0xa0, 0x28, 0x95, 0x5d, 0xc4, 0x4b, 0x97, 0x65, + 0xb3, 0xd0, 0x35, 0x21, 0x49, 0x95, 0xbd, 0x13, 0x5f, 0xd2, 0x8e, 0x1e, 0xc5, 0xc3, 0x94, 0xfa, + 0x46, 0xa4, 0xe9, 0x56, 0x07, 0xd3, 0x5b, 0x9e, 0x27, 0x9f, 0x27, 0xf9, 0xfe, 0x81, 0x75, 0x4c, + 0x23, 0xe9, 0x07, 0x11, 0xe1, 0xae, 0x9c, 0x31, 0x22, 0x1c, 0xc6, 0xa9, 0xa4, 0xa8, 0x92, 0xdb, + 0x8d, 0xc3, 0x49, 0x20, 0x1f, 0xe3, 0xa1, 0x83, 0xe9, 0xd4, 0x8d, 0x04, 0xc3, 0xd8, 0x1e, 0x91, + 0x27, 0x37, 0x22, 0x72, 0xea, 0x33, 0x57, 0x90, 0x90, 0x60, 0x49, 0x79, 0x16, 0x6b, 0xd8, 0x6b, + 0xec, 0x84, 0x4e, 0xa8, 0xab, 0xec, 0x61, 0x3c, 0x56, 0x4a, 0x09, 0x75, 0xca, 0xf0, 0xd6, 0x07, + 0x80, 0x95, 0xee, 0xea, 0x23, 0x74, 0x00, 0xff, 0xdf, 0x3c, 0x47, 0x84, 0xf7, 0x7b, 0x3a, 0x30, + 0x81, 0x55, 0xeb, 0xec, 0xcc, 0x17, 0xcd, 0xc2, 0xfb, 0xa2, 0xb9, 0xb2, 0xbd, 0xd5, 0x01, 0x99, + 0x50, 0xbb, 0xf3, 0x43, 0xa9, 0x17, 0x15, 0x57, 0x5b, 0x72, 0xda, 0x60, 0xd0, 0xef, 0x79, 0xea, + 0x06, 0x35, 0xe0, 0x56, 0xd7, 0x67, 0x3e, 0x0e, 0xe4, 0x4c, 0x2f, 0x99, 0xc0, 0xd2, 0xbc, 0x5c, + 0xa3, 0x63, 0x58, 0xf6, 0xe2, 0x90, 0x08, 0x5d, 0x33, 0x81, 0x55, 0x6d, 0xd7, 0x9d, 0xac, 0x19, + 0xe7, 0x36, 0xf4, 0x31, 0x99, 0x92, 0x48, 0xa6, 0xb7, 0x1d, 0x2d, 0x7d, 0xd5, 0xcb, 0x48, 0x74, + 0x0a, 0xb5, 0xab, 0x40, 0x48, 0xbd, 0xac, 0x12, 0xfb, 0x4e, 0x3e, 0x1e, 0xe7, 0x1c, 0x63, 0x22, + 0x44, 0xda, 0x05, 0xa7, 0x61, 0xca, 0x2c, 0x83, 0x8a, 0x6f, 0x3d, 0xc0, 0x6a, 0x06, 0x5c, 0x72, + 0x1a, 0x33, 0x64, 0x40, 0x98, 0xc9, 0x6b, 0x3a, 0x22, 0xaa, 0xcb, 0x6d, 0x6f, 0xcd, 0x41, 0x36, + 0xac, 0x0c, 0x04, 0xe1, 0x0a, 0xd6, 0x8b, 0x66, 0xe9, 0xb7, 0x21, 0xfc, 0x10, 0xad, 0x0b, 0xb8, + 0xbb, 0xf1, 0x3d, 0x3a, 0x5a, 0x96, 0x0a, 0xcc, 0x92, 0x55, 0x6d, 0xef, 0x6d, 0x94, 0xaa, 0xa2, + 0xeb, 0x45, 0x76, 0xce, 0xe6, 0x89, 0x01, 0x5e, 0x13, 0x03, 0xbc, 0x25, 0x06, 0xf8, 0x4c, 0x0c, + 0xf0, 0xf2, 0x65, 0x14, 0xee, 0xad, 0x3f, 0xf6, 0x4e, 0xc7, 0xc2, 0xf6, 0x59, 0xe0, 0xe6, 0xef, + 0x0e, 0xff, 0xa9, 0x6d, 0x9e, 0x7c, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xe6, 0x51, 0x5d, 0x4c, + 0x02, 0x00, 0x00, } func (m *Container) Marshal() (dAtA []byte, err error) { diff --git a/container/types.proto b/container/types.proto index 4600046..e53587e 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 cfd5f52..0a20d54 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 d2bed7d..c0726a4 100644 --- a/decimal/decimal.pb.go +++ b/decimal/decimal.pb.go @@ -83,7 +83,7 @@ func init() { func init() { proto.RegisterFile("decimal/decimal.proto", fileDescriptor_e7e70e1773836c80) } var fileDescriptor_e7e70e1773836c80 = []byte{ - // 181 bytes of a gzipped FileDescriptorProto + // 183 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x4d, 0x49, 0x4d, 0xce, 0xcc, 0x4d, 0xcc, 0xd1, 0x87, 0xd2, 0x7a, 0x05, 0x45, 0xf9, 0x25, 0xf9, 0x42, 0xec, 0x50, 0xae, 0x94, 0x6e, 0x7a, 0x66, 0x49, 0x46, 0x69, 0x92, 0x5e, 0x72, 0x7e, 0xae, 0x7e, 0x7a, 0x7e, 0x7a, @@ -91,11 +91,11 @@ var fileDescriptor_e7e70e1773836c80 = []byte{ 0x2e, 0x76, 0x17, 0x88, 0x4e, 0x21, 0x11, 0x2e, 0xd6, 0xb0, 0xc4, 0x9c, 0xd2, 0x54, 0x09, 0x46, 0x05, 0x46, 0x0d, 0xe6, 0x20, 0x08, 0x47, 0x48, 0x86, 0x8b, 0x33, 0xa0, 0x28, 0x35, 0x39, 0xb3, 0x38, 0x33, 0x3f, 0x4f, 0x82, 0x49, 0x81, 0x51, 0x83, 0x37, 0x08, 0x21, 0x60, 0xc5, 0x32, 0x63, - 0x81, 0x3c, 0x83, 0x93, 0xdd, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0xde, 0x78, 0x24, - 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x51, 0x1a, 0x48, 0x2e, 0xc9, 0x2b, - 0x2e, 0x48, 0x4e, 0xd6, 0x4d, 0x49, 0x2d, 0xd3, 0xcf, 0x4b, 0xcd, 0x4f, 0x2b, 0xd6, 0x85, 0xb8, - 0x03, 0xea, 0xe6, 0x24, 0x36, 0x30, 0xd7, 0x18, 0x10, 0x00, 0x00, 0xff, 0xff, 0xac, 0x68, 0x21, - 0x20, 0xdc, 0x00, 0x00, 0x00, + 0x81, 0x3c, 0x83, 0x93, 0xcd, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0xde, 0x78, 0x24, + 0xc7, 0xf8, 0xe0, 0x91, 0x1c, 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x51, 0x6a, 0x48, 0x2e, 0xc9, 0x2b, + 0x2e, 0x48, 0x4e, 0xd6, 0x4d, 0x49, 0x2d, 0xd3, 0xcf, 0x4b, 0xcd, 0x4f, 0x2b, 0xd6, 0x4d, 0x2c, + 0xc8, 0x84, 0x79, 0x20, 0x89, 0x0d, 0xec, 0x12, 0x63, 0x40, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8d, + 0xc1, 0x18, 0x3c, 0xda, 0x00, 0x00, 0x00, } func (m *Decimal) Marshal() (dAtA []byte, err error) { diff --git a/decimal/decimal.proto b/decimal/decimal.proto index 42cf2df..e0e16d5 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 688905e..92ae511 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 3688443..de02491 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 f6b10ab..a496413 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 38dbee1..b0afc55 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 9019cae..43013fe 100644 --- a/object/service.pb.go +++ b/object/service.pb.go @@ -8,9 +8,9 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - refs "github.com/nspcc-dev/neofs-proto/refs" - service "github.com/nspcc-dev/neofs-proto/service" - session "github.com/nspcc-dev/neofs-proto/session" + refs "github.com/nspcc-dev/neofs-api/refs" + service "github.com/nspcc-dev/neofs-api/service" + session "github.com/nspcc-dev/neofs-api/session" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -883,60 +883,60 @@ func init() { func init() { proto.RegisterFile("object/service.proto", fileDescriptor_dfcdf610ade6a9ce) } var fileDescriptor_dfcdf610ade6a9ce = []byte{ - // 842 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4b, 0x4f, 0xe3, 0x56, - 0x14, 0xce, 0x8d, 0x83, 0x81, 0x13, 0x07, 0xa2, 0x4b, 0x4a, 0x23, 0x17, 0x05, 0x64, 0xa1, 0x36, - 0x55, 0x15, 0x87, 0x52, 0x09, 0x58, 0xc0, 0xa2, 0x49, 0x04, 0x61, 0x51, 0x41, 0x2f, 0x08, 0xa9, - 0xdd, 0x39, 0xce, 0xcd, 0xa3, 0x04, 0x3b, 0xf5, 0x03, 0xc4, 0x0f, 0xe8, 0xba, 0xdb, 0x2e, 0xfa, - 0x53, 0xfa, 0x03, 0xd8, 0x54, 0x62, 0x59, 0x75, 0x81, 0xaa, 0x74, 0xdd, 0x7d, 0xa5, 0xd9, 0x8c, - 0xee, 0xc3, 0xb1, 0x13, 0x06, 0x66, 0x86, 0xc5, 0x64, 0x56, 0xb9, 0xe7, 0x3b, 0xaf, 0x9c, 0xcf, - 0xdf, 0xb9, 0x36, 0x14, 0xdc, 0xd6, 0x4f, 0xd4, 0x0e, 0xaa, 0x3e, 0xf5, 0xae, 0xfb, 0x36, 0x35, - 0x87, 0x9e, 0x1b, 0xb8, 0x58, 0x15, 0xa8, 0x9e, 0xf7, 0x68, 0xc7, 0xaf, 0x06, 0xb7, 0x43, 0xea, - 0x0b, 0x8f, 0x8e, 0x65, 0x7c, 0x12, 0x5b, 0xf1, 0xa9, 0xef, 0xf7, 0x5d, 0x67, 0x32, 0x50, 0x56, - 0xac, 0x5e, 0xd1, 0xc0, 0x92, 0x58, 0x21, 0xc2, 0xae, 0xa9, 0xd7, 0xef, 0xdc, 0x4a, 0xb4, 0xd2, - 0xed, 0x07, 0xbd, 0xb0, 0x65, 0xda, 0xee, 0x55, 0xb5, 0xeb, 0x76, 0xdd, 0x2a, 0x87, 0x5b, 0x61, - 0x87, 0x5b, 0xdc, 0xe0, 0x27, 0x11, 0x6e, 0xfc, 0x89, 0x00, 0x8e, 0x68, 0x40, 0xe8, 0xcf, 0x21, - 0xf5, 0x03, 0x5c, 0x81, 0xf9, 0x6f, 0xdb, 0x6d, 0x8f, 0xfa, 0x7e, 0x11, 0x6d, 0xa0, 0x72, 0x76, - 0x3b, 0x67, 0xb2, 0x3f, 0x6d, 0x4a, 0xb0, 0x96, 0xb9, 0x7b, 0x58, 0x4f, 0x91, 0x28, 0x06, 0xe7, - 0x41, 0x21, 0xd6, 0x4d, 0x31, 0xbd, 0x81, 0xca, 0x0b, 0x84, 0x1d, 0xf1, 0x1e, 0x64, 0xbe, 0xa3, - 0x81, 0x55, 0x6c, 0xf1, 0x6c, 0xdd, 0x8c, 0x98, 0x90, 0x0d, 0x98, 0xaf, 0x49, 0xad, 0x36, 0xf5, - 0x6a, 0x0b, 0xac, 0xd4, 0xfd, 0xc3, 0x3a, 0x22, 0x3c, 0x03, 0x37, 0x40, 0xbd, 0xe0, 0x83, 0x14, - 0x6d, 0x9e, 0x6b, 0x4c, 0xe7, 0x72, 0x6f, 0xdf, 0xb6, 0x82, 0xbe, 0xeb, 0x3c, 0xaa, 0x21, 0x73, - 0x8d, 0x73, 0xc8, 0xf2, 0x71, 0xfc, 0xa1, 0xeb, 0xf8, 0x14, 0x97, 0x41, 0x92, 0x2f, 0xc7, 0x59, - 0x32, 0x85, 0x69, 0x9e, 0xf0, 0x9f, 0x66, 0x8a, 0x48, 0x3f, 0x5e, 0x85, 0xb9, 0x7a, 0x2f, 0x74, - 0x2e, 0xf9, 0x30, 0x5a, 0x33, 0x45, 0x84, 0x59, 0x53, 0x00, 0x11, 0xe3, 0x8f, 0x34, 0xc0, 0x69, - 0x38, 0x66, 0x69, 0x07, 0x54, 0xf1, 0x07, 0x64, 0xd5, 0xb5, 0xa8, 0x6a, 0x1c, 0xc3, 0x8e, 0x22, - 0x86, 0xf5, 0x10, 0xa7, 0xa7, 0x7a, 0xcc, 0x9a, 0x34, 0xfd, 0x07, 0x58, 0x1c, 0xff, 0x5d, 0xfc, - 0x39, 0xa8, 0x27, 0xcf, 0x50, 0x46, 0xa4, 0x17, 0x6f, 0xc2, 0xdc, 0xb9, 0x7b, 0x49, 0x1d, 0x3e, - 0x0c, 0x0b, 0x93, 0xba, 0x35, 0x39, 0x4a, 0x84, 0x53, 0xd0, 0xb7, 0x0f, 0x59, 0xce, 0x8c, 0x7c, - 0x28, 0xef, 0x27, 0x32, 0xe3, 0xd7, 0x34, 0xe4, 0x1a, 0x74, 0x40, 0x03, 0xfa, 0x42, 0x95, 0x7e, - 0x09, 0xf3, 0x27, 0x37, 0x0e, 0xf5, 0x8e, 0x1b, 0x82, 0xf8, 0xda, 0x32, 0xf3, 0xff, 0xfd, 0xb0, - 0x1e, 0xc1, 0x24, 0x3a, 0xc4, 0x43, 0x29, 0xcf, 0x0c, 0x35, 0x73, 0x91, 0xe7, 0x61, 0x29, 0x22, - 0x44, 0x50, 0x6a, 0xbc, 0x42, 0x90, 0x65, 0xe1, 0x11, 0x43, 0x7b, 0x6f, 0x61, 0x68, 0xcc, 0x80, - 0x04, 0x62, 0xb2, 0x36, 0x20, 0x7b, 0x18, 0x0e, 0x06, 0xa2, 0xb7, 0x2f, 0x57, 0x3b, 0x09, 0x45, - 0x4b, 0xaf, 0x7c, 0x3c, 0x4b, 0xbf, 0x03, 0x9a, 0x18, 0x5e, 0x0a, 0xec, 0x1d, 0x25, 0x6c, 0xfc, - 0x8f, 0x20, 0x77, 0x46, 0x2d, 0xcf, 0xee, 0xc5, 0xca, 0xca, 0xd6, 0x5d, 0x27, 0xb0, 0xfa, 0x42, - 0x2e, 0x88, 0xcb, 0x25, 0x2b, 0xc9, 0x52, 0xea, 0xc7, 0x0d, 0x92, 0xf4, 0xe3, 0x02, 0xcc, 0x7d, - 0x1f, 0x52, 0xef, 0x56, 0xe8, 0x8a, 0x08, 0x03, 0x1b, 0xa0, 0xf1, 0xc3, 0x05, 0xf5, 0x98, 0x76, - 0x38, 0x53, 0x39, 0x32, 0x81, 0xcd, 0x9c, 0xb2, 0x3a, 0x2c, 0x45, 0x93, 0x4b, 0xd2, 0xbe, 0x86, - 0x45, 0xa9, 0x01, 0xca, 0x44, 0xa3, 0x3c, 0xb5, 0x56, 0x71, 0x94, 0xf1, 0x1f, 0x82, 0x65, 0x76, - 0xdb, 0x5a, 0x4e, 0xf7, 0xa5, 0xbb, 0xf9, 0x15, 0xa8, 0x3c, 0x9d, 0x29, 0x4d, 0xb4, 0x94, 0x8f, - 0x8a, 0xa3, 0x32, 0x5a, 0x86, 0xcc, 0x9c, 0xb4, 0x2d, 0xc8, 0xc7, 0xe3, 0x4a, 0xda, 0xd6, 0x60, - 0xf1, 0xd0, 0xb3, 0xba, 0x57, 0xd4, 0x09, 0x04, 0x6d, 0x1a, 0x89, 0x01, 0xe3, 0x97, 0x34, 0xac, - 0x44, 0x29, 0x4d, 0xcb, 0xef, 0x7d, 0x08, 0x96, 0x30, 0x64, 0xce, 0xac, 0x41, 0xc0, 0x65, 0xa7, - 0x11, 0x7e, 0x9e, 0x39, 0x73, 0xfb, 0x50, 0x98, 0xa4, 0x41, 0xb2, 0xb7, 0x09, 0x2a, 0xb3, 0xa5, - 0xe2, 0xb4, 0x9a, 0x26, 0x57, 0x2d, 0xc3, 0xa3, 0xa4, 0x6f, 0xfb, 0x77, 0x05, 0xe6, 0xcf, 0x44, - 0x57, 0xbc, 0x05, 0xca, 0x11, 0x0d, 0x30, 0x8e, 0x18, 0x88, 0x3f, 0x5e, 0xf4, 0x95, 0x09, 0x4c, - 0x74, 0xd8, 0x42, 0x2c, 0xe3, 0x34, 0x4c, 0x64, 0xc4, 0x2f, 0xe9, 0x38, 0x23, 0xf1, 0x7a, 0x2a, - 0x23, 0xbc, 0x0b, 0xaa, 0xb8, 0x5f, 0xf1, 0x27, 0x51, 0xc0, 0xc4, 0x0b, 0x48, 0x5f, 0x9d, 0x86, - 0xc7, 0x3b, 0x94, 0x61, 0x14, 0xe0, 0x71, 0xdd, 0xc4, 0x9d, 0xac, 0x17, 0x26, 0x41, 0x99, 0xb2, - 0x0b, 0xaa, 0x58, 0xc4, 0xb8, 0xd7, 0xc4, 0x95, 0x14, 0xf7, 0x9a, 0xda, 0xd7, 0x03, 0x58, 0x88, - 0x28, 0xc5, 0x9f, 0x26, 0x27, 0x4f, 0x6c, 0xa3, 0x5e, 0x7c, 0xec, 0x90, 0xe9, 0xc7, 0xa0, 0x25, - 0x9f, 0x08, 0xfe, 0x6c, 0x3a, 0x32, 0x21, 0x57, 0x7d, 0xed, 0xcd, 0x4e, 0x51, 0xaa, 0x76, 0x70, - 0x37, 0x2a, 0xa1, 0xfb, 0x51, 0x09, 0xfd, 0x35, 0x2a, 0xa1, 0x7f, 0x46, 0x25, 0xf4, 0xdb, 0xbf, - 0xa5, 0xd4, 0x8f, 0x5f, 0x24, 0x3e, 0x44, 0x1d, 0x7f, 0x68, 0xdb, 0x95, 0x36, 0xbd, 0xae, 0x3a, - 0xd4, 0xed, 0xf8, 0x15, 0xf1, 0x19, 0x2a, 0x6a, 0xb6, 0x54, 0x6e, 0x7d, 0xf3, 0x3a, 0x00, 0x00, - 0xff, 0xff, 0xbe, 0x82, 0x72, 0x84, 0x3d, 0x0b, 0x00, 0x00, + // 843 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x56, 0x4d, 0x4f, 0x33, 0x55, + 0x14, 0xee, 0xed, 0x94, 0x01, 0x4e, 0xa7, 0xd0, 0x5c, 0x2a, 0x36, 0x23, 0x29, 0x64, 0x82, 0xa6, + 0xc6, 0x74, 0x8a, 0x98, 0x00, 0x89, 0xb8, 0xb0, 0x6d, 0xa0, 0x2c, 0x0c, 0x78, 0x21, 0x24, 0xba, + 0x9b, 0x4e, 0x6f, 0xdb, 0x91, 0x32, 0x53, 0xe7, 0x03, 0xc2, 0x0f, 0x70, 0xed, 0xd6, 0x85, 0x3f, + 0xc5, 0x1f, 0xc0, 0xc6, 0x84, 0xa5, 0x71, 0x41, 0x4c, 0x5d, 0xbb, 0x37, 0x71, 0x63, 0xee, 0xc7, + 0x74, 0xa6, 0x45, 0x50, 0x59, 0xbc, 0x7d, 0x57, 0x3d, 0xf7, 0x39, 0x5f, 0x3d, 0xcf, 0x3c, 0xe7, + 0xce, 0x40, 0xc9, 0xeb, 0x7c, 0x43, 0xed, 0xb0, 0x1e, 0x50, 0xff, 0xc6, 0xb1, 0xa9, 0x39, 0xf2, + 0xbd, 0xd0, 0xc3, 0xaa, 0x40, 0xf5, 0xa2, 0x4f, 0x7b, 0x41, 0x3d, 0xbc, 0x1b, 0xd1, 0x40, 0x78, + 0x74, 0x2c, 0xe3, 0xd3, 0xd8, 0x5a, 0x40, 0x83, 0xc0, 0xf1, 0xdc, 0xe9, 0x40, 0x59, 0xb1, 0x7e, + 0x4d, 0x43, 0x4b, 0x62, 0xa5, 0x18, 0xbb, 0xa1, 0xbe, 0xd3, 0xbb, 0x93, 0x68, 0xad, 0xef, 0x84, + 0x83, 0xa8, 0x63, 0xda, 0xde, 0x75, 0xbd, 0xef, 0xf5, 0xbd, 0x3a, 0x87, 0x3b, 0x51, 0x8f, 0x9f, + 0xf8, 0x81, 0x5b, 0x22, 0xdc, 0xf8, 0x19, 0x01, 0x1c, 0xd3, 0x90, 0xd0, 0x6f, 0x23, 0x1a, 0x84, + 0xb8, 0x06, 0x8b, 0x9f, 0x77, 0xbb, 0x3e, 0x0d, 0x82, 0x32, 0xda, 0x42, 0xd5, 0xfc, 0x6e, 0xc1, + 0x64, 0x7f, 0xda, 0x94, 0x60, 0x23, 0x77, 0xff, 0xb8, 0x99, 0x21, 0x71, 0x0c, 0x2e, 0x82, 0x42, + 0xac, 0xdb, 0x72, 0x76, 0x0b, 0x55, 0x97, 0x08, 0x33, 0xf1, 0x01, 0xe4, 0xbe, 0xa0, 0xa1, 0x55, + 0xee, 0xf0, 0x6c, 0xdd, 0x8c, 0x99, 0x90, 0x0d, 0x98, 0xaf, 0x4d, 0xad, 0x2e, 0xf5, 0x1b, 0x4b, + 0xac, 0xd4, 0xc3, 0xe3, 0x26, 0x22, 0x3c, 0x03, 0xb7, 0x40, 0xbd, 0xe4, 0x83, 0x94, 0x6d, 0x9e, + 0x6b, 0xcc, 0xe6, 0x72, 0xaf, 0x63, 0x5b, 0xa1, 0xe3, 0xb9, 0x4f, 0x6a, 0xc8, 0x5c, 0xe3, 0x02, + 0xf2, 0x7c, 0x9c, 0x60, 0xe4, 0xb9, 0x01, 0xc5, 0x55, 0x90, 0xe4, 0xcb, 0x71, 0x56, 0x4c, 0x71, + 0x34, 0x4f, 0xf9, 0x4f, 0x3b, 0x43, 0xa4, 0x1f, 0xaf, 0xc3, 0x42, 0x73, 0x10, 0xb9, 0x57, 0x7c, + 0x18, 0xad, 0x9d, 0x21, 0xe2, 0xd8, 0x50, 0x00, 0x11, 0xe3, 0xa7, 0x2c, 0xc0, 0x59, 0x34, 0x61, + 0x69, 0x0f, 0x54, 0xf1, 0x07, 0x64, 0xd5, 0x8d, 0xb8, 0x6a, 0x12, 0xc3, 0x4c, 0x11, 0xc3, 0x7a, + 0x08, 0xeb, 0xb9, 0x1e, 0xf3, 0x26, 0x4d, 0xff, 0x0a, 0x96, 0x27, 0x7f, 0x17, 0x7f, 0x00, 0xea, + 0xe9, 0x0b, 0x94, 0x11, 0xe9, 0xc5, 0xdb, 0xb0, 0x70, 0xe1, 0x5d, 0x51, 0x97, 0x0f, 0xc3, 0xc2, + 0xa4, 0x6e, 0x4d, 0x8e, 0x12, 0xe1, 0x14, 0xf4, 0x1d, 0x42, 0x9e, 0x33, 0x23, 0x1f, 0xca, 0xff, + 0x13, 0x99, 0xf1, 0x7d, 0x16, 0x0a, 0x2d, 0x3a, 0xa4, 0x21, 0x7d, 0xa5, 0x4a, 0x3f, 0x84, 0xc5, + 0xd3, 0x5b, 0x97, 0xfa, 0x27, 0x2d, 0x41, 0x7c, 0x63, 0x95, 0xf9, 0x7f, 0x7d, 0xdc, 0x8c, 0x61, + 0x12, 0x1b, 0xc9, 0x50, 0xca, 0x0b, 0x43, 0xcd, 0x5d, 0xe4, 0x45, 0x58, 0x89, 0x09, 0x11, 0x94, + 0x1a, 0x7f, 0x21, 0xc8, 0xb3, 0xf0, 0x98, 0xa1, 0x83, 0x7f, 0x61, 0x68, 0xc2, 0x80, 0x04, 0x12, + 0xb2, 0xb6, 0x20, 0x7f, 0x14, 0x0d, 0x87, 0xa2, 0x77, 0x20, 0x57, 0x3b, 0x0d, 0xc5, 0x4b, 0xaf, + 0xbc, 0x3d, 0x4b, 0xbf, 0x07, 0x9a, 0x18, 0x5e, 0x0a, 0xec, 0x3f, 0x4a, 0xd8, 0xf8, 0x13, 0x41, + 0xe1, 0x9c, 0x5a, 0xbe, 0x3d, 0x48, 0x94, 0x95, 0x6f, 0x7a, 0x6e, 0x68, 0x39, 0x42, 0x2e, 0x88, + 0xcb, 0x25, 0x2f, 0xc9, 0x52, 0x9a, 0x27, 0x2d, 0x92, 0xf6, 0xe3, 0x12, 0x2c, 0x7c, 0x19, 0x51, + 0xff, 0x4e, 0xe8, 0x8a, 0x88, 0x03, 0x36, 0x40, 0xe3, 0xc6, 0x25, 0xf5, 0x99, 0x76, 0x38, 0x53, + 0x05, 0x32, 0x85, 0xcd, 0x9d, 0xb2, 0x26, 0xac, 0xc4, 0x93, 0x4b, 0xd2, 0x3e, 0x86, 0x65, 0xa9, + 0x01, 0xca, 0x44, 0xa3, 0x3c, 0xb7, 0x56, 0x49, 0x94, 0xf1, 0x07, 0x82, 0x55, 0x76, 0xdb, 0x5a, + 0x6e, 0xff, 0xb5, 0xbb, 0xf9, 0x11, 0xa8, 0x3c, 0x9d, 0x29, 0x4d, 0xb4, 0x94, 0x8f, 0x8a, 0xa3, + 0x32, 0x5a, 0x86, 0xcc, 0x9d, 0xb4, 0x1d, 0x28, 0x26, 0xe3, 0x4a, 0xda, 0x36, 0x60, 0xf9, 0xc8, + 0xb7, 0xfa, 0xd7, 0xd4, 0x0d, 0x05, 0x6d, 0x1a, 0x49, 0x00, 0xe3, 0xbb, 0x2c, 0xac, 0xc5, 0x29, + 0x6d, 0x2b, 0x18, 0xbc, 0x09, 0x96, 0x30, 0xe4, 0xce, 0xad, 0x61, 0xc8, 0x65, 0xa7, 0x11, 0x6e, + 0xcf, 0x9d, 0xb9, 0x43, 0x28, 0x4d, 0xd3, 0x20, 0xd9, 0xdb, 0x06, 0x95, 0x9d, 0xa5, 0xe2, 0xb4, + 0x86, 0x26, 0x57, 0x2d, 0xc7, 0xa3, 0xa4, 0x6f, 0xf7, 0x47, 0x05, 0x16, 0xcf, 0x45, 0x57, 0xbc, + 0x03, 0xca, 0x31, 0x0d, 0x31, 0x8e, 0x19, 0x48, 0x3e, 0x5e, 0xf4, 0xb5, 0x29, 0x4c, 0x74, 0xd8, + 0x41, 0x2c, 0xe3, 0x2c, 0x4a, 0x65, 0x24, 0x2f, 0xe9, 0x24, 0x23, 0xf5, 0x7a, 0xaa, 0x22, 0xbc, + 0x0f, 0xaa, 0xb8, 0x5f, 0xf1, 0x3b, 0x71, 0xc0, 0xd4, 0x0b, 0x48, 0x5f, 0x9f, 0x85, 0x27, 0x3b, + 0x94, 0x63, 0x14, 0xe0, 0x49, 0xdd, 0xd4, 0x9d, 0xac, 0x97, 0xa6, 0x41, 0x99, 0xb2, 0x0f, 0xaa, + 0x58, 0xc4, 0xa4, 0xd7, 0xd4, 0x95, 0x94, 0xf4, 0x9a, 0xd9, 0xd7, 0xcf, 0x60, 0x29, 0xa6, 0x14, + 0xbf, 0x9b, 0x9e, 0x3c, 0xb5, 0x8d, 0x7a, 0xf9, 0xa9, 0x43, 0xa6, 0x9f, 0x80, 0x96, 0x7e, 0x22, + 0xf8, 0xbd, 0xd9, 0xc8, 0x94, 0x5c, 0xf5, 0x8d, 0x7f, 0x76, 0x8a, 0x52, 0x8d, 0x4f, 0xef, 0xc7, + 0x15, 0xf4, 0x30, 0xae, 0xa0, 0x5f, 0xc6, 0x15, 0xf4, 0xdb, 0xb8, 0x82, 0x7e, 0xf8, 0xbd, 0x92, + 0xf9, 0xfa, 0xfd, 0xd4, 0x87, 0xa8, 0x1b, 0x8c, 0x6c, 0xbb, 0xd6, 0xa5, 0x37, 0x75, 0x97, 0x7a, + 0xbd, 0xa0, 0x66, 0x8d, 0x9c, 0xba, 0xa8, 0xd8, 0x51, 0xf9, 0x77, 0xe8, 0x27, 0x7f, 0x07, 0x00, + 0x00, 0xff, 0xff, 0xfc, 0xc2, 0x63, 0xdb, 0x3b, 0x0b, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/object/service.proto b/object/service.proto index 91c0cbd..12f9741 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 620d24d..a51123b 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 15cc21b..ed657b7 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 79cef65..e5735a5 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 525b39b..2be08c9 100644 --- a/object/types.pb.go +++ b/object/types.pb.go @@ -7,9 +7,9 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - refs "github.com/nspcc-dev/neofs-proto/refs" - session "github.com/nspcc-dev/neofs-proto/session" - storagegroup "github.com/nspcc-dev/neofs-proto/storagegroup" + refs "github.com/nspcc-dev/neofs-api/refs" + session "github.com/nspcc-dev/neofs-api/session" + storagegroup "github.com/nspcc-dev/neofs-api/storagegroup" io "io" math "math" math_bits "math/bits" @@ -826,63 +826,63 @@ func init() { func init() { proto.RegisterFile("object/types.proto", fileDescriptor_02021a1d39b1aee0) } var fileDescriptor_02021a1d39b1aee0 = []byte{ - // 892 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x55, 0xcb, 0x72, 0x1b, 0x45, - 0x14, 0xd5, 0x48, 0xa3, 0xd7, 0xd5, 0x38, 0x9e, 0x34, 0x21, 0x4c, 0x89, 0x42, 0x36, 0x53, 0x3c, - 0x4c, 0xc0, 0xe3, 0xc2, 0x81, 0x4a, 0xb1, 0x80, 0xc2, 0xb2, 0x28, 0xa4, 0x22, 0x60, 0x55, 0xfb, - 0xb1, 0x60, 0x37, 0x92, 0x5a, 0xa3, 0xc6, 0x52, 0xb7, 0xaa, 0xbb, 0x27, 0x89, 0x7e, 0x83, 0x15, - 0x3b, 0x3e, 0x83, 0x5f, 0xc8, 0x92, 0x25, 0x95, 0x85, 0x8b, 0x32, 0x1f, 0xc0, 0x2f, 0xa4, 0xba, - 0xe7, 0xa1, 0x19, 0x27, 0x1b, 0x55, 0x9f, 0x7b, 0xce, 0x69, 0xdd, 0xb9, 0x7d, 0x7a, 0x06, 0x10, - 0x9f, 0xfc, 0x46, 0xa6, 0xea, 0x48, 0x6d, 0xd6, 0x44, 0x06, 0x6b, 0xc1, 0x15, 0x47, 0x8d, 0xa4, - 0xd6, 0x75, 0x05, 0x99, 0xcb, 0x22, 0xd3, 0x7d, 0x47, 0x12, 0x29, 0x29, 0x67, 0xa5, 0xa2, 0x27, - 0x15, 0x17, 0x61, 0x44, 0x22, 0xc1, 0xe3, 0x75, 0x89, 0x39, 0x8c, 0xa8, 0x5a, 0xc4, 0x93, 0x60, - 0xca, 0x57, 0x47, 0x11, 0x8f, 0xf8, 0x91, 0x29, 0x4f, 0xe2, 0xb9, 0x41, 0x06, 0x98, 0x55, 0x22, - 0xf7, 0x9f, 0x40, 0x1d, 0x87, 0x2c, 0x22, 0xe8, 0x21, 0x34, 0xce, 0xe6, 0x73, 0x49, 0x94, 0x67, - 0xed, 0x5b, 0x07, 0x36, 0x4e, 0x91, 0xae, 0x3f, 0x25, 0x2c, 0x52, 0x0b, 0xaf, 0x9a, 0xd4, 0x13, - 0xe4, 0x7f, 0x05, 0x70, 0x29, 0x89, 0x18, 0x92, 0x70, 0x46, 0x04, 0x72, 0xa1, 0xf6, 0x13, 0xd9, - 0x18, 0x6b, 0x1b, 0xeb, 0x25, 0x7a, 0x00, 0xf5, 0xab, 0x70, 0x19, 0x13, 0x63, 0x6b, 0xe3, 0x04, - 0xf8, 0x7f, 0xd9, 0xd0, 0x48, 0x2d, 0x3e, 0xd8, 0x4f, 0x29, 0xbb, 0x36, 0x9e, 0xce, 0xb1, 0x13, - 0x24, 0x03, 0x08, 0x74, 0x6d, 0x58, 0xc1, 0x86, 0x43, 0x9f, 0x43, 0x0b, 0x93, 0x19, 0x15, 0x64, - 0xaa, 0xcc, 0x3e, 0x9d, 0xe3, 0x9d, 0x40, 0x0f, 0x28, 0x38, 0x99, 0xcd, 0x04, 0x91, 0x72, 0x58, - 0xc1, 0xb9, 0x00, 0x95, 0x3a, 0xf2, 0x6a, 0x46, 0x8e, 0xb2, 0x6d, 0xb7, 0xcc, 0xb0, 0x82, 0x8b, - 0x9d, 0x7f, 0x09, 0xed, 0x0b, 0x11, 0x32, 0x39, 0xe7, 0x62, 0xe5, 0xd9, 0xc6, 0x74, 0x3f, 0x33, - 0xe5, 0xc4, 0xb0, 0x82, 0xb7, 0x2a, 0x63, 0xe1, 0xab, 0x89, 0x54, 0x9c, 0x11, 0xaf, 0x7e, 0xc7, - 0x92, 0x11, 0xc6, 0x92, 0x01, 0xf4, 0x35, 0x34, 0xae, 0x88, 0xa0, 0xf3, 0x8d, 0xd7, 0x30, 0xfa, - 0xf7, 0x83, 0xf4, 0x54, 0x03, 0x53, 0xa6, 0xd3, 0x50, 0x51, 0xce, 0xf2, 0x06, 0x53, 0x31, 0xfa, - 0x04, 0x5a, 0x43, 0xbe, 0xe2, 0xc3, 0x50, 0x2e, 0xbc, 0xe6, 0xbe, 0x75, 0xe0, 0xf4, 0x5b, 0xaf, - 0x6e, 0xf6, 0x6c, 0x8d, 0xf5, 0xa3, 0x67, 0x1c, 0x7a, 0x04, 0xbb, 0xe3, 0x70, 0xb3, 0xe4, 0xe1, - 0xec, 0x74, 0x41, 0xa6, 0xd7, 0x32, 0x5e, 0x79, 0x2d, 0x2d, 0x1f, 0x56, 0xf0, 0x5d, 0x02, 0x3d, - 0x81, 0xf6, 0x88, 0x29, 0x12, 0x09, 0xaa, 0x36, 0x5e, 0xdb, 0x74, 0xf3, 0x5e, 0xd6, 0x7d, 0x4e, - 0xe4, 0x9d, 0x6c, 0xb5, 0xe8, 0x7b, 0x70, 0xce, 0x93, 0xd4, 0xfd, 0xa8, 0x53, 0xe7, 0x81, 0xf1, - 0x76, 0x83, 0x62, 0x14, 0x83, 0xa2, 0x62, 0x58, 0xc1, 0x25, 0x87, 0x1e, 0xdc, 0x38, 0x9e, 0x2c, - 0xe9, 0x54, 0x67, 0xa5, 0x53, 0x1e, 0x5c, 0x4e, 0xe8, 0x3f, 0xcd, 0x41, 0xbf, 0x99, 0xc6, 0xc8, - 0xef, 0x14, 0x86, 0xee, 0xff, 0x6f, 0x81, 0x73, 0xbe, 0x91, 0x8a, 0xac, 0xd2, 0x53, 0xf4, 0xa0, - 0x79, 0x45, 0x84, 0x1e, 0x68, 0x1a, 0xdf, 0x0c, 0xa2, 0x8f, 0x60, 0x27, 0x9d, 0x40, 0x29, 0xc6, - 0xe5, 0x22, 0xea, 0x42, 0x75, 0x34, 0x30, 0x99, 0x71, 0xfa, 0xf0, 0xf2, 0x66, 0xaf, 0xf2, 0xea, - 0x66, 0xaf, 0x3a, 0x1a, 0xe0, 0xea, 0x68, 0x80, 0x3e, 0x83, 0xe6, 0xd9, 0x73, 0x46, 0xc4, 0x68, - 0x60, 0xf2, 0xe1, 0xf4, 0x77, 0x53, 0x41, 0x56, 0xc6, 0xd9, 0x02, 0x7d, 0x00, 0xb5, 0xd3, 0xd1, - 0xc0, 0x64, 0xc2, 0xe9, 0x77, 0x52, 0x99, 0x2e, 0x61, 0xfd, 0x83, 0xbe, 0x81, 0xf6, 0xa9, 0x20, - 0xa1, 0x22, 0xb3, 0x13, 0x95, 0x06, 0xe1, 0xdd, 0xec, 0xf9, 0x0d, 0x41, 0x39, 0x1b, 0x73, 0xca, - 0x54, 0xdf, 0xd6, 0x5e, 0xbc, 0x55, 0xfb, 0x27, 0xb0, 0x53, 0x52, 0xa0, 0x2e, 0xb4, 0x2e, 0x19, - 0x7d, 0x71, 0x41, 0x57, 0xc4, 0x3c, 0x72, 0x0d, 0xe7, 0x58, 0xdf, 0xbd, 0x1f, 0xd6, 0x7c, 0x9a, - 0x3d, 0x6b, 0x02, 0x7c, 0x0a, 0xbb, 0x77, 0xce, 0x17, 0x1d, 0xc0, 0x6e, 0xb2, 0x92, 0x79, 0x6e, - 0xf4, 0x5e, 0x0e, 0xbe, 0x5b, 0x46, 0x5f, 0xc0, 0xfd, 0x6c, 0x7d, 0x4e, 0x23, 0x16, 0xaa, 0x58, - 0x24, 0x57, 0xdb, 0xc1, 0x6f, 0x12, 0xfe, 0x9f, 0x56, 0x72, 0xb9, 0xd1, 0xc7, 0x60, 0xeb, 0x97, - 0x93, 0xd9, 0xf5, 0xde, 0xf6, 0xb0, 0x35, 0x17, 0x5c, 0x6c, 0xd6, 0x04, 0x1b, 0x3a, 0x1d, 0x7f, - 0xf5, 0x6d, 0xe3, 0xf7, 0x2f, 0xc0, 0xd6, 0x4a, 0xd4, 0x81, 0xe6, 0x25, 0xbb, 0x66, 0xfc, 0x39, - 0x73, 0x2b, 0x08, 0xa0, 0x31, 0x0e, 0x05, 0x61, 0xca, 0xb5, 0x90, 0x03, 0xad, 0xb1, 0x20, 0xcf, - 0x28, 0x8f, 0xa5, 0x5b, 0x45, 0x2d, 0xb0, 0x7f, 0x21, 0x2f, 0x94, 0x5b, 0x43, 0x6d, 0xa8, 0x9f, - 0x2e, 0xe8, 0x72, 0xe6, 0xda, 0xc8, 0x2d, 0x47, 0xd7, 0xad, 0xfb, 0xcb, 0xc2, 0xb5, 0x47, 0x8f, - 0x4a, 0x5d, 0x3e, 0x7c, 0xe3, 0xfa, 0x17, 0x5a, 0xf5, 0x1f, 0xbf, 0xad, 0x9d, 0x36, 0xd4, 0xcf, - 0xd7, 0x4b, 0xaa, 0xbb, 0x69, 0x81, 0xad, 0xe7, 0xe0, 0x56, 0x75, 0xf1, 0x67, 0x1e, 0x2f, 0x67, - 0x6e, 0xcd, 0xff, 0xdd, 0x82, 0xc6, 0x99, 0xd9, 0x14, 0x7d, 0x57, 0x4e, 0x6e, 0xfa, 0xfa, 0x7b, - 0x90, 0xfd, 0x67, 0x91, 0x4b, 0x53, 0x50, 0x4e, 0x7a, 0x00, 0xcd, 0xf4, 0x6c, 0xbc, 0xea, 0x7e, - 0xed, 0xa0, 0x73, 0x7c, 0x2f, 0xb3, 0x96, 0x4c, 0x99, 0x48, 0xdf, 0x8c, 0x34, 0xea, 0x49, 0xbc, - 0x71, 0x06, 0xfd, 0x0f, 0x0b, 0xb7, 0x71, 0xfb, 0xba, 0x4e, 0xce, 0x3f, 0x01, 0xfd, 0x6f, 0x5f, - 0xde, 0xf6, 0xac, 0xbf, 0x6f, 0x7b, 0xd6, 0x3f, 0xb7, 0x3d, 0xeb, 0xdf, 0xdb, 0x9e, 0xf5, 0xc7, - 0x7f, 0xbd, 0xca, 0xaf, 0x9f, 0x16, 0x3e, 0x31, 0x4c, 0xae, 0xa7, 0xd3, 0xc3, 0x19, 0x79, 0x76, - 0xc4, 0x08, 0x9f, 0xcb, 0xc3, 0xe4, 0x03, 0x93, 0x74, 0x34, 0x69, 0x18, 0xf4, 0xf8, 0x75, 0x00, - 0x00, 0x00, 0xff, 0xff, 0x95, 0x5d, 0xc3, 0x1e, 0xf1, 0x06, 0x00, 0x00, + // 893 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x55, 0xdd, 0x6e, 0x1b, 0x45, + 0x14, 0xf6, 0xda, 0xeb, 0xbf, 0xe3, 0x4d, 0xb3, 0x1d, 0x4a, 0x59, 0x05, 0xe1, 0x84, 0x15, 0x45, + 0xa1, 0x90, 0xb5, 0x48, 0x41, 0x15, 0x42, 0x42, 0xc4, 0x31, 0xc2, 0x16, 0x85, 0x58, 0x93, 0x9f, + 0x0b, 0xee, 0xd6, 0xf6, 0x78, 0x3d, 0xc4, 0x9e, 0xb1, 0x66, 0x66, 0xdb, 0xfa, 0x35, 0xb8, 0xe2, + 0x8e, 0xc7, 0xe0, 0x15, 0x7a, 0xc9, 0x25, 0xea, 0x45, 0x84, 0xc2, 0x03, 0xf0, 0x0a, 0xd5, 0xcc, + 0xfe, 0x78, 0x37, 0xed, 0x8d, 0x35, 0xe7, 0x7c, 0xdf, 0x37, 0x3e, 0x73, 0xe6, 0x3b, 0xb3, 0x80, + 0xf8, 0xe4, 0x37, 0x32, 0x55, 0x3d, 0xb5, 0x59, 0x13, 0x19, 0xac, 0x05, 0x57, 0x1c, 0x35, 0x92, + 0xdc, 0x9e, 0x2b, 0xc8, 0x5c, 0x16, 0x91, 0xbd, 0xf7, 0x24, 0x91, 0x92, 0x72, 0x56, 0x4a, 0x7a, + 0x52, 0x71, 0x11, 0x46, 0x24, 0x12, 0x3c, 0x5e, 0x97, 0x90, 0xa3, 0x88, 0xaa, 0x45, 0x3c, 0x09, + 0xa6, 0x7c, 0xd5, 0x8b, 0x78, 0xc4, 0x7b, 0x26, 0x3d, 0x89, 0xe7, 0x26, 0x32, 0x81, 0x59, 0x25, + 0x74, 0xff, 0x29, 0xd4, 0x71, 0xc8, 0x22, 0x82, 0x1e, 0x42, 0xe3, 0x6c, 0x3e, 0x97, 0x44, 0x79, + 0xd6, 0x81, 0x75, 0x68, 0xe3, 0x34, 0xd2, 0xf9, 0x67, 0x84, 0x45, 0x6a, 0xe1, 0x55, 0x93, 0x7c, + 0x12, 0xf9, 0x5f, 0x01, 0x5c, 0x4a, 0x22, 0x86, 0x24, 0x9c, 0x11, 0x81, 0x5c, 0xa8, 0xfd, 0x44, + 0x36, 0x46, 0xda, 0xc6, 0x7a, 0x89, 0x1e, 0x40, 0xfd, 0x2a, 0x5c, 0xc6, 0xc4, 0xc8, 0xda, 0x38, + 0x09, 0xfc, 0xbf, 0x6c, 0x68, 0xa4, 0x12, 0x1f, 0xec, 0x67, 0x94, 0x5d, 0x1b, 0x4d, 0xe7, 0xd8, + 0x09, 0x92, 0x06, 0x04, 0x3a, 0x37, 0xac, 0x60, 0x83, 0xa1, 0xcf, 0xa1, 0x85, 0xc9, 0x8c, 0x0a, + 0x32, 0x55, 0x66, 0x9f, 0xce, 0xf1, 0x4e, 0xa0, 0x1b, 0x14, 0x9c, 0xcc, 0x66, 0x82, 0x48, 0x39, + 0xac, 0xe0, 0x9c, 0x80, 0x4a, 0x15, 0x79, 0x35, 0x43, 0x47, 0xd9, 0xb6, 0x5b, 0x64, 0x58, 0xc1, + 0xc5, 0xca, 0xbf, 0x84, 0xf6, 0x85, 0x08, 0x99, 0x9c, 0x73, 0xb1, 0xf2, 0x6c, 0x23, 0xba, 0x9f, + 0x89, 0x72, 0x60, 0x58, 0xc1, 0x5b, 0x96, 0x91, 0xf0, 0xd5, 0x44, 0x2a, 0xce, 0x88, 0x57, 0xbf, + 0x23, 0xc9, 0x00, 0x23, 0xc9, 0x02, 0xf4, 0x35, 0x34, 0xae, 0x88, 0xa0, 0xf3, 0x8d, 0xd7, 0x30, + 0xfc, 0x0f, 0x83, 0xf4, 0x56, 0x03, 0x93, 0xa6, 0xd3, 0x50, 0x51, 0xce, 0xf2, 0x02, 0x53, 0x32, + 0xfa, 0x14, 0x5a, 0x43, 0xbe, 0xe2, 0xc3, 0x50, 0x2e, 0xbc, 0xe6, 0x81, 0x75, 0xe8, 0xf4, 0x5b, + 0xaf, 0x6f, 0xf6, 0x6d, 0x1d, 0xeb, 0xa3, 0x67, 0x18, 0x7a, 0x0c, 0xbb, 0xe3, 0x70, 0xb3, 0xe4, + 0xe1, 0xec, 0x74, 0x41, 0xa6, 0xd7, 0x32, 0x5e, 0x79, 0x2d, 0x4d, 0x1f, 0x56, 0xf0, 0x5d, 0x00, + 0x3d, 0x85, 0xf6, 0x88, 0x29, 0x12, 0x09, 0xaa, 0x36, 0x5e, 0xdb, 0x54, 0xf3, 0x41, 0x56, 0x7d, + 0x0e, 0xe4, 0x95, 0x6c, 0xb9, 0xe8, 0x7b, 0x70, 0xce, 0x13, 0xd7, 0xfd, 0xa8, 0x5d, 0xe7, 0x81, + 0xd1, 0xee, 0x05, 0x45, 0x2b, 0x06, 0x45, 0xc6, 0xb0, 0x82, 0x4b, 0x0a, 0xdd, 0xb8, 0x71, 0x3c, + 0x59, 0xd2, 0xa9, 0xf6, 0x4a, 0xa7, 0xdc, 0xb8, 0x1c, 0xd0, 0x7f, 0x9a, 0x07, 0xfd, 0x66, 0x6a, + 0x23, 0xbf, 0x53, 0x68, 0xba, 0xff, 0xbf, 0x05, 0xce, 0xf9, 0x46, 0x2a, 0xb2, 0x4a, 0x6f, 0xd1, + 0x83, 0xe6, 0x15, 0x11, 0xba, 0xa1, 0xa9, 0x7d, 0xb3, 0x10, 0x7d, 0x02, 0x3b, 0x69, 0x07, 0x4a, + 0x36, 0x2e, 0x27, 0xd1, 0x1e, 0x54, 0x47, 0x03, 0xe3, 0x19, 0xa7, 0x0f, 0xaf, 0x6e, 0xf6, 0x2b, + 0xaf, 0x6f, 0xf6, 0xab, 0xa3, 0x01, 0xae, 0x8e, 0x06, 0xe8, 0x33, 0x68, 0x9e, 0xbd, 0x60, 0x44, + 0x8c, 0x06, 0xc6, 0x1f, 0x4e, 0x7f, 0x37, 0x25, 0x64, 0x69, 0x9c, 0x2d, 0xd0, 0x47, 0x50, 0x3b, + 0x1d, 0x0d, 0x8c, 0x27, 0x9c, 0x7e, 0x27, 0xa5, 0xe9, 0x14, 0xd6, 0x3f, 0xe8, 0x1b, 0x68, 0x9f, + 0x0a, 0x12, 0x2a, 0x32, 0x3b, 0x51, 0xa9, 0x11, 0xde, 0xcf, 0xce, 0x6f, 0x00, 0xca, 0xd9, 0x98, + 0x53, 0xa6, 0xfa, 0xb6, 0xd6, 0xe2, 0x2d, 0xdb, 0x3f, 0x81, 0x9d, 0x12, 0x03, 0xed, 0x41, 0xeb, + 0x92, 0xd1, 0x97, 0x17, 0x74, 0x45, 0xcc, 0x91, 0x6b, 0x38, 0x8f, 0xf5, 0xec, 0xfd, 0xb0, 0xe6, + 0xd3, 0xec, 0xac, 0x49, 0xe0, 0x53, 0xd8, 0xbd, 0x73, 0xbf, 0xe8, 0x10, 0x76, 0x93, 0x95, 0xcc, + 0x7d, 0xa3, 0xf7, 0x72, 0xf0, 0xdd, 0x34, 0xfa, 0x02, 0xee, 0x67, 0xeb, 0x73, 0x1a, 0xb1, 0x50, + 0xc5, 0x22, 0x19, 0x6d, 0x07, 0xbf, 0x0d, 0xf8, 0x7f, 0x5a, 0xc9, 0x70, 0xa3, 0x47, 0x60, 0xeb, + 0xc7, 0xc9, 0xec, 0x7a, 0x6f, 0x7b, 0xd9, 0x1a, 0x0b, 0x2e, 0x36, 0x6b, 0x82, 0x0d, 0x9c, 0xb6, + 0xbf, 0xfa, 0xae, 0xf6, 0xfb, 0x17, 0x60, 0x6b, 0x26, 0xea, 0x40, 0xf3, 0x92, 0x5d, 0x33, 0xfe, + 0x82, 0xb9, 0x15, 0x04, 0xd0, 0x18, 0x87, 0x82, 0x30, 0xe5, 0x5a, 0xc8, 0x81, 0xd6, 0x58, 0x90, + 0xe7, 0x94, 0xc7, 0xd2, 0xad, 0xa2, 0x16, 0xd8, 0xbf, 0x90, 0x97, 0xca, 0xad, 0xa1, 0x36, 0xd4, + 0x4f, 0x17, 0x74, 0x39, 0x73, 0x6d, 0xe4, 0x96, 0xad, 0xeb, 0xd6, 0xfd, 0x65, 0x61, 0xec, 0xd1, + 0xe3, 0x52, 0x95, 0x0f, 0xdf, 0x1a, 0xff, 0x42, 0xa9, 0xfe, 0x93, 0x77, 0x95, 0xd3, 0x86, 0xfa, + 0xf9, 0x7a, 0x49, 0x75, 0x35, 0x2d, 0xb0, 0x75, 0x1f, 0xdc, 0xaa, 0x4e, 0xfe, 0xcc, 0xe3, 0xe5, + 0xcc, 0xad, 0xf9, 0xbf, 0x5b, 0xd0, 0x38, 0x33, 0x9b, 0xa2, 0xef, 0xca, 0xce, 0x4d, 0x9f, 0xbf, + 0x07, 0xd9, 0x7f, 0x16, 0xb1, 0xd4, 0x05, 0x65, 0xa7, 0x07, 0xd0, 0x4c, 0xef, 0xc6, 0xab, 0x1e, + 0xd4, 0x0e, 0x3b, 0xc7, 0xf7, 0x32, 0x69, 0x49, 0x94, 0x91, 0xf4, 0x64, 0xa4, 0x56, 0x4f, 0xec, + 0x8d, 0xb3, 0xd0, 0xff, 0xb8, 0x30, 0x8d, 0xdb, 0xe7, 0x3a, 0xb9, 0xff, 0x24, 0xe8, 0x7f, 0xfb, + 0xea, 0xb6, 0x6b, 0xfd, 0x7d, 0xdb, 0xb5, 0xfe, 0xb9, 0xed, 0x5a, 0xff, 0xde, 0x76, 0xad, 0x3f, + 0xfe, 0xeb, 0x56, 0x7e, 0x7d, 0x54, 0xf8, 0xc4, 0x30, 0xb9, 0x9e, 0x4e, 0x8f, 0x66, 0xe4, 0x79, + 0x8f, 0x11, 0x3e, 0x97, 0x47, 0xe1, 0x9a, 0xf6, 0x92, 0x7a, 0x26, 0x0d, 0xf3, 0x85, 0x79, 0xf2, + 0x26, 0x00, 0x00, 0xff, 0xff, 0xf4, 0x71, 0x76, 0x6c, 0xef, 0x06, 0x00, 0x00, } func (m *Range) Marshal() (dAtA []byte, err error) { diff --git a/object/types.proto b/object/types.proto index 293f347..5a0b98e 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 7e628f1..baaed0f 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 b538023..053a7de 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 7223bf8..63e9879 100644 --- a/query/types.pb.go +++ b/query/types.pb.go @@ -163,7 +163,7 @@ func init() { func init() { proto.RegisterFile("query/types.proto", fileDescriptor_c682aeaf51d46f4d) } var fileDescriptor_c682aeaf51d46f4d = []byte{ - // 275 bytes of a gzipped FileDescriptorProto + // 278 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2c, 0x2c, 0x4d, 0x2d, 0xaa, 0xd4, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x05, 0x0b, 0x49, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, @@ -177,11 +177,11 @@ var fileDescriptor_c682aeaf51d46f4d = []byte{ 0x28, 0x35, 0x3d, 0xb5, 0x42, 0x80, 0xd1, 0x8a, 0x65, 0xc6, 0x02, 0x79, 0x06, 0x25, 0x1b, 0x2e, 0xd6, 0x40, 0x90, 0x95, 0x42, 0xba, 0x5c, 0xec, 0x10, 0x5b, 0x8b, 0x25, 0x18, 0x15, 0x98, 0x35, 0xb8, 0x8d, 0x78, 0x51, 0xdc, 0xe2, 0xc4, 0x72, 0xe2, 0x9e, 0x3c, 0x43, 0x10, 0x4c, 0x0d, 0x44, - 0xb7, 0x93, 0xcd, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0xde, 0x78, 0x24, 0xc7, 0xf8, - 0xe0, 0x91, 0x1c, 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x51, 0x6a, 0x48, 0xa1, 0x91, 0x57, 0x5c, 0x90, - 0x9c, 0xac, 0x9b, 0x92, 0x5a, 0xa6, 0x9f, 0x97, 0x9a, 0x9f, 0x56, 0xac, 0x0b, 0x09, 0x0b, 0xb0, - 0xc9, 0x49, 0x6c, 0x60, 0x8e, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xa6, 0xcd, 0xeb, 0xf6, 0x58, - 0x01, 0x00, 0x00, + 0xb7, 0x93, 0xd5, 0x89, 0x47, 0x72, 0x8c, 0x17, 0x1e, 0xc9, 0x31, 0xde, 0x78, 0x24, 0xc7, 0xf8, + 0xe0, 0x91, 0x1c, 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x51, 0x2a, 0x48, 0xa1, 0x91, 0x57, 0x5c, 0x90, + 0x9c, 0xac, 0x9b, 0x92, 0x5a, 0xa6, 0x9f, 0x97, 0x9a, 0x9f, 0x56, 0xac, 0x9b, 0x58, 0x90, 0xa9, + 0x0f, 0x36, 0x37, 0x89, 0x0d, 0x1c, 0x16, 0xc6, 0x80, 0x00, 0x00, 0x00, 0xff, 0xff, 0x8b, 0x7c, + 0x6b, 0x50, 0x56, 0x01, 0x00, 0x00, } func (m *Filter) Marshal() (dAtA []byte, err error) { diff --git a/query/types.proto b/query/types.proto index 6eaed5d..90f4bbf 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 be6b6a3..9c9ce7d 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 ff88446..59c9c25 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 785155c..c0ba85a 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 2ccde2f..80dcde2 100644 --- a/refs/types.pb.go +++ b/refs/types.pb.go @@ -69,7 +69,7 @@ func init() { func init() { proto.RegisterFile("refs/types.proto", fileDescriptor_063a64a96d952d31) } var fileDescriptor_063a64a96d952d31 = []byte{ - // 199 bytes of a gzipped FileDescriptorProto + // 201 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x28, 0x4a, 0x4d, 0x2b, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x01, 0x89, 0x48, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, @@ -77,12 +77,12 @@ var fileDescriptor_063a64a96d952d31 = []byte{ 0xe3, 0x62, 0x77, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0x16, 0xd2, 0xe1, 0xe2, 0xf0, 0x4f, 0xca, 0x4a, 0x4d, 0x2e, 0xf1, 0x74, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x71, 0x12, 0x38, 0x71, 0x4f, 0x9e, 0xe1, 0xd6, 0x3d, 0x79, 0xb8, 0x78, 0x10, 0x9c, 0x25, 0x24, 0xcb, 0xc5, 0xec, 0xec, 0xe9, - 0x22, 0xc1, 0x04, 0x56, 0xc8, 0x0d, 0x55, 0x08, 0x12, 0x0a, 0x02, 0x11, 0x4e, 0xce, 0x37, 0x1e, + 0x22, 0xc1, 0x04, 0x56, 0xc8, 0x0d, 0x55, 0x08, 0x12, 0x0a, 0x02, 0x11, 0x4e, 0x8e, 0x37, 0x1e, 0xca, 0x31, 0x34, 0x3c, 0x92, 0x63, 0x38, 0xf1, 0x48, 0x8e, 0xf1, 0xc2, 0x23, 0x39, 0xc6, 0x1b, - 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x15, 0xc9, 0x91, + 0x8f, 0xe4, 0x18, 0x1f, 0x3c, 0x92, 0x63, 0x9c, 0xf1, 0x58, 0x8e, 0x21, 0x4a, 0x19, 0xc9, 0x91, 0x79, 0xc5, 0x05, 0xc9, 0xc9, 0xba, 0x29, 0xa9, 0x65, 0xfa, 0x79, 0xa9, 0xf9, 0x69, 0xc5, 0xba, - 0x10, 0x27, 0x82, 0xfc, 0x92, 0xc4, 0x06, 0x66, 0x1b, 0x03, 0x02, 0x00, 0x00, 0xff, 0xff, 0xfd, - 0xb6, 0x0b, 0x68, 0xec, 0x00, 0x00, 0x00, + 0x89, 0x05, 0x99, 0xfa, 0x20, 0x9f, 0x24, 0xb1, 0x81, 0x5d, 0x68, 0x0c, 0x08, 0x00, 0x00, 0xff, + 0xff, 0x50, 0xaf, 0xc5, 0x62, 0xea, 0x00, 0x00, 0x00, } func (m *Address) Marshal() (dAtA []byte, err error) { diff --git a/refs/types.proto b/refs/types.proto index 8c7d2eb..c526d56 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 8730386..95c1b13 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 d5f58fd..6ff1a5d 100644 --- a/service/meta.pb.go +++ b/service/meta.pb.go @@ -95,7 +95,7 @@ func init() { func init() { proto.RegisterFile("service/meta.proto", fileDescriptor_a638867e7b43457c) } var fileDescriptor_a638867e7b43457c = []byte{ - // 202 bytes of a gzipped FileDescriptorProto + // 204 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2a, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0xcf, 0x4d, 0x2d, 0x49, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x8a, 0x49, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, @@ -104,11 +104,11 @@ var fileDescriptor_a638867e7b43457c = []byte{ 0x48, 0x4d, 0x4c, 0x49, 0x2d, 0x12, 0x12, 0xe0, 0x62, 0x0e, 0x09, 0xf1, 0x91, 0x60, 0x54, 0x60, 0xd4, 0xe0, 0x0d, 0x02, 0x31, 0x85, 0x44, 0xb8, 0x58, 0x5d, 0x0b, 0xf2, 0x93, 0x33, 0x24, 0x98, 0x14, 0x18, 0x35, 0x58, 0x82, 0x20, 0x1c, 0x21, 0x09, 0x2e, 0xf6, 0xb0, 0xd4, 0xa2, 0xe2, 0xcc, - 0xfc, 0x3c, 0x09, 0x66, 0xb0, 0x5a, 0x18, 0xd7, 0xc9, 0xee, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, + 0xfc, 0x3c, 0x09, 0x66, 0xb0, 0x5a, 0x18, 0xd7, 0xc9, 0xe6, 0xc4, 0x23, 0x39, 0xc6, 0x0b, 0x8f, 0xe4, 0x18, 0x6f, 0x3c, 0x92, 0x63, 0x7c, 0xf0, 0x48, 0x8e, 0x71, 0xc6, 0x63, 0x39, 0x86, 0x28, - 0x0d, 0x24, 0xb7, 0xe5, 0x15, 0x17, 0x24, 0x27, 0xeb, 0xa6, 0xa4, 0x96, 0xe9, 0xe7, 0xa5, 0xe6, - 0xa7, 0x15, 0xeb, 0x42, 0x5c, 0x06, 0xf5, 0x45, 0x12, 0x1b, 0x98, 0x6b, 0x0c, 0x08, 0x00, 0x00, - 0xff, 0xff, 0x6b, 0x83, 0x1d, 0xcf, 0xeb, 0x00, 0x00, 0x00, + 0x35, 0x24, 0xb7, 0xe5, 0x15, 0x17, 0x24, 0x27, 0xeb, 0xa6, 0xa4, 0x96, 0xe9, 0xe7, 0xa5, 0xe6, + 0xa7, 0x15, 0xeb, 0x26, 0x16, 0x64, 0xea, 0x43, 0xfd, 0x90, 0xc4, 0x06, 0x76, 0x9b, 0x31, 0x20, + 0x00, 0x00, 0xff, 0xff, 0xa6, 0x4d, 0x59, 0x8e, 0xe9, 0x00, 0x00, 0x00, } func (m *RequestMetaHeader) Marshal() (dAtA []byte, err error) { diff --git a/service/meta.proto b/service/meta.proto index d3c3005..f2cfe8f 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 2bd1661..c8bd8d6 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 95a9452..a8f0ea5 100644 --- a/service/verify.pb.go +++ b/service/verify.pb.go @@ -179,7 +179,7 @@ func init() { func init() { proto.RegisterFile("service/verify.proto", fileDescriptor_4bdd5bc50ec96238) } var fileDescriptor_4bdd5bc50ec96238 = []byte{ - // 270 bytes of a gzipped FileDescriptorProto + // 272 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x29, 0x4e, 0x2d, 0x2a, 0xcb, 0x4c, 0x4e, 0xd5, 0x2f, 0x4b, 0x2d, 0xca, 0x4c, 0xab, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0x62, 0x87, 0x8a, 0x4a, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, @@ -192,11 +192,11 @@ var fileDescriptor_4bdd5bc50ec96238 = []byte{ 0x13, 0x04, 0x17, 0x0b, 0x48, 0x4d, 0x2d, 0x92, 0x60, 0x82, 0x88, 0x81, 0xd8, 0x52, 0x93, 0x19, 0xb9, 0x38, 0xe1, 0xda, 0x85, 0x5c, 0x91, 0x74, 0x71, 0x1b, 0xa9, 0x13, 0xe9, 0x0a, 0x27, 0x8e, 0x13, 0xf7, 0xe4, 0x19, 0x2e, 0xdc, 0x93, 0x67, 0x84, 0x5a, 0x64, 0xcf, 0xc5, 0xe6, 0x5f, 0x94, - 0x99, 0x9e, 0x99, 0x07, 0xb6, 0x8a, 0x78, 0x83, 0x82, 0xa0, 0xda, 0x9c, 0xec, 0x4e, 0x3c, 0x92, + 0x99, 0x9e, 0x99, 0x07, 0xb6, 0x8a, 0x78, 0x83, 0x82, 0xa0, 0xda, 0x9c, 0x6c, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc6, 0x23, 0x39, 0xc6, 0x07, 0x8f, 0xe4, 0x18, 0x67, 0x3c, - 0x96, 0x63, 0x88, 0xd2, 0x40, 0x0a, 0xf6, 0xbc, 0xe2, 0x82, 0xe4, 0x64, 0xdd, 0x94, 0xd4, 0x32, - 0xfd, 0xbc, 0xd4, 0xfc, 0xb4, 0x62, 0x5d, 0x48, 0xa0, 0x43, 0xad, 0x49, 0x62, 0x03, 0x73, 0x8d, - 0x01, 0x01, 0x00, 0x00, 0xff, 0xff, 0xd7, 0x15, 0xf6, 0x5e, 0xc8, 0x01, 0x00, 0x00, + 0x96, 0x63, 0x88, 0x52, 0x43, 0x0a, 0xf6, 0xbc, 0xe2, 0x82, 0xe4, 0x64, 0xdd, 0x94, 0xd4, 0x32, + 0xfd, 0xbc, 0xd4, 0xfc, 0xb4, 0x62, 0xdd, 0xc4, 0x82, 0x4c, 0x7d, 0xa8, 0x25, 0x49, 0x6c, 0xe0, + 0x60, 0x37, 0x06, 0x04, 0x00, 0x00, 0xff, 0xff, 0x7a, 0xfc, 0xec, 0x11, 0xc6, 0x01, 0x00, 0x00, } func (m *RequestVerificationHeader) Marshal() (dAtA []byte, err error) { diff --git a/service/verify.proto b/service/verify.proto index c70015b..6a4a0e0 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 44542c4..fb6736b 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 06e7971..d920097 100644 --- a/service/verify_test.pb.go +++ b/service/verify_test.pb.go @@ -92,28 +92,28 @@ func init() { func init() { proto.RegisterFile("service/verify_test.proto", fileDescriptor_1effa83201a30d75) } var fileDescriptor_1effa83201a30d75 = []byte{ - // 322 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0x31, 0x4f, 0xc3, 0x30, - 0x10, 0x85, 0xeb, 0x52, 0x4a, 0x71, 0x90, 0x90, 0x0c, 0x43, 0xc9, 0x90, 0x46, 0x9d, 0xb2, 0x34, - 0x91, 0x40, 0x48, 0x4c, 0x0c, 0x01, 0x21, 0x18, 0x58, 0x02, 0x62, 0x60, 0x41, 0x49, 0x7a, 0x0d, - 0x96, 0x68, 0x5c, 0xe2, 0x4b, 0xa5, 0xfe, 0x13, 0x66, 0x7e, 0x4d, 0xc7, 0x8e, 0x88, 0xa1, 0x42, - 0xe1, 0x8f, 0xa0, 0xd8, 0x06, 0x05, 0xd8, 0xfc, 0xde, 0xfb, 0x9e, 0xed, 0x3b, 0x7a, 0x20, 0xa1, - 0x98, 0xf3, 0x14, 0x82, 0x39, 0x14, 0x7c, 0xb2, 0x78, 0x40, 0x90, 0xe8, 0xcf, 0x0a, 0x81, 0x82, - 0x6d, 0x99, 0xc8, 0x66, 0xdf, 0xcc, 0x14, 0x30, 0xd6, 0xa1, 0xbd, 0xff, 0xbb, 0x67, 0xdc, 0x51, - 0xc6, 0xf1, 0xb1, 0x4c, 0xfc, 0x54, 0x4c, 0x83, 0x4c, 0x64, 0x22, 0x50, 0x76, 0x52, 0x4e, 0x94, - 0x52, 0x42, 0x9d, 0x34, 0x3e, 0x7c, 0x6d, 0x53, 0xeb, 0x16, 0x24, 0x46, 0xf0, 0x5c, 0x82, 0x44, - 0x66, 0xd3, 0xde, 0x55, 0x8e, 0x17, 0x1c, 0x9e, 0xc6, 0x7d, 0xe2, 0x12, 0x6f, 0x33, 0xfa, 0xd1, - 0xcc, 0xa5, 0xd6, 0x0d, 0x16, 0x3c, 0xcf, 0x74, 0xdc, 0x76, 0x89, 0xb7, 0x1d, 0x35, 0x2d, 0xe6, - 0x50, 0x1a, 0x2e, 0x10, 0xa4, 0x06, 0x36, 0x5c, 0xe2, 0xed, 0x44, 0x0d, 0x87, 0x1d, 0x53, 0xeb, - 0xac, 0x94, 0x28, 0xa6, 0x1a, 0xe8, 0xd4, 0x40, 0xb8, 0xf7, 0xbe, 0x1e, 0xec, 0xd6, 0x43, 0x37, - 0xa2, 0xa8, 0xc9, 0xb1, 0x13, 0xda, 0xb9, 0x06, 0x8c, 0xfb, 0x89, 0x4b, 0x3c, 0xeb, 0xd0, 0xf6, - 0xcd, 0xe0, 0xbe, 0xf9, 0x74, 0x9d, 0x5d, 0x42, 0x3c, 0x86, 0x22, 0xec, 0x2d, 0xd7, 0x83, 0xd6, - 0x6a, 0x3d, 0x20, 0x91, 0x6a, 0xb0, 0x73, 0xda, 0xd5, 0x49, 0x3f, 0x55, 0xdd, 0xe1, 0xdf, 0xee, - 0x5d, 0xbd, 0x3b, 0x9e, 0xc6, 0xc8, 0x45, 0xfe, 0xef, 0x0e, 0xd3, 0x0d, 0x4f, 0x97, 0x95, 0x43, - 0x56, 0x95, 0x43, 0xde, 0x2a, 0x87, 0x7c, 0x54, 0x0e, 0x79, 0xf9, 0x74, 0x5a, 0xf7, 0x5e, 0x63, - 0xd3, 0xb9, 0x9c, 0xa5, 0xe9, 0x68, 0x0c, 0xf3, 0x20, 0x07, 0x31, 0x91, 0x23, 0xbd, 0x67, 0xf3, - 0x56, 0xd2, 0x55, 0xf2, 0xe8, 0x2b, 0x00, 0x00, 0xff, 0xff, 0xf7, 0x37, 0x92, 0xd2, 0xea, 0x01, - 0x00, 0x00, + // 326 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xb1, 0x4e, 0xf3, 0x30, + 0x14, 0x85, 0xeb, 0xfe, 0xfd, 0x4b, 0x71, 0x90, 0x90, 0x0c, 0x43, 0xc9, 0x90, 0x46, 0x1d, 0x50, + 0x96, 0x26, 0x12, 0x08, 0x89, 0x81, 0x29, 0x20, 0x04, 0x03, 0x4b, 0x40, 0x0c, 0x2c, 0x28, 0x49, + 0x6f, 0x83, 0x25, 0x1a, 0x97, 0xf8, 0xa6, 0x52, 0xdf, 0x84, 0x99, 0xa7, 0xe9, 0xd8, 0x11, 0x31, + 0x54, 0x28, 0xbc, 0x08, 0x8a, 0x6d, 0x50, 0x80, 0xcd, 0xf7, 0x9c, 0xef, 0xd8, 0xbe, 0x87, 0xee, + 0x49, 0x28, 0xe6, 0x3c, 0x85, 0x60, 0x0e, 0x05, 0x9f, 0x2c, 0xee, 0x11, 0x24, 0xfa, 0xb3, 0x42, + 0xa0, 0x60, 0x1b, 0xc6, 0xb2, 0xd9, 0x17, 0x33, 0x05, 0x8c, 0xb5, 0x69, 0xef, 0xfe, 0xcc, 0x19, + 0x75, 0x94, 0x71, 0x7c, 0x28, 0x13, 0x3f, 0x15, 0xd3, 0x20, 0x13, 0x99, 0x08, 0x94, 0x9c, 0x94, + 0x13, 0x35, 0xa9, 0x41, 0x9d, 0x34, 0x3e, 0x7c, 0x69, 0x53, 0xeb, 0x06, 0x24, 0x46, 0xf0, 0x54, + 0x82, 0x44, 0x66, 0xd3, 0xde, 0x65, 0x8e, 0xe7, 0x1c, 0x1e, 0xc7, 0x7d, 0xe2, 0x12, 0xef, 0x7f, + 0xf4, 0x3d, 0x33, 0x97, 0x5a, 0xd7, 0x58, 0xf0, 0x3c, 0xd3, 0x76, 0xdb, 0x25, 0xde, 0x66, 0xd4, + 0x94, 0x98, 0x43, 0x69, 0xb8, 0x40, 0x90, 0x1a, 0xf8, 0xe7, 0x12, 0x6f, 0x2b, 0x6a, 0x28, 0xec, + 0x88, 0x5a, 0xa7, 0xa5, 0x44, 0x31, 0xd5, 0x40, 0xa7, 0x06, 0xc2, 0x9d, 0xb7, 0xf5, 0x60, 0xbb, + 0x5e, 0xba, 0x61, 0x45, 0x4d, 0x8e, 0x1d, 0xd3, 0xce, 0x15, 0x60, 0xdc, 0x4f, 0x5c, 0xe2, 0x59, + 0x07, 0xb6, 0x6f, 0x16, 0xf7, 0xcd, 0xa7, 0x6b, 0xef, 0x02, 0xe2, 0x31, 0x14, 0x61, 0x6f, 0xb9, + 0x1e, 0xb4, 0x56, 0xeb, 0x01, 0x89, 0x54, 0x82, 0x9d, 0xd1, 0xae, 0x76, 0xfa, 0xa9, 0xca, 0x0e, + 0x7f, 0x67, 0x6f, 0xeb, 0xee, 0x78, 0x1a, 0x23, 0x17, 0xf9, 0x9f, 0x3b, 0x4c, 0x36, 0x3c, 0x59, + 0x56, 0x0e, 0x59, 0x55, 0x0e, 0x79, 0xad, 0x1c, 0xf2, 0x5e, 0x39, 0xe4, 0xf9, 0xc3, 0x69, 0xdd, + 0xed, 0x37, 0x9a, 0xce, 0xe5, 0x2c, 0x4d, 0x47, 0x63, 0x98, 0x07, 0x39, 0x88, 0x89, 0x1c, 0xc5, + 0x33, 0x1e, 0x98, 0x97, 0x92, 0xae, 0x6a, 0xfa, 0xf0, 0x33, 0x00, 0x00, 0xff, 0xff, 0x04, 0x99, + 0x63, 0xf2, 0xe8, 0x01, 0x00, 0x00, } func (m *TestRequest) Marshal() (dAtA []byte, err error) { diff --git a/service/verify_test.proto b/service/verify_test.proto index c632615..ce81180 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 d9f889f..39dfb11 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 8532523..e554ba1 100644 --- a/session/service.pb.go +++ b/session/service.pb.go @@ -8,7 +8,7 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - service "github.com/nspcc-dev/neofs-proto/service" + service "github.com/nspcc-dev/neofs-api/service" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -210,30 +210,30 @@ func init() { func init() { proto.RegisterFile("session/service.proto", fileDescriptor_b329bee0fd1148e0) } var fileDescriptor_b329bee0fd1148e0 = []byte{ - // 364 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x51, 0xbd, 0x4e, 0xeb, 0x30, - 0x14, 0xae, 0xaf, 0xaa, 0xb4, 0xd7, 0x57, 0xb7, 0x83, 0xef, 0x0f, 0x51, 0x86, 0x14, 0x55, 0x0c, - 0x19, 0x68, 0x82, 0xca, 0xc2, 0x02, 0x43, 0x61, 0x28, 0x43, 0x97, 0x14, 0x18, 0xd8, 0x92, 0xf4, - 0x34, 0x58, 0x50, 0x3b, 0xc4, 0x4e, 0xa5, 0xbe, 0x09, 0x8f, 0xd4, 0xb1, 0x23, 0x53, 0x85, 0xc2, - 0xc6, 0x53, 0xa0, 0xda, 0x4e, 0x55, 0xa8, 0xba, 0xf9, 0x7c, 0x3f, 0xe7, 0x9c, 0xcf, 0x07, 0xff, - 0x13, 0x20, 0x04, 0xe5, 0x2c, 0x10, 0x90, 0xcf, 0x68, 0x02, 0x7e, 0x96, 0x73, 0xc9, 0x49, 0xc3, - 0xc0, 0xce, 0x9f, 0x8a, 0x97, 0xf3, 0x0c, 0x84, 0x66, 0x1d, 0x62, 0xc4, 0xc1, 0x14, 0x64, 0x64, - 0xb0, 0xbf, 0x15, 0x36, 0x83, 0x9c, 0x4e, 0xe6, 0x06, 0xed, 0xa6, 0x54, 0x3e, 0x14, 0xb1, 0x9f, - 0xf0, 0x69, 0x90, 0xf2, 0x94, 0x07, 0x0a, 0x8e, 0x8b, 0x89, 0xaa, 0x54, 0xa1, 0x5e, 0x5a, 0xde, - 0xf9, 0x40, 0xf8, 0xf7, 0x65, 0x0e, 0x91, 0x84, 0x10, 0x9e, 0x0b, 0x10, 0x92, 0x1c, 0xe1, 0xfa, - 0x35, 0xa3, 0xd2, 0x46, 0x87, 0xc8, 0xfb, 0xd5, 0x6b, 0xf9, 0x66, 0x1d, 0xff, 0x86, 0x3f, 0x02, - 0x1b, 0xd4, 0x42, 0xc5, 0x12, 0x0f, 0x5b, 0x23, 0x9a, 0x32, 0x18, 0xdb, 0x3f, 0xf6, 0xe8, 0x0c, - 0x4f, 0xce, 0x70, 0x7d, 0x08, 0x32, 0xb2, 0x63, 0xa5, 0x73, 0xfc, 0x2a, 0xb6, 0x99, 0xb7, 0xe6, - 0x06, 0x10, 0x8d, 0x21, 0xef, 0x37, 0x17, 0xab, 0x76, 0x6d, 0xb9, 0x6a, 0xa3, 0x50, 0x39, 0xc8, - 0x15, 0xb6, 0xee, 0x54, 0x34, 0x3b, 0x51, 0xde, 0xce, 0x77, 0xaf, 0x62, 0x69, 0x12, 0x49, 0xca, - 0xd9, 0x4e, 0x0f, 0xe3, 0xed, 0xff, 0xc4, 0x8d, 0x21, 0x08, 0x11, 0xa5, 0xd0, 0x11, 0xb8, 0x55, - 0x65, 0x15, 0x19, 0x67, 0x02, 0xc8, 0x31, 0x6e, 0xde, 0x32, 0xa1, 0x83, 0xec, 0x0b, 0xbc, 0x51, - 0xac, 0x43, 0x87, 0x20, 0x8a, 0x27, 0xb9, 0x3f, 0xb4, 0xe6, 0xb7, 0x86, 0xf6, 0x06, 0xb8, 0x31, - 0xd2, 0x2a, 0x72, 0x8e, 0x2d, 0x3d, 0x9f, 0xfc, 0xdf, 0x38, 0xbf, 0x7c, 0xbe, 0x73, 0xb0, 0x83, - 0xeb, 0x45, 0x3d, 0x74, 0x82, 0xfa, 0x17, 0x8b, 0xd2, 0x45, 0xcb, 0xd2, 0x45, 0xaf, 0xa5, 0x8b, - 0xde, 0x4a, 0x17, 0xbd, 0xbc, 0xbb, 0xb5, 0x7b, 0x6f, 0xeb, 0xe0, 0x4c, 0x64, 0x49, 0xd2, 0x1d, - 0xc3, 0x2c, 0x60, 0xc0, 0x27, 0xa2, 0xab, 0xcf, 0x6d, 0x5a, 0xc6, 0x96, 0x2a, 0x4f, 0x3f, 0x03, - 0x00, 0x00, 0xff, 0xff, 0xf6, 0xdd, 0x2a, 0xdb, 0x82, 0x02, 0x00, 0x00, + // 367 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x51, 0xbd, 0x6e, 0xe2, 0x40, + 0x10, 0x66, 0x4f, 0xc8, 0x70, 0x7b, 0x3a, 0x8a, 0xbd, 0x3f, 0xcb, 0x85, 0x39, 0xa1, 0xd3, 0x89, + 0xe2, 0xb0, 0x4f, 0xa4, 0x49, 0x91, 0x34, 0x24, 0x05, 0x29, 0x68, 0x4c, 0x92, 0x22, 0x9d, 0x6d, + 0x06, 0x67, 0x95, 0xb0, 0xeb, 0x78, 0xd6, 0x48, 0xbc, 0x49, 0x1e, 0x89, 0x92, 0x32, 0x15, 0x8a, + 0x9c, 0x2e, 0x4f, 0x11, 0xb1, 0x5e, 0x23, 0x12, 0x44, 0xb7, 0xf3, 0xfd, 0xcc, 0xcc, 0xb7, 0x43, + 0x7f, 0x20, 0x20, 0x72, 0x29, 0x7c, 0x84, 0x6c, 0xce, 0x63, 0xf0, 0xd2, 0x4c, 0x2a, 0xc9, 0x1a, + 0x06, 0x76, 0xbe, 0x55, 0xbc, 0x5a, 0xa4, 0x80, 0x25, 0xeb, 0x30, 0x23, 0xf6, 0x67, 0xa0, 0x42, + 0x83, 0x7d, 0xaf, 0xb0, 0x39, 0x64, 0x7c, 0xba, 0x30, 0x68, 0x2f, 0xe1, 0xea, 0x36, 0x8f, 0xbc, + 0x58, 0xce, 0xfc, 0x44, 0x26, 0xd2, 0xd7, 0x70, 0x94, 0x4f, 0x75, 0xa5, 0x0b, 0xfd, 0x2a, 0xe5, + 0x9d, 0x57, 0x42, 0xbf, 0x9e, 0x65, 0x10, 0x2a, 0x08, 0xe0, 0x21, 0x07, 0x54, 0xec, 0x0f, 0xad, + 0x5f, 0x08, 0xae, 0x6c, 0xf2, 0x9b, 0x74, 0xbf, 0xf4, 0x5b, 0x9e, 0x59, 0xc7, 0xbb, 0x94, 0x77, + 0x20, 0x86, 0xb5, 0x40, 0xb3, 0xac, 0x4b, 0xad, 0x31, 0x4f, 0x04, 0x4c, 0xec, 0x4f, 0x07, 0x74, + 0x86, 0x67, 0xc7, 0xb4, 0x3e, 0x02, 0x15, 0xda, 0x91, 0xd6, 0x39, 0x5e, 0x15, 0xdb, 0xcc, 0xdb, + 0x70, 0x43, 0x08, 0x27, 0x90, 0x0d, 0x9a, 0xcb, 0x75, 0xbb, 0xb6, 0x5a, 0xb7, 0x49, 0xa0, 0x1d, + 0xec, 0x9c, 0x5a, 0xd7, 0x3a, 0x9a, 0x1d, 0x6b, 0x6f, 0xe7, 0xa3, 0x57, 0xb3, 0x3c, 0x0e, 0x15, + 0x97, 0x62, 0xaf, 0x87, 0xf1, 0x0e, 0x3e, 0xd3, 0xc6, 0x08, 0x10, 0xc3, 0x04, 0x3a, 0x48, 0x5b, + 0x55, 0x56, 0x4c, 0xa5, 0x40, 0x60, 0xff, 0x68, 0xf3, 0x4a, 0x60, 0x19, 0xe4, 0x50, 0xe0, 0xad, + 0x62, 0x13, 0x3a, 0x00, 0xcc, 0xef, 0xd5, 0xe1, 0xd0, 0x25, 0xbf, 0x33, 0xb4, 0x3f, 0xa4, 0x8d, + 0x71, 0xa9, 0x62, 0xa7, 0xd4, 0x2a, 0xe7, 0xb3, 0x9f, 0x5b, 0xe7, 0xbb, 0xcf, 0x77, 0x7e, 0xed, + 0xe1, 0xe5, 0xa2, 0x5d, 0xf2, 0x9f, 0x0c, 0x4e, 0x96, 0x85, 0x4b, 0x56, 0x85, 0x4b, 0x9e, 0x0a, + 0x97, 0x3c, 0x17, 0x2e, 0x79, 0x7c, 0x71, 0x6b, 0x37, 0x7f, 0x77, 0x0e, 0x2e, 0x30, 0x8d, 0xe3, + 0xde, 0x04, 0xe6, 0xbe, 0x00, 0x39, 0xc5, 0x5e, 0x98, 0x72, 0xdf, 0x34, 0x8c, 0x2c, 0x7d, 0xf0, + 0xa3, 0xb7, 0x00, 0x00, 0x00, 0xff, 0xff, 0xfb, 0x22, 0x92, 0x20, 0x80, 0x02, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/session/service.proto b/session/service.proto index 377e77e..95ea9c5 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 1daf151..b671a8c 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 ade0cb0..6ee17ad 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 08abec8..120b8a8 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 5b2f5c4..e27f0c6 100644 --- a/session/types.pb.go +++ b/session/types.pb.go @@ -171,30 +171,30 @@ func init() { func init() { proto.RegisterFile("session/types.proto", fileDescriptor_c0d9d9cb855cdad8) } var fileDescriptor_c0d9d9cb855cdad8 = []byte{ - // 358 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xcd, 0x4e, 0xe3, 0x30, - 0x14, 0x85, 0x9b, 0xf4, 0x77, 0x3c, 0x95, 0x66, 0xe4, 0xd9, 0x44, 0x03, 0x4a, 0xab, 0xae, 0x82, - 0x44, 0x13, 0x09, 0x56, 0x6c, 0x58, 0x44, 0x01, 0x11, 0x15, 0xa9, 0xc8, 0xa0, 0x2e, 0xd8, 0x25, - 0xae, 0x9b, 0x9a, 0x1f, 0x3b, 0x8a, 0x1d, 0x50, 0xdf, 0x84, 0x47, 0xe1, 0x11, 0xba, 0x64, 0x89, - 0x58, 0x54, 0x28, 0xbc, 0x08, 0x8a, 0x93, 0xa6, 0xad, 0xd8, 0xdd, 0xfb, 0x1d, 0xfb, 0x9e, 0xeb, - 0x63, 0xf0, 0x4f, 0x10, 0x21, 0x28, 0x67, 0x8e, 0x5c, 0xc4, 0x44, 0xd8, 0x71, 0xc2, 0x25, 0x87, - 0xed, 0x12, 0xfe, 0x1f, 0x46, 0x54, 0xce, 0xd3, 0xd0, 0xc6, 0xfc, 0xd1, 0x89, 0x78, 0xc4, 0x1d, - 0xa5, 0x87, 0xe9, 0x4c, 0x75, 0xaa, 0x51, 0x55, 0x71, 0x6f, 0x30, 0x01, 0x70, 0x42, 0x12, 0x3a, - 0xa3, 0x38, 0x90, 0x94, 0xb3, 0x0b, 0x12, 0x4c, 0x49, 0x02, 0xf7, 0xc1, 0xaf, 0xab, 0x34, 0x7c, - 0xa0, 0x78, 0x44, 0x16, 0x86, 0xd6, 0xd7, 0xac, 0x2e, 0xda, 0x00, 0x38, 0x00, 0xdd, 0x11, 0x59, - 0x5c, 0xd3, 0x88, 0x05, 0x32, 0x4d, 0x88, 0xa1, 0xab, 0x03, 0x3b, 0x6c, 0xf0, 0xaa, 0x83, 0xe6, - 0x0d, 0xbf, 0x27, 0x0c, 0x9e, 0x80, 0x56, 0x31, 0x55, 0x0d, 0xfa, 0x7d, 0xb4, 0x67, 0x97, 0xab, - 0xda, 0x3f, 0x8d, 0xdd, 0xc6, 0x72, 0xd5, 0xab, 0xa1, 0xf2, 0x02, 0x3c, 0x00, 0xed, 0xf1, 0x33, - 0x23, 0x89, 0xef, 0x15, 0x1e, 0xee, 0x9f, 0x5c, 0xfe, 0x58, 0xf5, 0xd6, 0x18, 0xad, 0x0b, 0x68, - 0x02, 0x70, 0x4e, 0x13, 0x21, 0xcf, 0x62, 0x8e, 0xe7, 0x46, 0xbd, 0xaf, 0x59, 0x0d, 0xb4, 0x45, - 0xf2, 0x17, 0x5d, 0x06, 0x6b, 0xb9, 0xa1, 0xe4, 0x0d, 0x80, 0x87, 0xa0, 0x33, 0x0e, 0xef, 0x08, - 0x96, 0xbe, 0x67, 0x34, 0xfb, 0x75, 0xab, 0xeb, 0xfe, 0x2d, 0x9d, 0x2a, 0x8e, 0xaa, 0x2a, 0x9f, - 0xb5, 0x79, 0x7c, 0xab, 0x48, 0xa7, 0x02, 0xb0, 0x07, 0x74, 0xdf, 0x33, 0xda, 0xbb, 0xfb, 0xaa, - 0x28, 0x7c, 0x0f, 0xe9, 0xc5, 0xaa, 0x55, 0x96, 0xc2, 0xe8, 0xe4, 0x76, 0x68, 0x8b, 0xb8, 0xa7, - 0xcb, 0xcc, 0xd4, 0xde, 0x32, 0x53, 0x7b, 0xcf, 0x4c, 0xed, 0x33, 0x33, 0xb5, 0x97, 0x2f, 0xb3, - 0x76, 0x6b, 0x6d, 0xfd, 0x2b, 0x13, 0x31, 0xc6, 0xc3, 0x29, 0x79, 0x72, 0x18, 0xe1, 0x33, 0x31, - 0x2c, 0x7e, 0xb5, 0x8c, 0x35, 0x6c, 0xa9, 0xf6, 0xf8, 0x3b, 0x00, 0x00, 0xff, 0xff, 0xbe, 0x33, - 0xae, 0xb5, 0x28, 0x02, 0x00, 0x00, + // 360 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x91, 0xcf, 0x4a, 0xeb, 0x40, + 0x14, 0xc6, 0x9b, 0xf4, 0xef, 0x9d, 0x5b, 0xb8, 0x97, 0x71, 0x13, 0x54, 0xd2, 0xd2, 0x85, 0x54, + 0xb0, 0x09, 0xe8, 0x4a, 0x70, 0x15, 0xa2, 0x18, 0x2a, 0x54, 0x46, 0xe9, 0xc2, 0x5d, 0x32, 0x9d, + 0xa6, 0xe3, 0x9f, 0x99, 0x90, 0x99, 0x28, 0x7d, 0x13, 0x1f, 0xc5, 0x47, 0xe8, 0xd2, 0xa5, 0xb8, + 0x28, 0x12, 0x5f, 0x44, 0x32, 0x49, 0xd3, 0x16, 0x77, 0x67, 0x7e, 0xdf, 0xcc, 0xf9, 0xce, 0x7c, + 0x07, 0xec, 0x08, 0x22, 0x04, 0xe5, 0xcc, 0x96, 0xf3, 0x88, 0x08, 0x2b, 0x8a, 0xb9, 0xe4, 0xb0, + 0x59, 0xc0, 0xdd, 0x41, 0x48, 0xe5, 0x2c, 0x09, 0x2c, 0xcc, 0x9f, 0xec, 0x90, 0x87, 0xdc, 0x56, + 0x7a, 0x90, 0x4c, 0xd5, 0x49, 0x1d, 0x54, 0x95, 0xbf, 0xeb, 0x8d, 0x01, 0x1c, 0x93, 0x98, 0x4e, + 0x29, 0xf6, 0x25, 0xe5, 0xec, 0x92, 0xf8, 0x13, 0x12, 0xc3, 0x7d, 0xf0, 0xe7, 0x3a, 0x09, 0x1e, + 0x29, 0x1e, 0x92, 0xb9, 0xa1, 0x75, 0xb5, 0x7e, 0x1b, 0xad, 0x01, 0xec, 0x81, 0xf6, 0x90, 0xcc, + 0x6f, 0x68, 0xc8, 0x7c, 0x99, 0xc4, 0xc4, 0xd0, 0xd5, 0x85, 0x2d, 0xd6, 0x7b, 0xd3, 0x41, 0xfd, + 0x96, 0x3f, 0x10, 0x06, 0x4f, 0x41, 0x23, 0xef, 0xaa, 0x1a, 0xfd, 0x3d, 0xde, 0xb3, 0x8a, 0x51, + 0xad, 0xdf, 0xc6, 0x4e, 0x6d, 0xb1, 0xec, 0x54, 0x50, 0xf1, 0x00, 0x1e, 0x82, 0xe6, 0xe8, 0x85, + 0x91, 0xd8, 0x73, 0x73, 0x0f, 0xe7, 0x5f, 0x26, 0x7f, 0x2e, 0x3b, 0x2b, 0x8c, 0x56, 0x05, 0x34, + 0x01, 0xb8, 0xa0, 0xb1, 0x90, 0xe7, 0x11, 0xc7, 0x33, 0xa3, 0xda, 0xd5, 0xfa, 0x35, 0xb4, 0x41, + 0xb2, 0x1f, 0x5d, 0xf9, 0x2b, 0xb9, 0xa6, 0xe4, 0x35, 0x80, 0x47, 0xa0, 0x35, 0x0a, 0xee, 0x09, + 0x96, 0x9e, 0x6b, 0xd4, 0xbb, 0xd5, 0x7e, 0xdb, 0xf9, 0x5f, 0x38, 0x95, 0x1c, 0x95, 0x55, 0xd6, + 0x6b, 0xfd, 0xf9, 0x46, 0x9e, 0x4e, 0x09, 0x60, 0x07, 0xe8, 0x9e, 0x6b, 0x34, 0xb7, 0xe7, 0x55, + 0x51, 0x78, 0x2e, 0xd2, 0xf3, 0x51, 0xcb, 0x2c, 0x85, 0xd1, 0xca, 0xec, 0xd0, 0x06, 0x71, 0xce, + 0x16, 0xa9, 0xa9, 0xbd, 0xa7, 0xa6, 0xf6, 0x91, 0x9a, 0xda, 0x57, 0x6a, 0x6a, 0xaf, 0xdf, 0x66, + 0xe5, 0xee, 0x60, 0x63, 0xaf, 0x4c, 0x44, 0x18, 0x0f, 0x26, 0xe4, 0xd9, 0x66, 0x84, 0x4f, 0xc5, + 0xc0, 0x8f, 0xa8, 0x5d, 0x84, 0x1a, 0x34, 0xd4, 0x5e, 0x4f, 0x7e, 0x02, 0x00, 0x00, 0xff, 0xff, + 0xb8, 0x9f, 0x2d, 0x1d, 0x26, 0x02, 0x00, 0x00, } func (m *VerificationHeader) Marshal() (dAtA []byte, err error) { diff --git a/session/types.proto b/session/types.proto index 294928b..79b24ff 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 09cc645..62f5f4e 100644 --- a/state/service.pb.go +++ b/state/service.pb.go @@ -8,8 +8,8 @@ import ( fmt "fmt" _ "github.com/gogo/protobuf/gogoproto" proto "github.com/golang/protobuf/proto" - bootstrap "github.com/nspcc-dev/neofs-proto/bootstrap" - service "github.com/nspcc-dev/neofs-proto/service" + bootstrap "github.com/nspcc-dev/neofs-api/bootstrap" + service "github.com/nspcc-dev/neofs-api/service" grpc "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" @@ -347,36 +347,36 @@ func init() { func init() { proto.RegisterFile("state/service.proto", fileDescriptor_695592f6f2fc97b7) } var fileDescriptor_695592f6f2fc97b7 = []byte{ - // 459 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0xbf, 0x6e, 0xdb, 0x30, - 0x10, 0xc6, 0xc3, 0xfe, 0x51, 0xd3, 0xb3, 0x9b, 0x02, 0x8c, 0x6d, 0x08, 0x1a, 0x14, 0xc3, 0x43, - 0x60, 0xa0, 0xb0, 0x04, 0xa4, 0x2d, 0x10, 0x14, 0x9d, 0x9c, 0x0c, 0x59, 0xdc, 0x41, 0x01, 0x3a, - 0x74, 0xa3, 0xe4, 0xb3, 0x2d, 0xb4, 0x16, 0x59, 0xf1, 0x64, 0xc0, 0x0f, 0x51, 0xb4, 0x63, 0x1f, - 0x29, 0x63, 0xc6, 0x4e, 0x41, 0xe1, 0x8e, 0x7d, 0x89, 0x22, 0x24, 0xe5, 0xda, 0xce, 0x0b, 0x78, - 0xf3, 0xf7, 0x3b, 0x7d, 0xf4, 0x77, 0xe4, 0x91, 0x70, 0xac, 0x49, 0x10, 0xc6, 0x1a, 0xcb, 0x45, - 0x9e, 0x61, 0xa4, 0x4a, 0x49, 0x92, 0x3f, 0x35, 0x30, 0xe0, 0x8e, 0xc6, 0x73, 0x24, 0x61, 0x4b, - 0x41, 0xab, 0x66, 0x0b, 0x2c, 0xf3, 0xc9, 0xd2, 0xd1, 0x76, 0x2a, 0x25, 0x69, 0x2a, 0x85, 0x8a, - 0x69, 0xa9, 0x50, 0x3b, 0x3c, 0x98, 0xe6, 0x34, 0xab, 0xd2, 0x28, 0x93, 0xf3, 0x78, 0x2a, 0xa7, - 0x32, 0x36, 0x38, 0xad, 0x26, 0x46, 0x19, 0x61, 0x7e, 0xd9, 0xcf, 0x7b, 0xdf, 0x19, 0xbc, 0xf8, - 0x80, 0x34, 0x17, 0x2a, 0xc1, 0xaf, 0x15, 0x6a, 0xe2, 0xe7, 0xf0, 0x64, 0x84, 0x24, 0xfc, 0xb4, - 0xcb, 0xfa, 0x8d, 0xb3, 0x20, 0xaa, 0x63, 0xba, 0xfa, 0x7d, 0xed, 0x0a, 0xc5, 0x18, 0xcb, 0xe1, - 0xe1, 0xcd, 0xdd, 0xc9, 0xc1, 0xed, 0xdd, 0x09, 0x4b, 0x8c, 0x83, 0x5f, 0x82, 0xf7, 0xd1, 0x24, - 0xf4, 0x33, 0xe3, 0xed, 0xed, 0x7a, 0x4d, 0x35, 0xcf, 0x04, 0xe5, 0xb2, 0x78, 0xb0, 0x86, 0xf3, - 0xf6, 0x7e, 0x30, 0x38, 0x1a, 0x21, 0x95, 0x79, 0xa6, 0xf7, 0x25, 0xd2, 0x2b, 0x78, 0xb9, 0x4e, - 0xa4, 0x95, 0x2c, 0x34, 0x72, 0x1f, 0x9e, 0x39, 0xe4, 0xb3, 0xee, 0xe3, 0x7e, 0x33, 0xa9, 0xa5, - 0xd9, 0xd1, 0x2b, 0x14, 0x5f, 0x68, 0xb6, 0x2f, 0xf1, 0x87, 0x70, 0x54, 0x07, 0xfa, 0x9f, 0xde, - 0x92, 0xa5, 0xcf, 0xba, 0xac, 0x7f, 0x98, 0xd4, 0x92, 0x77, 0xc0, 0xbb, 0x26, 0x41, 0x95, 0xf6, - 0x1f, 0x75, 0x59, 0xff, 0x79, 0xe2, 0x54, 0xef, 0x1b, 0x83, 0xc6, 0x65, 0x35, 0xdf, 0x9b, 0x29, - 0x39, 0x85, 0xa6, 0x8d, 0xe3, 0x3a, 0xea, 0x80, 0x77, 0x21, 0x8b, 0x49, 0x3e, 0x35, 0x0d, 0x35, - 0x13, 0xa7, 0xce, 0xfe, 0xb2, 0xba, 0x21, 0xfe, 0x06, 0x3c, 0x3b, 0xe9, 0xbc, 0x15, 0x99, 0xcb, - 0x16, 0x6d, 0x0d, 0x7e, 0xd0, 0x8a, 0xd6, 0x37, 0x2a, 0xba, 0x56, 0x25, 0x8a, 0xf1, 0x48, 0x28, - 0x7e, 0xbe, 0x3e, 0x68, 0xde, 0x76, 0xb6, 0xed, 0xe9, 0x0c, 0x3a, 0xbb, 0xd8, 0x45, 0x7a, 0x07, - 0x0d, 0xbb, 0xab, 0x17, 0x33, 0xcc, 0x3e, 0xaf, 0xff, 0x74, 0x6b, 0x36, 0x82, 0xf6, 0x0e, 0x75, - 0xde, 0xb7, 0x00, 0xf7, 0xed, 0xd9, 0x26, 0x38, 0x77, 0x1f, 0x6d, 0x1c, 0x40, 0x70, 0xbc, 0xc5, - 0xac, 0x6d, 0xf8, 0xfe, 0x66, 0x15, 0xb2, 0xdb, 0x55, 0xc8, 0x7e, 0xad, 0x42, 0xf6, 0x7b, 0x15, - 0xb2, 0x9f, 0x7f, 0xc2, 0x83, 0x4f, 0xa7, 0x1b, 0x4f, 0x42, 0xa1, 0x55, 0x96, 0x0d, 0xc6, 0xb8, - 0x88, 0x0b, 0x94, 0x13, 0x3d, 0xb0, 0x0f, 0x82, 0x59, 0x2a, 0xf5, 0x8c, 0x78, 0xfd, 0x2f, 0x00, - 0x00, 0xff, 0xff, 0x88, 0xd9, 0x75, 0x33, 0xa0, 0x04, 0x00, 0x00, + // 461 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x94, 0xcf, 0x6e, 0xd3, 0x40, + 0x10, 0xc6, 0xbb, 0xfc, 0x31, 0x65, 0x12, 0x8a, 0xb4, 0x4d, 0x22, 0xcb, 0x07, 0x37, 0x8a, 0x10, + 0x8a, 0x84, 0x62, 0x4b, 0x05, 0xa4, 0xaa, 0xc7, 0xb4, 0x87, 0x5e, 0xc2, 0xc1, 0x95, 0x38, 0x70, + 0x5b, 0x3b, 0x93, 0xc4, 0x82, 0x78, 0x17, 0xef, 0x38, 0x52, 0x1e, 0x02, 0xc1, 0x91, 0x47, 0xea, + 0xb1, 0x47, 0x4e, 0x15, 0x0a, 0x47, 0x5e, 0x02, 0x75, 0x77, 0x1d, 0x92, 0xf4, 0x05, 0x72, 0xcb, + 0xf7, 0x1b, 0x7f, 0x9b, 0x6f, 0x76, 0x67, 0x17, 0x8e, 0x35, 0x09, 0xc2, 0x58, 0x63, 0xb9, 0xc8, + 0x33, 0x8c, 0x54, 0x29, 0x49, 0xf2, 0xa7, 0x06, 0x06, 0xdc, 0xd1, 0x78, 0x8e, 0x24, 0x6c, 0x29, + 0x68, 0xd5, 0x6c, 0x81, 0x65, 0x3e, 0x59, 0x3a, 0xda, 0x4e, 0xa5, 0x24, 0x4d, 0xa5, 0x50, 0x31, + 0x2d, 0x15, 0x6a, 0x87, 0x07, 0xd3, 0x9c, 0x66, 0x55, 0x1a, 0x65, 0x72, 0x1e, 0x4f, 0xe5, 0x54, + 0xc6, 0x06, 0xa7, 0xd5, 0xc4, 0x28, 0x23, 0xcc, 0x2f, 0xfb, 0x79, 0xef, 0x3b, 0x83, 0x17, 0x1f, + 0x90, 0xe6, 0x42, 0x25, 0xf8, 0xb5, 0x42, 0x4d, 0xfc, 0x0c, 0x9e, 0x8c, 0x90, 0x84, 0x9f, 0x76, + 0x59, 0xbf, 0x71, 0x1a, 0x44, 0x75, 0x4c, 0x57, 0xbf, 0xaf, 0x5d, 0xa1, 0x18, 0x63, 0x39, 0x3c, + 0xbc, 0xb9, 0x3b, 0x39, 0xb8, 0xbd, 0x3b, 0x61, 0x89, 0x71, 0xf0, 0x4b, 0xf0, 0x3e, 0x9a, 0x84, + 0x7e, 0x66, 0xbc, 0xbd, 0x5d, 0xaf, 0xa9, 0xe6, 0x99, 0xa0, 0x5c, 0x16, 0x0f, 0xd6, 0x70, 0xde, + 0xde, 0x0f, 0x06, 0x47, 0x23, 0xa4, 0x32, 0xcf, 0xf4, 0xbe, 0x44, 0x7a, 0x03, 0x2f, 0xd7, 0x89, + 0xb4, 0x92, 0x85, 0x46, 0xee, 0xc3, 0x33, 0x87, 0x7c, 0xd6, 0x7d, 0xdc, 0x6f, 0x26, 0xb5, 0x34, + 0x3b, 0x7a, 0x85, 0xe2, 0x0b, 0xcd, 0xf6, 0x25, 0xfe, 0x10, 0x8e, 0xea, 0x40, 0xff, 0xd3, 0x5b, + 0xb2, 0xf4, 0x59, 0x97, 0xf5, 0x0f, 0x93, 0x5a, 0xf2, 0x0e, 0x78, 0xd7, 0x24, 0xa8, 0xd2, 0xfe, + 0xa3, 0x2e, 0xeb, 0x3f, 0x4f, 0x9c, 0xea, 0x7d, 0x63, 0xd0, 0xb8, 0xac, 0xe6, 0x7b, 0x33, 0x25, + 0xaf, 0xa1, 0x69, 0xe3, 0xb8, 0x8e, 0x3a, 0xe0, 0x5d, 0xc8, 0x62, 0x92, 0x4f, 0x4d, 0x43, 0xcd, + 0xc4, 0xa9, 0xd3, 0xbf, 0xac, 0x6e, 0x88, 0xbf, 0x03, 0xcf, 0x4e, 0x3a, 0x6f, 0x45, 0xe6, 0xb2, + 0x45, 0x5b, 0x83, 0x1f, 0xb4, 0xa2, 0xf5, 0x8d, 0x8a, 0xae, 0x55, 0x89, 0x62, 0x3c, 0x12, 0x8a, + 0x9f, 0xad, 0x0f, 0x9a, 0xb7, 0x9d, 0x6d, 0x7b, 0x3a, 0x83, 0xce, 0x2e, 0x76, 0x91, 0xce, 0xa1, + 0x61, 0x77, 0xf5, 0x62, 0x86, 0xd9, 0xe7, 0xf5, 0x9f, 0x6e, 0xcd, 0x46, 0xd0, 0xde, 0xa1, 0xce, + 0xfb, 0x1e, 0xe0, 0xbe, 0x3d, 0xdb, 0x04, 0xe7, 0xee, 0xa3, 0x8d, 0x03, 0x08, 0x8e, 0xb7, 0x98, + 0xb5, 0x0d, 0xcf, 0x6f, 0x56, 0x21, 0xbb, 0x5d, 0x85, 0xec, 0xd7, 0x2a, 0x64, 0xbf, 0x57, 0x21, + 0xfb, 0xf9, 0x27, 0x3c, 0xf8, 0xf4, 0x6a, 0xe3, 0x49, 0x28, 0xb4, 0xca, 0xb2, 0xc1, 0x18, 0x17, + 0x71, 0x81, 0x72, 0xa2, 0x07, 0x42, 0xe5, 0xb1, 0x59, 0x28, 0xf5, 0xcc, 0x83, 0xf0, 0xf6, 0x5f, + 0x00, 0x00, 0x00, 0xff, 0xff, 0x32, 0x55, 0xc1, 0x4b, 0x9e, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/state/service.proto b/state/service.proto index a30af22..7966d43 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 a23ef74..d41af49 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 6c6f775..52c1410 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 f052885..aae646a 100644 --- a/storagegroup/types.pb.go +++ b/storagegroup/types.pb.go @@ -170,30 +170,30 @@ func init() { func init() { proto.RegisterFile("storagegroup/types.proto", fileDescriptor_cfa54edc899249a8) } var fileDescriptor_cfa54edc899249a8 = []byte{ - // 353 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x51, 0x31, 0x4f, 0xc2, 0x40, - 0x18, 0xed, 0x41, 0x35, 0xf5, 0xac, 0x84, 0x5c, 0x1c, 0x1a, 0x86, 0x96, 0xe0, 0xd2, 0x85, 0x36, - 0x01, 0x27, 0xc7, 0xaa, 0xe8, 0xa0, 0x0e, 0x45, 0x18, 0xdc, 0x8e, 0x72, 0x94, 0x4b, 0xda, 0xbb, - 0x86, 0x5e, 0x8d, 0xfa, 0x4b, 0x58, 0x4c, 0xfc, 0x39, 0x8c, 0x8e, 0xc6, 0xa1, 0x31, 0x75, 0xf2, - 0x5f, 0x18, 0xae, 0x8a, 0x8d, 0x71, 0x70, 0xfb, 0xde, 0xfb, 0xde, 0xfb, 0xf2, 0xbd, 0x3c, 0x68, - 0xa4, 0x82, 0x2f, 0x70, 0x48, 0xc2, 0x05, 0xcf, 0x12, 0x57, 0xdc, 0x27, 0x24, 0x75, 0x92, 0x05, - 0x17, 0x1c, 0xe9, 0xd5, 0x4d, 0xab, 0x1b, 0x52, 0x31, 0xcf, 0x26, 0x4e, 0xc0, 0x63, 0x37, 0xe4, - 0x21, 0x77, 0xa5, 0x68, 0x92, 0xcd, 0x24, 0x92, 0x40, 0x4e, 0xa5, 0xb9, 0xf3, 0x51, 0x83, 0xfa, - 0xb0, 0xf4, 0x9f, 0xad, 0xfd, 0xc8, 0x81, 0x68, 0x8c, 0x23, 0x3a, 0xc5, 0x82, 0x72, 0x76, 0x82, - 0x05, 0x1e, 0xd2, 0x07, 0x62, 0x80, 0x36, 0xb0, 0x55, 0xff, 0x8f, 0x0d, 0x3a, 0x84, 0x8d, 0x1f, - 0xf6, 0x1c, 0xa7, 0x73, 0xa3, 0xd6, 0x06, 0xb6, 0xee, 0xe9, 0xab, 0xdc, 0x52, 0x5e, 0x73, 0x4b, - 0x5d, 0x73, 0xfe, 0x2f, 0x0d, 0xba, 0x84, 0x5a, 0x44, 0x67, 0x44, 0xd0, 0x98, 0x18, 0xf5, 0x36, - 0xb0, 0x77, 0x7b, 0x07, 0x4e, 0x35, 0x86, 0x53, 0xfd, 0xc9, 0xb9, 0xf8, 0x92, 0x7a, 0x7a, 0x91, - 0x5b, 0xda, 0x37, 0xf2, 0x37, 0x27, 0x5a, 0x8f, 0x00, 0x6e, 0x68, 0x34, 0x80, 0x6a, 0xc6, 0xa8, - 0x90, 0x3f, 0x37, 0x7a, 0xf6, 0x3f, 0xee, 0x3a, 0x23, 0x46, 0x85, 0xa7, 0x15, 0xb9, 0xa5, 0xae, - 0x27, 0x5f, 0xfa, 0xd1, 0x3e, 0xdc, 0x1a, 0xe3, 0x28, 0x23, 0x32, 0x50, 0xdd, 0x2f, 0x41, 0xa7, - 0x0f, 0xa5, 0x06, 0xed, 0xc1, 0x9d, 0x11, 0x8b, 0x68, 0x4c, 0x05, 0x99, 0x36, 0x15, 0xd4, 0x80, - 0xf0, 0x8a, 0xf0, 0xc1, 0xf0, 0x34, 0xe1, 0xc1, 0xbc, 0x09, 0x90, 0x0e, 0xb5, 0x11, 0xa3, 0x77, - 0xd7, 0x34, 0x26, 0xcd, 0xda, 0x91, 0xba, 0x7c, 0xb2, 0x14, 0xef, 0x78, 0x55, 0x98, 0xe0, 0xb9, - 0x30, 0xc1, 0x4b, 0x61, 0x82, 0xb7, 0xc2, 0x04, 0xcb, 0x77, 0x53, 0xb9, 0xa9, 0x16, 0xc6, 0xd2, - 0x24, 0x08, 0xba, 0x53, 0x72, 0xeb, 0x32, 0xc2, 0x67, 0x69, 0xb7, 0xac, 0xab, 0x1a, 0x60, 0xb2, - 0x2d, 0xb9, 0xfe, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x91, 0x55, 0xe3, 0x01, 0x10, 0x02, 0x00, - 0x00, + // 359 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x51, 0xb1, 0x4e, 0xe3, 0x40, + 0x14, 0xf4, 0x26, 0xbe, 0x93, 0x6f, 0xcf, 0x17, 0x45, 0xab, 0x2b, 0xac, 0x14, 0x76, 0x14, 0x1a, + 0x4b, 0x28, 0x6b, 0x29, 0xa1, 0xa2, 0xc3, 0x82, 0x40, 0x01, 0x14, 0x0e, 0x49, 0x41, 0xb7, 0x71, + 0x36, 0xce, 0x4a, 0xf6, 0xae, 0x15, 0xaf, 0x11, 0xf0, 0x25, 0x69, 0x90, 0xf8, 0x9c, 0x94, 0x94, + 0x88, 0xc2, 0x42, 0xa6, 0xe2, 0x2f, 0x50, 0x36, 0x10, 0x2c, 0x44, 0x41, 0xf7, 0x66, 0xde, 0xcc, + 0xd3, 0x3c, 0x0d, 0xb4, 0x32, 0x29, 0x16, 0x24, 0xa2, 0xd1, 0x42, 0xe4, 0xa9, 0x27, 0x6f, 0x52, + 0x9a, 0xe1, 0x74, 0x21, 0xa4, 0x40, 0x66, 0x75, 0xd3, 0xea, 0x46, 0x4c, 0xce, 0xf3, 0x09, 0x0e, + 0x45, 0xe2, 0x45, 0x22, 0x12, 0x9e, 0x12, 0x4d, 0xf2, 0x99, 0x42, 0x0a, 0xa8, 0x69, 0x63, 0xee, + 0xbc, 0xd6, 0xa0, 0x39, 0xdc, 0xf8, 0x8f, 0xd7, 0x7e, 0x84, 0x21, 0x1a, 0x93, 0x98, 0x4d, 0x89, + 0x64, 0x82, 0x1f, 0x12, 0x49, 0x86, 0xec, 0x96, 0x5a, 0xa0, 0x0d, 0x5c, 0x3d, 0xf8, 0x66, 0x83, + 0xf6, 0x60, 0xe3, 0x93, 0x3d, 0x21, 0xd9, 0xdc, 0xaa, 0xb5, 0x81, 0x6b, 0xfa, 0xe6, 0xaa, 0x70, + 0xb4, 0xa7, 0xc2, 0xd1, 0xd7, 0x5c, 0xf0, 0x45, 0x83, 0xce, 0xa0, 0x11, 0xb3, 0x19, 0x95, 0x2c, + 0xa1, 0x56, 0xbd, 0x0d, 0xdc, 0xbf, 0xbd, 0x1d, 0x5c, 0x7d, 0x03, 0x57, 0x33, 0xe1, 0xd3, 0x77, + 0xa9, 0x6f, 0x96, 0x85, 0x63, 0x7c, 0xa0, 0x60, 0x7b, 0xa2, 0x75, 0x07, 0xe0, 0x96, 0x46, 0x03, + 0xa8, 0xe7, 0x9c, 0x49, 0x95, 0xb9, 0xd1, 0x73, 0x7f, 0x70, 0x17, 0x8f, 0x38, 0x93, 0xbe, 0x51, + 0x16, 0x8e, 0xbe, 0x9e, 0x02, 0xe5, 0x47, 0xff, 0xe1, 0xaf, 0x31, 0x89, 0x73, 0xaa, 0x1e, 0xaa, + 0x07, 0x1b, 0xd0, 0xe9, 0x43, 0xa5, 0x41, 0xff, 0xe0, 0x9f, 0x11, 0x8f, 0x59, 0xc2, 0x24, 0x9d, + 0x36, 0x35, 0xd4, 0x80, 0xf0, 0x9c, 0x8a, 0xc1, 0xf0, 0x28, 0x15, 0xe1, 0xbc, 0x09, 0x90, 0x09, + 0x8d, 0x11, 0x67, 0xd7, 0x17, 0x2c, 0xa1, 0xcd, 0xda, 0xbe, 0xbe, 0xbc, 0x77, 0x34, 0xff, 0x60, + 0x55, 0xda, 0xe0, 0xa1, 0xb4, 0xc1, 0x63, 0x69, 0x83, 0xe7, 0xd2, 0x06, 0xcb, 0x17, 0x5b, 0xbb, + 0xdc, 0xad, 0x14, 0xc6, 0xb3, 0x34, 0x0c, 0xbb, 0x53, 0x7a, 0xe5, 0x71, 0x2a, 0x66, 0x59, 0x97, + 0xa4, 0xcc, 0xab, 0xc6, 0x9f, 0xfc, 0x56, 0xad, 0xf5, 0xdf, 0x02, 0x00, 0x00, 0xff, 0xff, 0x74, + 0xed, 0x88, 0xb3, 0x0e, 0x02, 0x00, 0x00, } func (m *StorageGroup) Marshal() (dAtA []byte, err error) { diff --git a/storagegroup/types.proto b/storagegroup/types.proto index 5014b96..238b454 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"; From 80fde665ca70eda980cc0b23c30a0b7dfda9688c Mon Sep 17 00:00:00 2001 From: Evgeniy Kulikov Date: Thu, 30 Jan 2020 16:38:52 +0300 Subject: [PATCH 3/3] code format --- object/verification.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/object/verification.go b/object/verification.go index 742375a..a00b30a 100644 --- a/object/verification.go +++ b/object/verification.go @@ -68,10 +68,10 @@ func (m Object) Verify() error { var ( err error checksum []byte - pubkey []byte + pubkey []byte ) ind, ih := m.LastHeader(HeaderType(IntegrityHdr)) - if ih == nil || ind != len(m.Headers) - 1{ + if ih == nil || ind != len(m.Headers)-1 { return ErrHeaderNotFound } integrity := ih.Value.(*Header_Integrity).Integrity