From b42537f8d8b68766eb26c2a44738def8d81e4267 Mon Sep 17 00:00:00 2001 From: Evgeniy Kulikov Date: Thu, 30 Jan 2020 15:47:05 +0300 Subject: [PATCH 1/4] 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 9609923a..43f46426 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/4] prepare to rename neofs-proto to neofs-api --- CHANGELOG.md | 26 +++++++++++++------------- accounting/service.go | 6 +++--- accounting/service.pb.go | Bin 21135 -> 21119 bytes accounting/service.proto | 2 +- accounting/types.go | 8 ++++---- accounting/types.pb.go | Bin 83674 -> 83684 bytes accounting/types.proto | 4 ++-- accounting/types_test.go | 10 +++++----- accounting/withdraw.go | 2 +- accounting/withdraw.pb.go | Bin 71346 -> 71354 bytes accounting/withdraw.proto | 2 +- bootstrap/service.go | 2 +- bootstrap/service.pb.go | Bin 15356 -> 15354 bytes bootstrap/service.proto | 2 +- bootstrap/types.go | 2 +- bootstrap/types.pb.go | Bin 17479 -> 17497 bytes bootstrap/types.proto | 2 +- chain/address.go | 2 +- container/service.go | 4 ++-- container/service.pb.go | Bin 61029 -> 61039 bytes container/service.proto | 2 +- container/types.go | 4 ++-- container/types.pb.go | Bin 23406 -> 23425 bytes container/types.proto | 2 +- container/types_test.go | 2 +- decimal/decimal.pb.go | Bin 8573 -> 8585 bytes decimal/decimal.proto | 2 +- go.mod | 2 +- hash/hash.go | 4 ++-- object/extensions.go | 3 ++- object/service.go | 10 +++++----- object/service.pb.go | Bin 122373 -> 122373 bytes object/service.proto | 2 +- object/sg.go | 4 ++-- object/sg_test.go | 4 ++-- object/types.go | 6 +++--- object/types.pb.go | Bin 85248 -> 85248 bytes object/types.proto | 2 +- object/utils.go | 2 +- object/verification_test.go | 7 +++---- query/types.pb.go | Bin 15394 -> 15412 bytes query/types.proto | 2 +- refs/address.go | 2 +- refs/owner.go | 2 +- refs/types.go | 4 ++-- refs/types.pb.go | Bin 9267 -> 9279 bytes refs/types.proto | 2 +- service/meta.go | 4 ++-- service/meta.pb.go | Bin 9851 -> 9863 bytes service/meta.proto | 2 +- service/verify.go | 4 ++-- service/verify.pb.go | Bin 21894 -> 21906 bytes service/verify.proto | 2 +- service/verify_test.go | 2 +- service/verify_test.pb.go | Bin 14924 -> 14948 bytes service/verify_test.proto | 2 +- session/service.go | 2 +- session/service.pb.go | Bin 27261 -> 27277 bytes session/service.proto | 2 +- session/store.go | 2 +- session/store_test.go | 13 +++++++------ session/types.go | 8 ++++---- session/types.pb.go | Bin 22862 -> 22874 bytes session/types.proto | 2 +- state/service.pb.go | Bin 50032 -> 50040 bytes state/service.proto | 2 +- storagegroup/storage.go | 2 +- storagegroup/types.go | 4 ++-- storagegroup/types.pb.go | Bin 17559 -> 17595 bytes storagegroup/types.proto | 2 +- 70 files changed, 100 insertions(+), 99 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3d09b11c..27d0e939 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -111,16 +111,16 @@ associated with owner id Initial public release -[0.2.0]: https://github.com/nspcc-dev/neofs-proto/compare/v0.1.0...v0.2.0 -[0.2.1]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.0...v0.2.1 -[0.2.2]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.1...v0.2.2 -[0.2.3]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.2...v0.2.3 -[0.2.4]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.3...v0.2.4 -[0.2.5]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.4...v0.2.5 -[0.2.6]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.5...v0.2.6 -[0.2.7]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.6...v0.2.7 -[0.2.8]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.7...v0.2.8 -[0.2.9]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.8...v0.2.9 -[0.2.10]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.9...v0.2.10 -[0.2.11]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.10...v0.2.11 -[0.2.12]: https://github.com/nspcc-dev/neofs-proto/compare/v0.2.11...v0.2.12 +[0.2.0]: https://github.com/nspcc-dev/neofs-api/compare/v0.1.0...v0.2.0 +[0.2.1]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.0...v0.2.1 +[0.2.2]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.1...v0.2.2 +[0.2.3]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.2...v0.2.3 +[0.2.4]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.3...v0.2.4 +[0.2.5]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.4...v0.2.5 +[0.2.6]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.5...v0.2.6 +[0.2.7]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.6...v0.2.7 +[0.2.8]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.7...v0.2.8 +[0.2.9]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.8...v0.2.9 +[0.2.10]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.9...v0.2.10 +[0.2.11]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.10...v0.2.11 +[0.2.12]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.11...v0.2.12 diff --git a/accounting/service.go b/accounting/service.go index ac1ceb50..5f8f889a 100644 --- a/accounting/service.go +++ b/accounting/service.go @@ -1,9 +1,9 @@ package accounting import ( - "github.com/nspcc-dev/neofs-proto/decimal" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/decimal" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" ) type ( diff --git a/accounting/service.pb.go b/accounting/service.pb.go index 7a8a08697d669bbe504b7a89aeddd598ed2a25ad..4e1127bfe2c44e270b0552cf756add0e8df16d3b 100644 GIT binary patch delta 2265 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 Bxgh`m diff --git a/accounting/types.proto b/accounting/types.proto index ac512b91..1af83c12 100644 --- a/accounting/types.proto +++ b/accounting/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package accounting; -option go_package = "github.com/nspcc-dev/neofs-proto/accounting"; +option go_package = "github.com/nspcc-dev/neofs-api/accounting"; import "decimal/decimal.proto"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; @@ -85,7 +85,7 @@ message Tx { message Settlement { message Receiver { - // To is the address of funds recipient + // To is the address of funds recipient string To = 1; // Amount is the amount of funds that will be sent decimal.Decimal Amount = 2; diff --git a/accounting/types_test.go b/accounting/types_test.go index c78e5b40..424993a8 100644 --- a/accounting/types_test.go +++ b/accounting/types_test.go @@ -5,10 +5,10 @@ import ( "testing" "github.com/mr-tron/base58" + "github.com/nspcc-dev/neofs-api/chain" + "github.com/nspcc-dev/neofs-api/decimal" + "github.com/nspcc-dev/neofs-api/refs" "github.com/nspcc-dev/neofs-crypto/test" - "github.com/nspcc-dev/neofs-proto/chain" - "github.com/nspcc-dev/neofs-proto/decimal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/stretchr/testify/require" ) @@ -34,7 +34,7 @@ func TestCheque(t *testing.T) { }) t.Run("marshal/unmarshal", func(t *testing.T) { - var b2 = new(Cheque) + b2 := new(Cheque) key1 := test.DecodeKey(0) key2 := test.DecodeKey(1) @@ -67,7 +67,7 @@ func TestCheque(t *testing.T) { }) t.Run("example from SC", func(t *testing.T) { - var pathToCheque = "fixtures/cheque_data" + pathToCheque := "fixtures/cheque_data" expect, err := ioutil.ReadFile(pathToCheque) require.NoError(t, err) diff --git a/accounting/withdraw.go b/accounting/withdraw.go index 11c56081..735fb85b 100644 --- a/accounting/withdraw.go +++ b/accounting/withdraw.go @@ -3,7 +3,7 @@ package accounting import ( "encoding/binary" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/refs" ) type ( diff --git a/accounting/withdraw.pb.go b/accounting/withdraw.pb.go index d80b01cfdc9be61f60f0ff375dd852f07fde9e5d..0e299e7292ec6bd7a89e9fa7a5e5f13d725946e0 100644 GIT binary patch delta 3413 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 diff --git a/accounting/withdraw.proto b/accounting/withdraw.proto index a44e47a8..85000b94 100644 --- a/accounting/withdraw.proto +++ b/accounting/withdraw.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package accounting; -option go_package = "github.com/nspcc-dev/neofs-proto/accounting"; +option go_package = "github.com/nspcc-dev/neofs-api/accounting"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/bootstrap/service.go b/bootstrap/service.go index e67ea6df..e0687283 100644 --- a/bootstrap/service.go +++ b/bootstrap/service.go @@ -1,7 +1,7 @@ package bootstrap import ( - "github.com/nspcc-dev/neofs-proto/service" + "github.com/nspcc-dev/neofs-api/service" ) // NodeType type alias. diff --git a/bootstrap/service.pb.go b/bootstrap/service.pb.go index 7165399abca3e1f22125e42612a8b4e77b732e51..163ff9b135a6ffd14edc4411cae466f125c7122d 100644 GIT binary patch delta 1881 zcmYk7L5dVH6ozTsXiGzj;A|8I+$hWWhbz+?Wo`x+b(p( ziO(HCGtm=^g<;|I0+M1NtAwP9wc)}*Qj2fU6VQ$n0+gF_>wz1Iae%>qVY%1EcH5DU zg~4M_!JYz-_&a&42wdRn4BN!I4-oXtjBU5lN*Vr0hNo5|44&H#JcptMMWa-(BP|2# zTBKG63!DQ&M+Z_@Rr^M;tqX@T$}(QbdZ#>bSSk`<1zJ1|89Ij;k3BkM*iT$GGKm;; z64_mY+g1nac$J}=u_%W~((~2rPPbvu*NMwBY%?kXU&S2BdBM(^WCv9ArKYf%)o?Ge zr>3YKP|Mw8$pHTXgR(X7G;VGGe}b zKEF9FxUoNzOFG}aYfo5XAVORb>Q+LcyL>-?>?XM6)JXOM4(!+L|2MCUG~x1ietYnj zn^*5QJ;43BwHnqLqp~7ih1LYB!=h5_C2P<{Q6pw%tx=Xhu#{XKS&&^DsS$Ma)6%xK zRj7I&DwWsNxyA-b&p@rU7Zo6nQm=B3FzAWzLr2}tp@N6|Ll?isWaN;v?lVD6LP0$F zNLN%28h(kidJav9*@rbdwPRc71Fd0|X_Z8eP|rFs(4EOP(Gk`2=8`&D1HxkQj;Go` zHQm4em53Jgfr_Egqy8KD>Yy1_XH&DPFUF!zhK?xH3siG!;6~+xd(t9Q#UgKs8MLI9 WWhk!&!G_!n5Kotn4?kXi`S2IP@7DAH delta 1901 zcmYk7ONtah5Qgc6pyR?8cY-kBMqw6N@2sP^%zAA{M3~yuAsPg4AV7jHQ(c0Y&)!G-b28fY!$Hs z@glJ!FEb?!=oZo@GXQD6kpp@yY|JsQd>D~6@J3kZCo&`{LrPzg2BJ>nnW3aY4}fg>YQv_%2{f82!xfxzZE4ho8ALq}f?ehElzAJVs$h-#*tGfOxj4d*04VO1> zKOVKiy@I#_<>)a%Uuc#yG58KVEu}jW)V*@+oI_aIU5 zMv=yr?#R2-IDumH1?uy-6&9lN#_YMKGZl^$;u5)aLjjiOO)z8&AXW;}E_Gt8$l!%+ z1VHRa>yCo1W)0|2dTdYFBxm zc(L;VTq`eZ_rCdGGho{1aBH47^0({HkeN2yWi}ft*)7$%Z>CuhxW6!Y;L#z{5&olPN$~pVY z*KUrJjzF0}X^E4*k9FjJ&q+HEfXvZVz)Ad=kGNa*SeF!Q>R4g1vd>eT7%#)9@OB4t zheeAS2#L=X0+paWA(YdxzY3pEGz=WgUgcb!hL~V6bEiEHgaPsgv`-#rn-6Z15Gxo{ z*dLHwfw?Lk?);GCfS#gD+L|z9X5BGB(^no3#2yH-5qp7GC6F8w3}BurhpH5!#y)))`AiWLf}PKSeUG$BxbsN*0%;w2`YNgD}HeSqBK#iU#z= zmhi+)OHbP-2+vQv?l@7N*P~VtVDnIV_tZHv(pNR$;f{2>v8TinR8?ph4p?YPTF252 zkd&}ZT-&p&^%7_Uk#;Y!KZt72Iw0)Q$vg1MINYX0ARIi)IN5w_ZCatKCu zQ5~-{9-hQrQQIN}!X`*WM)3>T(TG(uRZ7DG)93Sr5U-!WI%6a z|6Bmi1NWY;SkgiM#y5m$&AmW4i0v3v?#8>3cUFmpX^g$MVVK=zD?gtUq_qf0fNH51 zDMO-lD5hmnh*!~O|L!Ddf}JinQk?+yUW*e5y=BF^*^cDumPXF&0=|R#G~GOKC~crw m&}uF)ZGQ)W;J<>a9qlSf=VT9gN#66Dp8Wsz_m2-hKm7yjbO%!a delta 2032 zcmYk7F_P6V5JYQ3h&Ci7X9LN$Z0P`S2_jpzPeAZ9r{p9YgDOry#2L5^(tD=ZL|>Lh z(>*;c{Xbuyet&)X@$va7ef#wM<=S4}hsU(`v5w5c%iA~M5p(~@sgENY^UgM7W!$I# zF?H_q$e0Hr$q<=98ju*bO$)&+0hPm7q}?u zb#l0}tri7sgDPdoa*~&Za&#{1F6gYKaAXPVy}X8axNRSxIcYn3S*~UZ5G?j3Qq}I`|NJ;K134UEyKw zQR5P{vOU;Ja5DJbj|I#~Rbr+@2|8nfzz)fkbc!c(aUC(n)})5-wryR>>OBaARzf## zv_816sVyPsrlD8$C!a7Y9Wr$lzrWC&JYy z*k>YB!^wIEbK}$q@+d;nsu61+ogR`Xn{K>s!}hsv`$B2DnFIc(i4b7l{ttR2<9X7C V_S2S@R|sBWaq95%`@3Hs{sJf%`&a+~ diff --git a/bootstrap/types.proto b/bootstrap/types.proto index 5a566dae..02da9ad4 100644 --- a/bootstrap/types.proto +++ b/bootstrap/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package bootstrap; -option go_package = "github.com/nspcc-dev/neofs-proto/bootstrap"; +option go_package = "github.com/nspcc-dev/neofs-api/bootstrap"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/chain/address.go b/chain/address.go index e760d698..bdc8a657 100644 --- a/chain/address.go +++ b/chain/address.go @@ -7,8 +7,8 @@ import ( "encoding/hex" "github.com/mr-tron/base58" + "github.com/nspcc-dev/neofs-api/internal" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/internal" "github.com/pkg/errors" "golang.org/x/crypto/ripemd160" ) diff --git a/container/service.go b/container/service.go index 24727ee7..01d88fa8 100644 --- a/container/service.go +++ b/container/service.go @@ -4,8 +4,8 @@ import ( "bytes" "encoding/binary" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" "github.com/pkg/errors" ) diff --git a/container/service.pb.go b/container/service.pb.go index cac8764ceb0852ab8a131580f2bb9ec3f847dcc5..e202a7cdc075515381cd470d36c581a17a453b3b 100644 GIT binary patch delta 179 zcmaEQhxz>-<_#Q-%!vh=n|T>4O&N_gx0`V@au^xtC>T^2n{J+EuELXVnFQjQr-4Ze z5NVkRB9l@;q@f{*Gy}_~Sc1h=dwZX+~giux4|xL21b# b5#yxEiY}@`AOj4+N)jP%G1?sA!n+Cpl+!Rf delta 169 zcmaEVhxzFp<_#Q-tOZ5+CHb4V87oa04K}x$aWit5Sm-DiR2Z9Vo?))Slbn_Y;-#5D z#6YBZ5{NW129YVLAkrccL>husrX=ZbaT-)4CxfL^K%}_=h%^OjGcW?NEx=06!K8ut YWNjB!A)u%Um~U(XHUMaUk_+!D03pIIA^-pY diff --git a/container/service.proto b/container/service.proto index 9bd02c94..4576197a 100644 --- a/container/service.proto +++ b/container/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package container; -option go_package = "github.com/nspcc-dev/neofs-proto/container"; +option go_package = "github.com/nspcc-dev/neofs-api/container"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/container/types.go b/container/types.go index d5d5a77d..b7189074 100644 --- a/container/types.go +++ b/container/types.go @@ -4,9 +4,9 @@ import ( "bytes" "github.com/google/uuid" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" "github.com/nspcc-dev/neofs-crypto/test" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/nspcc-dev/netmap" "github.com/pkg/errors" ) diff --git a/container/types.pb.go b/container/types.pb.go index 7a454de61c48e4bd35b25fa27d42cde5aaf6bbaa..fb22b139b243fe22c3abf64f129ed44653b4cf4c 100644 GIT binary patch delta 2070 zcmYk7O^(zs5QQ~JEa(kOwzH>^oc}}|202cAhTfov8zGGZx8e-AzHdOYal7quy;rY( z^5@snkKa!}KYx0+bT3~%y??s;_5Pe5JL`DFeja1ZDOPW{DfSb$h1+qDlWmE0p6<5~ z&BYLZ4xSA>=({)>H%vL%anWHp)i}S7K7Q6S){eDcS}@u`s~LoG4x`M`iPwpf1dT(l z62no?`38>r%B#xl3cG6oZ7d-4_|UgrJFHID%)6}wi-D6K@*O8db|A-KG zAutGYJ$e-DV0m(p@x8v`auBnR6MN-3Kv1@=GX#PjSf#f>;LOm*>7+0Ld_6YsXI68y z5JN{iGkS{C_L1n5a93!INMfKFQ*UQN7_c-+Blro|YF^^xdQ^~)f0+z~l_RU}1VQ$u zX8}23Q<3dp6>TIo*;V!nyawY>rU80WOa0a2dBeNFxZ_RN@&6e zu*Y4a8u1q%+lRXuvl}vuXG?}kt6-jlZrvo#9SsAP_El)xMuYOeWn-TeSdq@@f6n(S5ELK*>UeSBC4AVLE8@-;0GKAjAzw`^+GbLcuy5a$ z0C?>KLAjRdlrIvESJCW1Q~$Pz>;NP2t6+q!Cj-GI9!bE0yJFR|Um!16tA0!1d0Fv delta 2030 zcmYk7OODhq5Qa5KEI?vC+u74dahy1bI0$R!bpjT%i{?g1Bf+gW1Lf~)q25?-r(FM| zs@!jXp8o!R`t|ksLz&;dJ%4<<>UMkSUiY=F!_d~Qv~{j+9s9QKOIwGrtt;^pkt651 z+&+JbYor)=uI08aTpkHEMJDD)^sMbBzxfgn_k!P)-n}w?M2&gB-bQmsb;U zGI8w$-@ROpvqdJ>5y)$s+EE@rNZvSzB5Q)u@o0%=fWML>p*FMju<{!$nsg8} znYw{puQRdID8y<;At;k$LRHV@1iQjs7iRQqGZGeqFk12%2`4GMwxF5F>vaJ~w1LnC zg*HIu+JV~Gw?c=MaBRS;o=iKm7eY_IT9TwyaIxGoF;=*5U$1*ZNv}&FNTw3I+A`SC zX*Y%5pnW1e!(y|zNGNJ1a>1~UHM*)v5MU30D{4>fdu!s}z0=vB;H;W%S>0nvbY^&A zc?KeT3#}ywp(mjupRKI`TNn`djYbR$zAYNfK7n@HKDeNgn82pNT6IXY4^8w~Xgj^b zoo=4Z{{p62J!VQK|@u!Zdteq7fFl=djdlp&>JquX81<^X7YO zS$!aS3hmtN#5&AISwXN5?(e7lj!;J?A@D$;FPiJt zfj^?8Jh)(09pbJ7p-1A#DviTO24ah^C%=^$DJ*A5DL}V$G%MsGAjW d$u@y^&@lA>YN_-#Ud}joVuoP!{^jN8_kVee_=5ld diff --git a/container/types.proto b/container/types.proto index 4600046b..e53587e2 100644 --- a/container/types.proto +++ b/container/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package container; -option go_package = "github.com/nspcc-dev/neofs-proto/container"; +option go_package = "github.com/nspcc-dev/neofs-api/container"; import "github.com/nspcc-dev/netmap/selector.proto"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/container/types_test.go b/container/types_test.go index cfd5f52a..0a20d54a 100644 --- a/container/types_test.go +++ b/container/types_test.go @@ -4,8 +4,8 @@ import ( "testing" "github.com/gogo/protobuf/proto" + "github.com/nspcc-dev/neofs-api/refs" "github.com/nspcc-dev/neofs-crypto/test" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/nspcc-dev/netmap" "github.com/stretchr/testify/require" ) diff --git a/decimal/decimal.pb.go b/decimal/decimal.pb.go index d2bed7d3b89eda3e3210c815c09b7209451ac6b8..c0726a488e897b893ebbecf85f0fb12a8aac6efb 100644 GIT binary patch delta 144 zcmezC)akt84+o?1=D!@Tm>82Mzu@j-G@D$^Q{-ZjqN89?VU(=H#c5EHYysj}n1D!g zOR$6iSOm;A04q&R28kFNfk-oB5NR^mkyBhfEe*tmkQONr;|#${!G;=xwWTC(j^+=D!@Tm>5$gzu@j-G@M+_Q)Fjhs-s{~kz}F6#c5DsU<~46in8FFvmbjkj{nkD1s)Fn2b+k zWT0z(-yS_+Qe9`)-s|$Oe_eJzzJBuf`pM6KzcW9)yuN#P&)@FuMgINe<=s~gckT7} zZ@)XX`_HP&Y0qcd=CkYWpFOQE^(lXx&pg>Qu~OB!a$(J8)j{qRALr}~6?mK%rW6S#LJEy|si1Tq-QFqdMPMoo9 zVAn~Lw3t0L`?X@%bF5qNa7IGQb8m2A;jk=O5jPWUR34WduVz4(hl6o5N@~WIn)OX2 zu_Z#ETooiaaYn=D6J~V(X}gT98>&489hXfsuviodw&)qoXgFbpV4N_cm&+1Bma;x` zYyl*#Fwhg4dv?x9J12O@CAgA4XxYqnd9Y#khNJ;KBFVV|n=36lM}v+P9afBlXOgQs zqDMY-Y-+-VBk~sj{9FTrIbO4_4-;@3LsO~2pIXhjV6s-G2^vCm@OHp3VQ6uu0)Q+B zq2EN*+Y_j6c)O#&=fGM6l4WE-ss}7eJ?3eW+GM5{O*mzNFwra=O^6QtR;AFKVVHFq z>j#V(@TU@144d$$0#9ouRJsV;*%E}=7Aq-H>Z%oW$KZawzyA8_{k!S<$E#1Q#8M+I zt4fGveUR?PJXDxV^1Z>x3~1nq3)Zp)Q>Arb4`*dt0gqrzhfMErbVbG)slqS=y3CY5 zx~2Zb^l=ZISb@i`;GRl^qbejPP%!Z{dPf27hJh<^2XJvf2D)c8JW?4OPY8>R4m4KRk$+P|757uTqmsEJI+ZN3!B+eA$pQZ z5XVeA>YE=rbXLPzE5TJV6;D|=eD+*hcxk5w4yPZgE+C%3@znK4fq*86H36aM3}|{B5Gg&lH<~_WSNyYrJAsApFbfr27@50 z{XhIq4OUQdMn`wHHlV8L6ONb^=GbHnOdyYoanLZ!^=Rfu7QwJktUzyjUeROelJ+YG zJAjx=WvGC%&Ri7|3}giL+0&?z)_Kj)b@O`xJ*%11n^nR3;{ITCKw{@}wi-fP&BT zKjKWR@8D*Akqp)s31w4{OiLF`b%)}!QBR>Uhw#I;;Q(*jP^xpSb~&+`GIqz7voT7i zh6>~D>Q2kD&O*6hu*Jt_yCx65xHupgnT<`(3M0Pt2#x9T+0*NEd~RRs_;dmwVK0rC z%(AcBJv7r&6oE@KjYpXiknV(H$EfS;>!W@za~aI%^zHiB@$pA6ak(ir4bC_H^~H}L z9wKK)Q&J>Ks?%aKf5W~F8S+)kyy2K@dR3||9Mn7mTac3`2}<~rhDE6&3v5tQ-h8&K zx8zIdq7c$1W{#TE1!`=x3ItTC!P`R#BcNMU1c2%s<21IKmm8Zz-LcTLP=saEmKk`a z24gKbOlr$xT!tbN5rcdJo0;W3=fqbaJTBI4O)a&J&w)j1C|5jU+ESPdfbXTZ=o?{` zgB?)WVV1X`hb?97z@jJ`luAqa?PbJwON-!oO*Oymp=AXR%`dBlS0x9#w=Pf?{NPOB z6)(A;<1_?t&UL;hL}UGArXs@W+!VDL#n}YOT(S?9{{z4qIk}Mm3N4YOv}SJ${pGF- zw$=z!-V1e@ofO!7dbUCN zuH5}=m?i)w?rh51^bluV{UF9R0{TLZQG*5GIx_<-FOrTr$XrO_h7v7*cyLI|k- zJH#X||HSC@pZJs+RD8S#^}wpT_R#o8O&IK@*QV<{Xh>}FHYxe(Oi-a9N@KcUg|v+C c`==?-i=(4Pxk_VkyZrR#@wYdRcVB+}52z^3jsO4v delta 4872 zcmYkAyN=~V5Qa5Ks}%$Y3B(2@un7_j!q;Q_NgzNV+s9647p=tE09j}?Ins%V$VdqY z*q7L6AmS;Y`uhqriN~kgU6;SA{;Hn)*N^XCKmPfjN6)^$dvSMt>*hA!>YFcp`+dFn z>e)?m{qy;YW4Zmfx^#PaZf$w?r`vblt}b;~eym%0j%S{1k9B#kd9Q}@J~!prDQGV5 z4ZAhFRbN(4NSis^s-S1%sQEMUZI7gCDku7}JlCo`Qv>T2l1@nKd3HP-T&OrTPq=W# z?3QCXva&L3Jc5oEyLYUp*jU-9gammDUY+@}0g-)1L(hTu5k`9W%z<7bai>TBpqrRF z^ZlTHjT|(LkIozzS2S#>ThX&{I-x%mohP0n&y~Xh9WjjE1wk9o>gJ47(^_`dy(l;? zXV&~SLK8cN{>)crR?LsHz+jO+w1R==*>^xvPTS*xv7Oki*6~Tx+3^>mS-LOtjI}%_ia0dR3fyMwUYT;7ChYWY5*8B zso~44Cw8M&N98s;r<86Fl5X0cIP*l3Y@;y}X6vB_LP^MFnX#Y~=1(}WA5 z-?WM{DH@VY*w5TYcFT%^kpfqM&eWqaYQ8kZYSWPQh4)|`!hj%Scv^2CMS|@0^_L%> zd;_2p)>lZHSTXlIJejox-vaF-@ASY7v(z%(`BdU)=j(fy50BQ$L4%%@42aC2mZIvB zr)tdyxQNi(u9?942b|5;zy`nad9`sAhUapcO~t7BPmU~ zz^=6??@JRwwZ(-Naie?)ZtzN!x~XBxXgBC}XfTzmaSuz11K+48NV{mrCV=b~p*C!(3*zWDsMy^30r%#bznLp)$VVmtOP{T zNleWwq**r6N{WIC^Q@|=pm|*EzR^rVkImddPk@2^jQ$00?c4&N^9w?w8xT8;myUJ8 zd~y1btc}lB9Ek=6R<>)o&sHyQb@(=6U2qsa;MR^|sX@aiD#K&kY=;()X)e)g5fUP6 zLD(ooPbeB>mz6STfV;&=M;CizgB6BHRE5yOlL0Mihbh0$OzIF?q8bEg)-8aT?gF>1 zX~PQJhnnSEL$B=YO~I$_!}2i=?CAgJ z4cSKU;Zh{8{M zNiZ6r1l%%CT|YfOkrDM`uoVD7c3%9org98ai1WKd-C2rYIU{@lZ%387zy5aA?-tGA zb1655>)*#m2R1XfT`~m>9D)pi!1 zE0n3C@dFbuSje3jidTl+JBE>VJhF9pWsoVIARL0SJqf+j(Vb=Ptmd$8z$KL(ZT5m3 zUa&}c20u9(Kb=(v1z_O|LMu$wole&7L^T_14eETh>RBmR>X;|)Mfr! zoBH9HB??K%gwtxwdEhWrv7Cge$%(_u z&EZb^0K!gHd5a?5Jtxa}D>iz0m*tdGPS5uf*^$*HrO2R@2+Qfbf9{ZIp?Swpsxr(N zyM1%5UVU&B+->06nKyZaX|qi>r2whZomVkulPn;^OYoHwu_+45>>gyu;R%--+sAN} z4afYLujAe8zH^;@U}N1;+Zg0Elim~jTQn%ua@olN#o1|PI0svk%<|gK=$G_l8RH=q z-qZ#O!Fk*w@LwZYK%j4y+4k++55FAnIhzqE*aprE`lGuQAEY*^#a3qcb7sIRTfH4n zsdj7W(!s|2ymtn#wt+%Xpy-Wk$~pbe8Z+oYndcNil=A;0=odGqC9(C&8PB32rytzS ao&ZI76LAJ?(QnRGuio7M@#g-f`}$wDyvX1H diff --git a/object/service.proto b/object/service.proto index 91c0cbdd..12f97412 100644 --- a/object/service.proto +++ b/object/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package object; -option go_package = "github.com/nspcc-dev/neofs-proto/object"; +option go_package = "github.com/nspcc-dev/neofs-api/object"; import "refs/types.proto"; import "object/types.proto"; diff --git a/object/sg.go b/object/sg.go index 620d24dc..a51123b2 100644 --- a/object/sg.go +++ b/object/sg.go @@ -3,8 +3,8 @@ package object import ( "sort" - "github.com/nspcc-dev/neofs-proto/refs" - "github.com/nspcc-dev/neofs-proto/storagegroup" + "github.com/nspcc-dev/neofs-api/refs" + "github.com/nspcc-dev/neofs-api/storagegroup" ) // Here are defined getter functions for objects that contain storage group diff --git a/object/sg_test.go b/object/sg_test.go index 15cc21bf..ed657b78 100644 --- a/object/sg_test.go +++ b/object/sg_test.go @@ -5,8 +5,8 @@ import ( "sort" "testing" - "github.com/nspcc-dev/neofs-proto/hash" - "github.com/nspcc-dev/neofs-proto/storagegroup" + "github.com/nspcc-dev/neofs-api/hash" + "github.com/nspcc-dev/neofs-api/storagegroup" "github.com/stretchr/testify/require" ) diff --git a/object/types.go b/object/types.go index 79cef655..e5735a57 100644 --- a/object/types.go +++ b/object/types.go @@ -5,9 +5,9 @@ import ( "context" "github.com/gogo/protobuf/proto" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" - "github.com/nspcc-dev/neofs-proto/session" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" + "github.com/nspcc-dev/neofs-api/session" ) type ( diff --git a/object/types.pb.go b/object/types.pb.go index 525b39b3b8b633290cdfab4649036dd57a343266..2be08c96de5f5f00cdf3ba016a909893b4c4dceb 100644 GIT binary patch delta 5057 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 J*;@R$3IO|^DUJXD delta 160 zcmdl|v8ZCh0s%(T%?kxoSecSjCLb5=WHg%`C{|Q&kfftvP+?#RCc*3^1060-gNkIZ zkO`PHO9n}s8GuNOR1j%w2qKNZA_hogS{g_kLMEDl*vTm%G8Jre8d${C0&IZ+$cW7$ H;tx~+Lli4g diff --git a/query/types.proto b/query/types.proto index 6eaed5da..90f4bbf1 100644 --- a/query/types.proto +++ b/query/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package query; -option go_package = "github.com/nspcc-dev/neofs-proto/query"; +option go_package = "github.com/nspcc-dev/neofs-api/query"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/refs/address.go b/refs/address.go index be6b6a32..9c9ce7d0 100644 --- a/refs/address.go +++ b/refs/address.go @@ -4,7 +4,7 @@ import ( "crypto/sha256" "strings" - "github.com/nspcc-dev/neofs-proto/internal" + "github.com/nspcc-dev/neofs-api/internal" ) const ( diff --git a/refs/owner.go b/refs/owner.go index ff88446f..59c9c25b 100644 --- a/refs/owner.go +++ b/refs/owner.go @@ -5,7 +5,7 @@ import ( "crypto/ecdsa" "github.com/mr-tron/base58" - "github.com/nspcc-dev/neofs-proto/chain" + "github.com/nspcc-dev/neofs-api/chain" "github.com/pkg/errors" ) diff --git a/refs/types.go b/refs/types.go index 785155c6..c0ba85a8 100644 --- a/refs/types.go +++ b/refs/types.go @@ -13,8 +13,8 @@ import ( "crypto/sha256" "github.com/google/uuid" - "github.com/nspcc-dev/neofs-proto/chain" - "github.com/nspcc-dev/neofs-proto/internal" + "github.com/nspcc-dev/neofs-api/chain" + "github.com/nspcc-dev/neofs-api/internal" ) type ( diff --git a/refs/types.pb.go b/refs/types.pb.go index 2ccde2f2b821e7d31a8544e8213f806c97288820..80dcde2913886212a10323b183e36d49e8bc46d2 100644 GIT binary patch delta 164 zcmdn&vEO4uEC;iZf#K!^4h3dLi^+}LhZrp)+GDU}r)1V>=tjz$d&CCKMoeH)9qG7Wm H?>{jBn+z&q diff --git a/refs/types.proto b/refs/types.proto index 8c7d2ebf..c526d56a 100644 --- a/refs/types.proto +++ b/refs/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package refs; -option go_package = "github.com/nspcc-dev/neofs-proto/refs"; +option go_package = "github.com/nspcc-dev/neofs-api/refs"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/service/meta.go b/service/meta.go index 8730386c..95c1b13a 100644 --- a/service/meta.go +++ b/service/meta.go @@ -1,7 +1,7 @@ package service import ( - "github.com/nspcc-dev/neofs-proto/internal" + "github.com/nspcc-dev/neofs-api/internal" "github.com/pkg/errors" "google.golang.org/grpc/codes" "google.golang.org/grpc/status" @@ -94,7 +94,7 @@ func IRNonForwarding(role NodeRole) TTLCondition { // ProcessRequestTTL validates and update ttl requests. func ProcessRequestTTL(req MetaHeader, cond ...TTLCondition) error { - var ttl = req.GetTTL() + ttl := req.GetTTL() if ttl == ZeroTTL { return status.New(codes.InvalidArgument, ErrZeroTTL.Error()).Err() diff --git a/service/meta.pb.go b/service/meta.pb.go index d5f58fdf0784197df92472b3a3d04133e80bf08a..6ff1a5da8afb73baf46bd36aee120d23bc148205 100644 GIT binary patch delta 163 zcmezE)9$;Wl$+6Ha~XFQGo#t$hkRX3#-@{V`3vif%ybkCDh$D-nF)xUng}9Ij6q~t z3W&5c0FlXHSp%?2b1-R{1QItk1d&DtI$WFv6$W6X5Hc+dBmp54!5U1!#+h1z#4S=m NBvY#8=3oI0F#uyFDz5+l delta 160 zcmZqo{q3`%l$+6La~XFQGh^!HhkRX31}T$s`3vh!jC2$XDom3>q=6ZTOfv2$ diff --git a/service/meta.proto b/service/meta.proto index d3c3005e..f2cfe8f1 100644 --- a/service/meta.proto +++ b/service/meta.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package service; -option go_package = "github.com/nspcc-dev/neofs-proto/service"; +option go_package = "github.com/nspcc-dev/neofs-api/service"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/service/verify.go b/service/verify.go index 2bd1661c..c8bd8d6d 100644 --- a/service/verify.go +++ b/service/verify.go @@ -4,9 +4,9 @@ import ( "crypto/ecdsa" "sync" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/pkg/errors" ) diff --git a/service/verify.pb.go b/service/verify.pb.go index 95a94527cf7b9f61312b264b05f837741b083cad..a8f0ea52e606b6de078bc747452d560ae500f3b6 100644 GIT binary patch delta 177 zcmZo$%{XZ_sN(zXRYyu)JAQH(S zwmDcl(E`LaG6j()mLSp$ESqYe!^H{Y7=VO~%|WDr8JGkcWB?Y2kZEZkaR_Oi2xdc! S0FxYsh9IG2v(4O!)g}NT)Gr_a delta 141 zcmbQVnz3y))M9LS1-d6Q~epcx^9_cgVy?; z^6k^>bVhzUZ%lnXX;@=Zzr$G9abg9i;kyZ(f)D^rASCyfdfK>>Ax%)~cM@@-sl?7B z&UI@V>bes%@f( zOmk-(8^zo}C{n685H_f`T+`@Y1GpBjej=S_Z0t+8sZ7sfhgjCb285X$W{TLlfRnWZ z{0OC%YvPQs$YA!wC}an7;WS!?L1Kl#mv9W&H*l`1NY)nKki`%1XHAVor^waD&}bkav4ZTa)k z18*Nm15QuS)ocqIMlwm*$1r1zwv}g4x^s009Ag3`7XT*oXT}5Wd(NYUr0sUOB<})OaLQI)DT6x$J2NHm9qia+@mfwd^ozOt*Np2*oj2b> zk#Lp?j5tfVf#b+Z1SNHnV?vuX6vvj-RkmE&jR8e(eKvKm7Ul7luK{cmMzZ delta 1803 zcmYk7O^(zs5QW7O2Cy03@!#G1$!|h`+Bj z>W!5yyI#F|e&zo6^!Mraue&$#@_hFrrRMQd*z;D`CDk>B$9HeT-h}#NXzRMpb!}r^ z^K|+CJ|APLKW0KHlQ9ZKULH8R)HS%W8(AB6Th;(X=W4DvW6kX+5Q+u5`lG99$KHav z$_aiGT(`9zYG|b+p(m0dy!3T?0u(4fhosU=rxDt)0f z&3l~vRFyhdCNP|6-#g>8hSq5MgR9K2NVrGq6`9h%Be|{=ke(Ch^MNPNNr$DQoI&-C zTR{y-U#P70e9T9B7-f;H0MKiw&OXTz!urFv#~B9t*n4`o)w3l*1GGSNR*;5QIU=Z& zu>!%%ef>M|1yslYRsV?;HPQ}ReBFJ5&V+gmEj<)2Q9(Dpb!nV0-|jztmf2~(v&E5Z Q6IOVKI=O#--oJeL4^Vo;sQ>@~ diff --git a/service/verify_test.proto b/service/verify_test.proto index c6326151..ce81180a 100644 --- a/service/verify_test.proto +++ b/service/verify_test.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package service; -option go_package = "github.com/nspcc-dev/neofs-proto/service"; +option go_package = "github.com/nspcc-dev/neofs-api/service"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/session/service.go b/session/service.go index d9f889fd..39dfb110 100644 --- a/session/service.go +++ b/session/service.go @@ -4,8 +4,8 @@ import ( "context" "crypto/ecdsa" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/refs" ) type ( diff --git a/session/service.pb.go b/session/service.pb.go index 853252394b03b14c32b22b18ab6e1031b03a07df..e554ba1d8534e8289b427baebc8862d6bb7dec5a 100644 GIT binary patch delta 2144 zcmYk8J8l(05JmL_i9w_YXLjzO=i4(oAY=>kmBT3Cloo4x51GAW?nJ2)(2| zuez)5ty@*y{`>p#?a$@M>&vU@%jcK7%jLr*Kfk^Idi2}VL%MEtS=;pV<}O{URDSe5 zroF7oP}Yn+&*i(B$~v&lD;7_(J9JpavQAZ5*QTt)2!LpF33psu{HC_-w|IhXoQ1O)esoTBtd&5_JVUMZe+;! z3_JVz95DooUM={QcZSJ1*PgX;yy}b{N5i2fYERiVSWNJ;NkY{)(^zQokEFOVINBqI z(=gK2##-un-#OUEq9MpJG33Ky#c=^lG_!^ zY#?+v*vh3@13~tcDdLtmWUV%0uSoCUuI$zpgWU$-*%Ws0&pSqhj2M$Qgj%87ipM#c zSQL6Bs?%UGEc${yCLjdPNV}bN1|X(8Hl_oFjBg-4c31r>86bCqNz6~qej^+kE?{ACYKrLkGSdCmtz8@$ku>dgMunC??rAhCu_jm3X zLi@=4$UEoUWIIeRKx(W~a%QaX=9osN_e*;kB;kjY{~CTg%8 z8%Zn0=|={kQi5Wu+zfs}zXLF@drr$Sf zwDq}?hQ?i-Z~kmnns>EN8|t<~aX3(|c&jihO@U$CHw{5Eshc*aXwuVC&?I>RMM|g} z`09^tKwsvxMB`gHTjdQQ^Px?gh^+;s#WA80-I^7>8P-E9v%eOcHA60fuNo{dSb{iB z!^~MXcchgbX_w#PX>KZK4-MKhTC&>fT7KF?R$2qlTNmiIKZ!TfV!cFmD=oH0N!y~| zNgP(j;8xRLNdB5VB|vVt2~;$PkXHy%aF|a%A~h(njphbSwM;cc!W=3Hw!tk)y#x`5 z6{!YfXwyCDZv*(+YkIl#HjM8{QrEZdjKG^*mMc4!Ht@%8uPuh0JhR7@3` diff --git a/session/service.proto b/session/service.proto index 377e77ee..95ea9c59 100644 --- a/session/service.proto +++ b/session/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package session; -option go_package = "github.com/nspcc-dev/neofs-proto/session"; +option go_package = "github.com/nspcc-dev/neofs-api/session"; import "session/types.proto"; import "service/meta.proto"; diff --git a/session/store.go b/session/store.go index 1daf1511..b671a8cb 100644 --- a/session/store.go +++ b/session/store.go @@ -6,8 +6,8 @@ import ( "crypto/rand" "sync" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/refs" ) type simpleStore struct { diff --git a/session/store_test.go b/session/store_test.go index ade0cb03..6ee17adb 100644 --- a/session/store_test.go +++ b/session/store_test.go @@ -5,8 +5,8 @@ import ( "crypto/rand" "testing" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/stretchr/testify/require" ) @@ -61,8 +61,8 @@ func TestTokenStore(t *testing.T) { // create new token token := s.New(TokenParams{ - ObjectID: []ObjectID{oid}, - OwnerID: c.OwnerID, + ObjectID: []ObjectID{oid}, + OwnerID: c.OwnerID, PublicKeys: pk, }) signToken(t, token, c) @@ -74,9 +74,10 @@ func TestTokenStore(t *testing.T) { // create and sign another token by the same client t1 = s.New(TokenParams{ - ObjectID: []ObjectID{oid}, - OwnerID: c.OwnerID, - PublicKeys: pk}) + ObjectID: []ObjectID{oid}, + OwnerID: c.OwnerID, + PublicKeys: pk, + }) signToken(t, t1, c) diff --git a/session/types.go b/session/types.go index 08abec8f..120b8a89 100644 --- a/session/types.go +++ b/session/types.go @@ -5,10 +5,10 @@ import ( "encoding/binary" "sync" + "github.com/nspcc-dev/neofs-api/chain" + "github.com/nspcc-dev/neofs-api/internal" + "github.com/nspcc-dev/neofs-api/refs" crypto "github.com/nspcc-dev/neofs-crypto" - "github.com/nspcc-dev/neofs-proto/chain" - "github.com/nspcc-dev/neofs-proto/internal" - "github.com/nspcc-dev/neofs-proto/refs" "github.com/pkg/errors" ) @@ -113,7 +113,7 @@ func (m *Token) Sign(key *ecdsa.PrivateKey) error { } // SetPublicKeys sets owner's public keys to the token -func (m *Token) SetPublicKeys(keys... *ecdsa.PublicKey) { +func (m *Token) SetPublicKeys(keys ...*ecdsa.PublicKey) { m.PublicKeys = m.PublicKeys[:0] for i := range keys { m.PublicKeys = append(m.PublicKeys, crypto.MarshalPublicKey(keys[i])) diff --git a/session/types.pb.go b/session/types.pb.go index 5b2f5c4a1e079f2dc57e7c7804dfd064fe66a275..e27f0c68f5c674b2ee9f2a25451f526db5f3686e 100644 GIT binary patch delta 2104 zcmYk7y>Z+y5QRt1>{y8dc~pP`fd3p9;+Q1J3LIR7*$J3S zUGG_6C(ev@9CICW%P!|jQ|FFTf2~)5HPt_7n(NO_4rz>RWX>)`XLcJ%_GIngwG+E> zriW3>JlIu)#Y2#prA@#Lz|8z?$UPD*@66E+{En(*XAKMMQFBEwI7>h!p(l+FgaUqs z%SgIGsdnlwqHXohVLfb&8wg1PY$s&^E!hmnZ0yb;9H32{yw2043Gr3{c49;SDB-;I zf}%-5hK?q7(%UTIev*Man-s~oA zC64`sUANl?h#d&fkV4uQF$6mZxH`g-_ z966IAzub|R%fxw^qR4p*C99PNiXLFOF@^&wn(aZJjj`A&(7aI%I7N$rtm$mz;cd_# zEijoBDFV*8{49C4L0s?nf()54as-!F94cHj8oPa_1k1e)4VmaqgbjqPl&%b3;yzde z{=r6qk_t~KypzJa7j;&VW{wu+fxyU^bPV0=nKz2z92PCYG`i~DpA|o$WZQwD(|pnv zD9Ky<>W>VIO|O8zFc!qn+z0bkW6-t`xR$U|n{Q0KS!d|uwU^mtD@!NN91~o8j^yQf z0%xbfa4aGbJS)9!Akpgl&ZT9&!&kQ!ZM}zC0}{|PhQ;tIne>F@eUHVo>0X}!+Semy z>N{Scd98m%Nwp1}iV%*9jgg3k2wz{HH+MH!_#Al;ij7ec$a`0+(ciyKn-|*mc$v?- zvv9{&Y`Q?kPsepn$vWFy#-1|+bH@dvY5hTwt|!QHkzvp)9Q7gWI`I9zX=07*6J6jH z`GVu5i3pBwQx$0=>%`K6RDJ|K>ctI-Be*d3aPhkPOr_@a`RVhQn(X?Dlg#(Thq)Pk JetY`&^*>yx59|N{ delta 2104 zcmYk7J8s=D5Jlm136RdMgDk)WsUIn1H4-JQAcZsi`e&n&8^V-e>OG-Eu z?A%UM``)?T=Jq}C9SAop&9V?-0Va0<=yXNA0`Ep5O~fAayGXHpM^7*p{0lxyXty1) zH!R%tJk~z!L!ut*SR3;NQ@CzxlYy! zw7_jr1(?dWUqpad5A=-FOzJE4pu#*GKptQbn&mnV)GHt?VA`xbAyN^6s3vFQMg+*5 zn=bW)S2llg5df;iPA_BK*toZiFlvN2bcc&50 z1=T^L5PQPMdD{`dSy{>19;#KX?S5;HV1rA^Y$MOc?fGh6w9iCASKe7-SE?~APo3H7 z@4~B+w6|ssuex>Gyv>ALxv)yMvfG8JyZ7}Sr7N}8dqq@`-x5LTp2P^|;f zC_#QuR!CaUm97d{5;C}BC0`q+<-hV+dKIl9xY&#xNY2esY#->kEX>x$wu7&1Nl~$6 zrF~=901Bp3uEu_o8Hzb?BjP5Vz;|=lld|_z3+JH2vu>S+a1$WJgsO+yVzI0G2)+YS z!0c4jlSZ>y{U^GSqaq=Fg0?g=mL8E@2mVnWh;bl*%fb;0;UzzP{?ck-@>2JY(~w>M JS)TrV`wy5|5D5SP diff --git a/session/types.proto b/session/types.proto index 294928b5..79b24ff5 100644 --- a/session/types.proto +++ b/session/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package session; -option go_package = "github.com/nspcc-dev/neofs-proto/session"; +option go_package = "github.com/nspcc-dev/neofs-api/session"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; diff --git a/state/service.pb.go b/state/service.pb.go index 09cc645e781b7a06fb8063afc157ca813ddc4dc9..62f5f4e026fc0bcbe3b8da16bfd46bf1d005d69e 100644 GIT binary patch delta 2760 zcmYk8JB}4G5JfdJ0fJRPj==q~+l|Cx+&_s7iR49ehRE3n(!@wCiI5QcoJM+yr^j|x z-MV$F{Qi7<`upwa=i|du`TXg}i-)fLeg63H_1$CYe*Aj>>9sfPc*g29XalZ5bh%o zXY_s{hvjZ-#GnI40Jc|!s-ub12^U?X>b%WFH~)w zia``}BSVrR#3Wc)+|M<@SxduSrnnIpJ?A6q0hogCKs48l`y2VgW~j1+`mw9#{~~EA$nfG81*im^RUjiJQ<@|GBIWjK!63qL(dxT-rhp6g6OQss{E2@K@^=FGtuSWmX&ELGwTM?Vyk78tTBI8yXTA%r zBj`Fc%*`zspW|&Ohx(^d5;(WqcCp2EC=E6!cWm4RtBXhg2TI%<$Ii4HoMLu;j%SND zf@#Ocirv+d*iGQBSnJJ+Z0$WKK+nGN7$ixGCwW6RJAeb)TXAt<)*JsIvIE~P-Z8E( zL5+Es1Gwr$ZBknBXX?so2I@gH$#dXF963Y+VH_44_xq9j3;Nh}Y8i_3VX=dI0EVq; zFAGvi9Bdnam0N)}`)SgHJ|ih8>vE#Kq+~eP`WmC4-<1!%t!f{r)=)(D3!L~zSj?iwjLQes6uG0TAW`7My@2+Sv$ z`}z(x2xj$a%fSIsu)fL)B@5-7*-xw&#hi*|B~EYAfjvXE`*oDG0H>3{7g6~LCS$Q# zm^*QaNcNPn-DBzPUdL38(;_&79qd-pW*vZiZb&0gtDQLZp#qdQ3lk`n!npEpFKF!s zRgb^x=M-g#_83X~3(7H-tt4!pS0lh%0);AZ1oyIJ4hLlPfV5V=4fdh$-i`u&x_y-t z!)n>6?Fyofbk6z+wH%zmzRNy^%EuSfcgF|OpFDQG5iHwEK9=73?Tm>&Z-FMdUzsa! VuJPhXRg~iMC7Ac;pC5jI{|99qw08gi delta 2752 zcmYk8JB}4W3`I2{0?5f(0D|i3Z?T*Hrh|asMRYbIpN$}qK*o{?32~j%NRwDS^<2L8 z^|fpMK0N>P@cjF;yB8ln-G8}%d~w(K^`qQ&QXAnli0lM>T!iHYz$$4w2&`1Zj2V7S(f*xz;!fha2 zbAXUZz$2;ZAjxEQ!cClvBtPMwp(=~N_tXGOE3OGX#|eZ3xMQqNtv?XyAjy$)Yb&6Q zq&-UsXipnyGgjhseE^*4RsbEiE%hDAblfiF+CoE1s-cg_Wye~Zm5*dfRX3w`3nfU# z4CnycR+uBnz_-E`v<`;bT4^u_KhLxwbJAfO@GX6W)QyuB@bKF8d6Qp5TTNiK zG2W8~2-wMJ$MfK>x}At%8xHCZ-PVD&>xb--d`!bx3+49A4@!CATUUjEtdnCP%6SXS! zt`!GuA+#Nir2{_Q3mJmIAGS}Ww-oB+WSUVRV5ElG%QlR2HJqJQ?k-ll1K@}mBCjWN z?JSd7ES8|enQXcDbaU;<%F3@CVL|E7b)sV*a_!=cG~AzZJD3t_=L3A#-b4-VkDiQ@ z;)2yeUYj+z6ap?%m0}g++8HeYoQ**GyR6)+3wh-Md>4e290N5-!wAB)n~5svYTqPx z&Ku&XA=lBsU1i|Z`A)^kt|ZCrbmCE&8> z`8ne&rAzTlqYq_(tOnZ9f`6?HzLVKq)4(4K1SE)YubA-Zu(-yZbQ`Sz<+dS0Eo%;Byg|D}uKjL8oiQRlRpm5)V~X ziOS@}a5D-Mvq%q8aZ1kRdVR>ocey~W@@?_G{yQV8L_3qdPzUw6#a*liw=(|0c`f0h Yo+EoWRmj)ZwsO*K`ka3J{P6qRKg1Zc3IG5A diff --git a/state/service.proto b/state/service.proto index a30af225..7966d43b 100644 --- a/state/service.proto +++ b/state/service.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package state; -option go_package = "github.com/nspcc-dev/neofs-proto/state"; +option go_package = "github.com/nspcc-dev/neofs-api/state"; import "service/meta.proto"; import "service/verify.proto"; diff --git a/storagegroup/storage.go b/storagegroup/storage.go index a23ef744..d41af495 100644 --- a/storagegroup/storage.go +++ b/storagegroup/storage.go @@ -3,7 +3,7 @@ package storagegroup import ( "context" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/refs" ) type ( diff --git a/storagegroup/types.go b/storagegroup/types.go index 6c6f775f..52c1410c 100644 --- a/storagegroup/types.go +++ b/storagegroup/types.go @@ -7,8 +7,8 @@ import ( "github.com/gogo/protobuf/proto" "github.com/mr-tron/base58" - "github.com/nspcc-dev/neofs-proto/hash" - "github.com/nspcc-dev/neofs-proto/refs" + "github.com/nspcc-dev/neofs-api/hash" + "github.com/nspcc-dev/neofs-api/refs" ) type ( diff --git a/storagegroup/types.pb.go b/storagegroup/types.pb.go index f05288533e982981af115828716b53db2bcaf863..aae646a5d92f0bfc75d32799e7abdb6b58868100 100644 GIT binary patch delta 2133 zcmYk7Es|9+5QS?b_^}iUH6pqHad_B7a(^~}dG6}b2)02Lk|n^R=zQM@OsZdQy3gs; zCwV_!pMJkS{rvO%RKEXx{&u(g@-aQ8v#;k!oL=6)OOHJD9~bMe^tf@TaA>*u&d!=w z(&oO_*4Kfx?mf27N(JLw0hs!s`!Q_&)M8%gafMPHdc1?S5l^Y_B)(cH!Du3DV!y#< z%^-|`?jEW=`C_NClRM%2QSE{33xt7A7OEC@E;ttYDJT+a7ir_eE}q>7i!o; z050+yxxDY=s^c#L$OX$4D5Q z4dfHFLOe?tE{<*H>u7^E5+?(H8$r;T3mINS$(SL@Cr)b?ijOpPFiC%bIm zYlBRMi2HrB#Z2pmej;HqK>!L}7x-^#XloIOXVUbFuS+>V@G%>yba*qs(LKtx;k{iP zzWUPh>^^L&?cn=b_|!(s!-^;L+kzOnREfiHA%J$heG|er5sz?G&M-y? zm?eLETi|CsuZg_1mH!0Z290qrs)W&Zbe7jl+!_eFzS;-`c5en_kW#woBr<~Ktf6EC zz4#xC{ec~yU`JBkZi7`7gAyVXrgyRLZIs1j&wSNw=`)=tr)L^#{1J4OPT2b|=e74Q O_bofpetr4y_0vDZWD@NF delta 2071 zcmYk7yKc}h7=_ib6$?WNLNcFS+E<$M=)lX2ajqEC8-^8#Wc`ezF0?T8_@=NVj|RXtx`9Hn z@>ug`ejYw#Dp}YT;U6X#62(n?Zebh2>oCcV1thI%VP%hN$74Ed-j7P+%yzgf5QRU|u@xSDHdZ6Gl{b|^iyI`F z5j;?>t&bF9!-gb3ekRY`Y%6J* zs0y$>k@s3}D{F|#1qFoHo6T$99395gPQFmKbO&+5Y)f88QMUL^>DSxfbs* z_ F_!l|w0_6Yz diff --git a/storagegroup/types.proto b/storagegroup/types.proto index 5014b962..238b4548 100644 --- a/storagegroup/types.proto +++ b/storagegroup/types.proto @@ -1,6 +1,6 @@ syntax = "proto3"; package storagegroup; -option go_package = "github.com/nspcc-dev/neofs-proto/storagegroup"; +option go_package = "github.com/nspcc-dev/neofs-api/storagegroup"; import "github.com/gogo/protobuf/gogoproto/gogo.proto"; From 80fde665ca70eda980cc0b23c30a0b7dfda9688c Mon Sep 17 00:00:00 2001 From: Evgeniy Kulikov Date: Thu, 30 Jan 2020 16:38:52 +0300 Subject: [PATCH 3/4] code format --- object/verification.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/object/verification.go b/object/verification.go index 742375a9..a00b30af 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 From 3f5a819af699e967dc2269291d32cc39b8232b02 Mon Sep 17 00:00:00 2001 From: Evgeniy Kulikov Date: Mon, 3 Feb 2020 11:35:35 +0300 Subject: [PATCH 4/4] CHANGELOG --- CHANGELOG.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 27d0e939..281bedca 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,15 @@ # Changelog This is the changelog for NeoFS Proto +## [0.2.13] - 2020-02-03 + +### Fixed +- Code format + +### Changed +- Use separated proto repository +- Rename neofs-proto to neofs-api + ## [0.2.12] - 2020-01-27 ### Fixed @@ -124,3 +133,4 @@ Initial public release [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 +[0.2.13]: https://github.com/nspcc-dev/neofs-api/compare/v0.2.12...v0.2.13