From 60e9c3d0d3cfcf4188925c7fa0f0efa7d9a4bfb6 Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Fri, 14 Aug 2020 19:00:16 +0300 Subject: [PATCH] Update structure with grpc subdir Signed-off-by: Alex Vanin --- prepare.sh | 11 +- v2/{ => accounting}/accounting.go | 25 +- v2/accounting/convert.go | 106 +++++++ v2/accounting/{ => grpc}/service.go | 4 +- v2/accounting/{ => grpc}/service.pb.go | Bin 38962 -> 38986 bytes v2/acl/{ => grpc}/types.go | 2 +- v2/acl/{ => grpc}/types.pb.go | Bin 40153 -> 40211 bytes v2/container/{ => grpc}/marshal.go | 0 v2/container/{ => grpc}/marshal_test.go | 4 +- v2/container/{ => grpc}/service.go | 6 +- v2/container/{ => grpc}/service.pb.go | Bin 174072 -> 173898 bytes v2/container/{ => grpc}/signature.go | 0 v2/container/{ => grpc}/types.go | 4 +- v2/container/{ => grpc}/types.pb.go | Bin 20728 -> 20777 bytes v2/convert.go | 350 ------------------------ v2/netmap/{ => grpc}/marshal.go | 0 v2/netmap/{ => grpc}/types.go | 0 v2/netmap/{ => grpc}/types.pb.go | Bin 66530 -> 66558 bytes v2/object/{ => grpc}/service.go | 4 +- v2/object/{ => grpc}/service.pb.go | Bin 256858 -> 256612 bytes v2/object/{ => grpc}/types.go | 4 +- v2/object/{ => grpc}/types.pb.go | Bin 49203 -> 49234 bytes v2/refs/convert.go | 29 ++ v2/refs/{ => grpc}/marshal.go | 0 v2/refs/{ => grpc}/marshal_test.go | 0 v2/refs/{ => grpc}/types.go | 0 v2/refs/{ => grpc}/types.pb.go | Bin 23177 -> 23223 bytes v2/refs/owner.go | 19 ++ v2/service/convert.go | 201 ++++++++++++++ v2/service/{ => grpc}/meta.go | 4 +- v2/service/{ => grpc}/meta.pb.go | Bin 76624 -> 76676 bytes v2/service/{ => grpc}/verify.go | 0 v2/service/{ => grpc}/verify.pb.go | Bin 29183 -> 29251 bytes v2/service/{ => grpc}/version.go | 0 v2/{ => service}/service.go | 36 ++- v2/session/{ => grpc}/service.go | 4 +- v2/session/{ => grpc}/service.pb.go | Bin 36240 -> 36226 bytes v2/signature/sign.go | 23 +- v2/storagegroup/{ => grpc}/types.go | 2 +- v2/storagegroup/{ => grpc}/types.pb.go | Bin 13094 -> 13133 bytes 40 files changed, 432 insertions(+), 406 deletions(-) rename v2/{ => accounting}/accounting.go (57%) create mode 100644 v2/accounting/convert.go rename v2/accounting/{ => grpc}/service.go (92%) rename v2/accounting/{ => grpc}/service.pb.go (84%) rename v2/acl/{ => grpc}/types.go (97%) rename v2/acl/{ => grpc}/types.pb.go (87%) rename v2/container/{ => grpc}/marshal.go (100%) rename v2/container/{ => grpc}/marshal_test.go (92%) rename v2/container/{ => grpc}/service.go (97%) rename v2/container/{ => grpc}/service.pb.go (88%) rename v2/container/{ => grpc}/signature.go (100%) rename v2/container/{ => grpc}/types.go (89%) rename v2/container/{ => grpc}/types.pb.go (84%) rename v2/netmap/{ => grpc}/marshal.go (100%) rename v2/netmap/{ => grpc}/types.go (100%) rename v2/netmap/{ => grpc}/types.pb.go (92%) rename v2/object/{ => grpc}/service.go (99%) rename v2/object/{ => grpc}/service.pb.go (89%) rename v2/object/{ => grpc}/types.go (96%) rename v2/object/{ => grpc}/types.pb.go (86%) create mode 100644 v2/refs/convert.go rename v2/refs/{ => grpc}/marshal.go (100%) rename v2/refs/{ => grpc}/marshal_test.go (100%) rename v2/refs/{ => grpc}/types.go (100%) rename v2/refs/{ => grpc}/types.pb.go (91%) create mode 100644 v2/refs/owner.go create mode 100644 v2/service/convert.go rename v2/service/{ => grpc}/meta.go (97%) rename v2/service/{ => grpc}/meta.pb.go (91%) rename v2/service/{ => grpc}/verify.go (100%) rename v2/service/{ => grpc}/verify.pb.go (91%) rename v2/service/{ => grpc}/version.go (100%) rename v2/{ => service}/service.go (91%) rename v2/session/{ => grpc}/service.go (93%) rename v2/session/{ => grpc}/service.pb.go (83%) rename v2/storagegroup/{ => grpc}/types.go (93%) rename v2/storagegroup/{ => grpc}/types.pb.go (82%) diff --git a/prepare.sh b/prepare.sh index 5962123f..c0e4a37c 100755 --- a/prepare.sh +++ b/prepare.sh @@ -16,13 +16,16 @@ cd $API_PATH ARGS=$(find ./ -name '*.proto' -not -path './vendor/*') for file in $ARGS; do dir=$(dirname $file) - cp -r $dir $API_GO_PATH/$prefix + mkdir -p $API_GO_PATH/$prefix/$dir/grpc + cp -r $dir/* $API_GO_PATH/$prefix/$dir/grpc done # MODIFY FILES cd $API_GO_PATH/$prefix -for file in $ARGS; do - sed -i "s/import\ \"\(.*\)\";/import\ \"$prefix\/\1\";/" $file +ARGS2=$(find ./ -name '*.proto') +for file in $ARGS2; do + echo $file + sed -i "s/import\ \"\(.*\)\/\(.*\)\.proto\";/import\ \"$prefix\/\1\/grpc\/\2\.proto\";/" $file done cd $API_GO_PATH @@ -30,7 +33,7 @@ cd $API_GO_PATH make protoc # REMOVE PROTO DEFINITIONS -ARGS=$(find ./ -name '*.proto' -not -path './vendor/*') +ARGS=$(find ./$prefix -name '*.proto' -not -path './vendor/*') for file in $ARGS; do rm $file done diff --git a/v2/accounting.go b/v2/accounting/accounting.go similarity index 57% rename from v2/accounting.go rename to v2/accounting/accounting.go index a14e5a1e..a49f79b4 100644 --- a/v2/accounting.go +++ b/v2/accounting/accounting.go @@ -1,18 +1,23 @@ -package v2 +package accounting + +import ( + "github.com/nspcc-dev/neofs-api-go/v2/refs" + "github.com/nspcc-dev/neofs-api-go/v2/service" +) type BalanceRequestBody struct { - ownerID *OwnerID + ownerID *refs.OwnerID } type BalanceRequest struct { body *BalanceRequestBody - metaHeader *RequestMetaHeader + metaHeader *service.RequestMetaHeader - verifyHeader *RequestVerificationHeader + verifyHeader *service.RequestVerificationHeader } -func (b *BalanceRequestBody) GetOwnerID() *OwnerID { +func (b *BalanceRequestBody) GetOwnerID() *refs.OwnerID { if b != nil { return b.ownerID } @@ -20,7 +25,7 @@ func (b *BalanceRequestBody) GetOwnerID() *OwnerID { return nil } -func (b *BalanceRequestBody) SetOwnerID(v *OwnerID) { +func (b *BalanceRequestBody) SetOwnerID(v *refs.OwnerID) { if b != nil { b.ownerID = v } @@ -56,7 +61,7 @@ func (b *BalanceRequest) SetBody(v *BalanceRequestBody) { } } -func (b *BalanceRequest) GetRequestMetaHeader() *RequestMetaHeader { +func (b *BalanceRequest) GetRequestMetaHeader() *service.RequestMetaHeader { if b != nil { return b.metaHeader } @@ -64,13 +69,13 @@ func (b *BalanceRequest) GetRequestMetaHeader() *RequestMetaHeader { return nil } -func (b *BalanceRequest) SetRequestMetaHeader(v *RequestMetaHeader) { +func (b *BalanceRequest) SetRequestMetaHeader(v *service.RequestMetaHeader) { if b != nil { b.metaHeader = v } } -func (b *BalanceRequest) GetRequestVerificationHeader() *RequestVerificationHeader { +func (b *BalanceRequest) GetRequestVerificationHeader() *service.RequestVerificationHeader { if b != nil { return b.verifyHeader } @@ -78,7 +83,7 @@ func (b *BalanceRequest) GetRequestVerificationHeader() *RequestVerificationHead return nil } -func (b *BalanceRequest) SetRequestVerificationHeader(v *RequestVerificationHeader) { +func (b *BalanceRequest) SetRequestVerificationHeader(v *service.RequestVerificationHeader) { if b != nil { b.verifyHeader = v } diff --git a/v2/accounting/convert.go b/v2/accounting/convert.go new file mode 100644 index 00000000..9f049431 --- /dev/null +++ b/v2/accounting/convert.go @@ -0,0 +1,106 @@ +package accounting + +import ( + accounting "github.com/nspcc-dev/neofs-api-go/v2/accounting/grpc" + "github.com/nspcc-dev/neofs-api-go/v2/refs" + "github.com/nspcc-dev/neofs-api-go/v2/service" + grpcService "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" +) + +func BalanceRequestBodyToGRPCMessage(b *BalanceRequestBody) *accounting.BalanceRequest_Body { + if b == nil { + return nil + } + + m := new(accounting.BalanceRequest_Body) + + m.SetOwnerId( + refs.OwnerIDToGRPCMessage(b.GetOwnerID()), + ) + + return m +} + +func BalanceRequestBodyFromGRPCMessage(m *accounting.BalanceRequest_Body) *BalanceRequestBody { + if m == nil { + return nil + } + + b := new(BalanceRequestBody) + + b.SetOwnerID( + refs.OwnerIDFromGRPCMessage(m.GetOwnerId()), + ) + + return b +} + +func headersToGRPC( + src interface { + GetRequestMetaHeader() *service.RequestMetaHeader + GetRequestVerificationHeader() *service.RequestVerificationHeader + }, + dst interface { + SetMetaHeader(*grpcService.RequestMetaHeader) + SetVerifyHeader(*grpcService.RequestVerificationHeader) + }, +) { + dst.SetMetaHeader( + service.RequestMetaHeaderToGRPCMessage(src.GetRequestMetaHeader()), + ) + + dst.SetVerifyHeader( + service.RequestVerificationHeaderToGRPCMessage(src.GetRequestVerificationHeader()), + ) +} + +func headersFromGRPC( + src interface { + GetMetaHeader() *grpcService.RequestMetaHeader + GetVerifyHeader() *grpcService.RequestVerificationHeader + }, + dst interface { + SetRequestMetaHeader(*service.RequestMetaHeader) + SetRequestVerificationHeader(*service.RequestVerificationHeader) + }, +) { + dst.SetRequestMetaHeader( + service.RequestMetaHeaderFromGRPCMessage(src.GetMetaHeader()), + ) + + dst.SetRequestVerificationHeader( + service.RequestVerificationHeaderFromGRPCMessage(src.GetVerifyHeader()), + ) +} + +func BalanceRequestToGRPCMessage(b *BalanceRequest) *accounting.BalanceRequest { + if b == nil { + return nil + } + + m := new(accounting.BalanceRequest) + + m.SetBody( + BalanceRequestBodyToGRPCMessage(b.GetBody()), + ) + + headersToGRPC(b, m) + + return m +} + +func BalanceRequestFromGRPCMessage(m *accounting.BalanceRequest) *BalanceRequest { + if m == nil { + return nil + } + + b := new(BalanceRequest) + + b.SetBody( + BalanceRequestBodyFromGRPCMessage(m.GetBody()), + ) + + headersFromGRPC(m, b) + + return b +} diff --git a/v2/accounting/service.go b/v2/accounting/grpc/service.go similarity index 92% rename from v2/accounting/service.go rename to v2/accounting/grpc/service.go index 456d0e29..0da79365 100644 --- a/v2/accounting/service.go +++ b/v2/accounting/grpc/service.go @@ -1,8 +1,8 @@ package accounting import ( - "github.com/nspcc-dev/neofs-api-go/v2/refs" - "github.com/nspcc-dev/neofs-api-go/v2/service" + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + service "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" ) // SetValue sets value of the decimal number. diff --git a/v2/accounting/service.pb.go b/v2/accounting/grpc/service.pb.go similarity index 84% rename from v2/accounting/service.pb.go rename to v2/accounting/grpc/service.pb.go index f8a40e88b1d6ee2a341e1ff7d955ea99d41c2926..aa9fdbea7797bfe5b4900e8cd16fb2fcdf21a8d0 100644 GIT binary patch delta 3368 zcmZvf--}gM6vvs-!5L-7DKm8(^D>em4$b*}?lH2op33)#5IjE(LrAT-Q_!I(sEE+c zgV1x(OO$kre*6dZ(o-)5`OsStWQY&*GOhjnoaoZ@;CA1A)?VN5`mVLt-t+m*>F;k& zUpu?~!j%`w>rcHr-XyV$jRm%5qReKtRB|8{lfcQ18s&)!+AvZ{*nCTN8%Fe-M<0f z?)J)k<6jOg^_(}Cznb8?-{xm}zI(fChiALzAGo{K+2zCQa5iVJKzeg|dHnv7PyPq_ z$)n8-HlLjsZ1L6II~SlD{9N`+Z!9%#2GE{IXf z-cwYO5HeXtk}VK^LnRIMLFpbva@r_+LmLgBp!-qmOQE4;BAgob!WoJ^IZRy)-pG>} zp+HL^P&c9Gsn*GACS=OM5jK3v2a-4NxmtAMEHe#2NI@|Jv#T{3@1eLsePo1S6i2K z*eIR~Pcov2b4icrsqm@TP)dT6mmtV%fjf~*R1GwdT3>UH4;APMKNjOsk@(sWibbY5 zXS@i7KvSTWX*hP&Ereo1=tvcV454s1;<(Gnt!$c7_!wDkT^cw6mDpD>rW!?(-M;8S zwUH$KC`)WI(x8=6a{3%-6zGLUoPzSe(g&znF8E9{`BaiF}lg)ON90JXvmTwA*#*)fWpl!7fCeH!qv#;}> zm+V_&I+J3Vl%YPjUhF2Y zsCpMlx|O(#fx3wm^pL8bINfBdmPjS8MYX?Jv1}(!aiPzBZ=#ft4EY-2(09pILmkRD zWldAcl5qqjd}O&AfjKaiaOa%@QgoOdOH4=sAPhYLZ>5AxT?pMb$>0g@5T2T;_;7Dh-@Nh6+K@_N zhhknxc2hvf><*=aBWA%%k;cvq6)AF_E?(5->H1XA{gi$@6^vgWel%r29z6Msjjx?d zZT#}&r&>8We&^w{+id#dsarOF@#wE+f8()p&i>Bnw`^QLGqUmand5qIj}JWl#}Q`p x7moK2_I7@0{Pe|ZJNiEse!u+Oy*$ouuk0CLdUIcIwz+)J%q~uk7vEi3_!|ZNdfNa1 delta 3334 zcmZvf$!}Iw7{=2=?I5-l5+l?=Z36^b>>a;*F9ZiLCMIrlWzwMB5ivNVfPT=$XN<;$ zE+hwCnCQyHogv(~abesT4TJs##)UhghPZS{Jm>e^4gofo({s-IKF{+`=i}<-;VYMi zKYI4!bLY0M)XkZT*A^z`CdSXyD{r1E>x^x=|%oFOXYG{n{yWNrZlHhnM_ zvz)XBNbI6V#H6GYvPde1AXKpM*_W*fCU*!H0H-MiCF`yxEJ=%BfY5^lHQ_4I1|TJ3 zDkUjV(lc;UsSQA=*s75g5-J6tRM?bs3_S2dLeg0B7QX^H<*FPNI1)luf{;T-UTtP9 zy$X^I(p4)FK`%HhNJ#=t1g5P?CyG1jt-{*6_}3sP0X?FmkfhXg1(^ntAv!be^pqIT zbTj3&6jSc2BrI!}hL~eDkyT~M*bW%je-iGBWsJ4@RE<-?UVYV|+2?+NHYvArz#)VL zLkaK@nh}NwGbh)wAkGD+K?Z(^zkE}%#wb())W8 zlspMhVr)-3{TY zB0Wk&53Yrx#5w>|V^T$zpjmSu;-(^Or-2JnsbCP|nCNM)bXCe}fLZ1VA2J?SHSiPk zEA;BdT-lR`9=#M`po-Pi9Lz=t8aPN-VW_#gE};O^7<~EmF$*;_e4Wc5a&<}c^jxVy zeOM?}s!Uan2jNtOPK7D*c9ggvDFDSlsYI^yXdbIf^s@9IR+Ef|ZWKH9p`x9u8&I3- z0afUQlW1B&NmI-NvNs^PDzN|@O^7aH?0BR{B@v^<4q_6mYQ$4X7y@v7M5&d#*H76a z7ixf0>?%}DTAtB0vYJ7RmBVvj`hn&(?aW* zeGNRNr~7F^s5JH?^;?${2semJRFlvPAd|79Qw1+3Bm*62W@*Ul$A;co+p-iZwWlIc@$(zHC2E zzZf#BhxeHiheC7dP-3nh`l?+$yt2jo`Pi@Kr^kP5uRL*l$V?x7&wO&UZ>EkNXpbEG zeSZCy_Q8_}HhzLHjP7c`egBnVbNQKV?akA>M)aS7@s*diuN$0u_mK^Q<@p(F@Zt3T D1}t{3 diff --git a/v2/acl/types.go b/v2/acl/grpc/types.go similarity index 97% rename from v2/acl/types.go rename to v2/acl/grpc/types.go index 63747877..30912592 100644 --- a/v2/acl/types.go +++ b/v2/acl/grpc/types.go @@ -1,7 +1,7 @@ package acl import ( - "github.com/nspcc-dev/neofs-api-go/v2/refs" + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" ) // SetContainerId sets container identifier of the eACL table. diff --git a/v2/acl/types.pb.go b/v2/acl/grpc/types.pb.go similarity index 87% rename from v2/acl/types.pb.go rename to v2/acl/grpc/types.pb.go index 0425329e8a1def025a6638a89d0d4268d29dbcd2..bba96ad2de627eee8c4344cb38c77508b91b4c21 100644 GIT binary patch delta 4465 zcmZXYyNe!G7>999B-vm@&?W&{jE%UGxnEGLY#K==Rtcgr^UX*=Fswm7@iJD{k*!Q& zVVy=&h+=1BqoRdiXJe)RfSu<&&r#NFb257_@8$RY-piNYzTP?dX6Me;Q*R#Lnm#?a z?!R9=clvVN`0|I3PCwQaWjQuY-z;M}7uEgikNkP+#OAB#e%(2-*`NRT;S-zRKmNzb z&2OLl>!i%DF5EqP;`tlTe0Ju<=9%ZeJB8)j$F(Zrnh$ZEv$%F`T-!3PO%>O=kL$pGKE>~e`+Xk2b6(BJnI{xv z{4s3eal_ROm(~HzMZ*EdJ;ybA3iM<(Qqi{YK96hGsYOG}gPF%V;<1io7+E1G8>6@k z(QBnP%qtMlV#~kXdmG6qHJ?52K!Tz+w`=h3!d1625AJN%~ zlK9lT9(cD1F0vQGGqP?t?O99K)^7sfs}XGiT-UfzfbhnHXvVs&ke6OySgK1&vJtX1@%0e&=U><01c~LQA8I{*RA1h0DXggEh_M2#H;`L&?2eCn2fdc zn+Lto^BMXxps&DLP+P1kq9f~eM^ z41`l$0<=-V!s9v^x&Hgdfa~HWt<1U&{2MUO>EW5LN=fQf^IwLQ=(sa zgQsf7laf~f`XJ4c8SX?41pru%INN4NBudn7i83|71)|ArS%4XI)lz>XXTa+ zImcF9Yp|IoKvt#gEWwTm}ClC&^1a7-sD> zPpog|K#TEZkA5eX0iC9c(}VO%)U|9Tu5(qcr||&LOF=gPSP@tm8D@mpw`)!8*ZLns zL?6s78%BtI1Q)MT-{wUyChW_}9Br<4p@JQ0pbL(BVcdeN7+@WBd@NT`GN3sYmjuK7 zc7Bu|*3O<&HKaTs3}HSb3>Z)XPXY`_EKVkH8nkd^T=7b&j-$yRM6?h<%7z{uHF#C% zHAAL3lPO|`ftFThBGcLo6lRU@S0ZDp2xUHMXmHUyP--vtxVph$>)61)x$mUus}1GD zJ};lG<{@lRK@Il`)U3&Rwo>^6Ls7DmS_D(8zzVh5mke8lT_H1~h6VI&{f_t6OS`)J zK3kpf(##AQa;)#cPy#y9=Aw{>4ydGzns31{8*I{{$Of*O`xD;{Zkl^yzBoeUnPa>Ta{Tm2n34Si+FASu`F2Fr3w4F>4Cz!-W*DRufw zNJ(}Mv);UMtO=rH7;Jqq&DffhR!*u;7`p`>uLi8JX4qIVJhzk9+)TgbDg(_kIcW*- zl1K`4ZHfU&`pv>CMwNA|P6tFs567+2j@2atoBRpX&TIXF~g{*~(@2NrMORRAub=M|ZDXxM;ej^5a}+ VL!YbrKVCb3;Qv1Se&_FV{{Yq+aWDV? delta 4459 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 P8k$&!m*hi delta 8480 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 E9}L6F`~Uy| diff --git a/v2/container/signature.go b/v2/container/grpc/signature.go similarity index 100% rename from v2/container/signature.go rename to v2/container/grpc/signature.go diff --git a/v2/container/types.go b/v2/container/grpc/types.go similarity index 89% rename from v2/container/types.go rename to v2/container/grpc/types.go index eb74ead3..3678b561 100644 --- a/v2/container/types.go +++ b/v2/container/grpc/types.go @@ -1,8 +1,8 @@ package container import ( - "github.com/nspcc-dev/neofs-api-go/v2/netmap" - "github.com/nspcc-dev/neofs-api-go/v2/refs" + netmap "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc" + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" ) // SetKey sets key to the container attribute. diff --git a/v2/container/types.pb.go b/v2/container/grpc/types.pb.go similarity index 84% rename from v2/container/types.pb.go rename to v2/container/grpc/types.pb.go index 175aeeb4a2413efde4a0e46bd3d2c6a39b095e2f..9cd174d9e9cac7f8808bee70f0626c64116edfaa 100644 GIT binary patch delta 2354 zcmZXW%W4!s6o#23;>;Ml6G1c#B8ZTfuCBf=++`IXK}5T&yG2MaOoEJv^aEsL7+kqh zS0aiqPv8T%^%;Bw-P!g19gw)GsX2A7|M}0E`Tc(I>BHd7gO#V#eRsU`izi3x}Ey-fOclPuAXn1aZd$`Hxqv7Vqqv7D9Et@Kj zi_Ew*bT)R2ccULmvff>NJCOC_?D_5G|5YDe`nrPZe7Ls0bK2A0$?Ng>MKPT;&vxtW z`oK+}?H@j$K0d8Cxj%XMsC;=?zZ#FWwk9^Q^Zm8M)@)3ISycP8F1QC9<54g(k^hob z{>);3x)e#t$!it(dzAUJz_`L)k$8#Y)V<_Y0kVVudG3|k0#BjyUoxTvM5vG(d`GBe z=;Wc-l)u#ad&JqtEe;5Xa#n1iTzu z!B+FCMh3ig_pZpHj3^3b3|h97~QwtxD0C@09FvG`psHCWSm3M2$jo zcRpl$(sXJQ#T;!27k@Ns6P6w?0CQfgo`xl}eR+ifbA7KvHa`_-cKi2>?B- zgppJ^5jxIxY)I%#gV%yIYE%QxRE*)Iwwb}5ND`x8DGWNXKkv=@acGbU(2iYQH2F&? zw8pwH^S$fWG_vy7i0@P@{je11h~%yoS8%GSGlB$uh@}RdSeR36CGgM@Jyl5ArbKXr zPS9=er{PbKXOy0bfh2E;Un!;7hmvl6{FhF6Liu+!SvN5J!UNq$;0k z{!e<^D1{ag?jn$^F)lEUajjk2uW$7QxsuQ}tU|D8Ep{4#9Nz^ERS!!_*Ies|phhR6 zx9XvIs4~0B>{uYoy9G@@37ztgF*l;SN^8Y>#q4{9K`wq0U*jg@z6~08^;2s?i&c9? zJ3(k`_vm*|znn_G0GPHBp+KPoNsVkjr9w$eHv$F#G!zX<#^Nfc_z{t|_G$rCmV{$a u5Nu+Y?daoC5{vrj!a{}W=S3Ad&@=Vo&-&%7`kQjWejoRLQ-0pRb>%P7D_ivd delta 2351 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 mo5!swufA$osl4%% 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 W_CoxfI*~ubQ$!l0v$n^-(Ek7AI7?^% diff --git a/v2/object/types.go b/v2/object/grpc/types.go similarity index 96% rename from v2/object/types.go rename to v2/object/grpc/types.go index 7a975315..c857b8a0 100644 --- a/v2/object/types.go +++ b/v2/object/grpc/types.go @@ -1,8 +1,8 @@ package object import ( - "github.com/nspcc-dev/neofs-api-go/v2/refs" - "github.com/nspcc-dev/neofs-api-go/v2/service" + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + service "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" ) // SetKey sets key to the object attribute. diff --git a/v2/object/types.pb.go b/v2/object/grpc/types.pb.go similarity index 86% rename from v2/object/types.pb.go rename to v2/object/grpc/types.pb.go index a3712b5d57936c31a6332e8970d15310f134ab7f..f4617b0a43e3e5702a4571ded9c2d9d6739d1550 100644 GIT binary patch delta 4984 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 I`i&RARpB{dFbg;c!_{wI+m9>pK+jQ0H z%l7B(o158L^z_-{_43#bKd((!$5-!O(D-Bb;|19#*WKmebZ`G)bL5@qWHNbQ9Y)>a zrGMbxHHVA0%QuJ5H|wH%BX<2^>5nHn^Lgaba`?UX>WX!<$Q(I8`00H3Hod(S4Zo)Q zmnJ*IpXvR6yfSepXiCb6aT?CCnN4=gQBHqtN!1}%88Hdb5-S=kd7Fp4p|WLMPH#ta z)O%{i*aw7?Zrxs$Y@C{G8Rd!4A84YlCy(-f(&}0V`@U) z(ADae%s4IhY~($I9PYWEJ{h1jaUiGU3u#5Bq%G#)s#sGa=_@KTYSw#|A4iY6WCGAQHTMNKQcPTRA@=IiycRL^z13PSR!^&6 zVMbZ38QtN1%Eola){-fdfoea>8XV(V<|a5JuM98z?~^(IqVX+bl9~(s8lWL_9fZwV a?AR4WJ?Do0Tm@~~&&-c+SUtY=qWlY-Plh}I diff --git a/v2/refs/owner.go b/v2/refs/owner.go new file mode 100644 index 00000000..acaa6928 --- /dev/null +++ b/v2/refs/owner.go @@ -0,0 +1,19 @@ +package refs + +type OwnerID struct { + val []byte +} + +func (o *OwnerID) GetValue() []byte { + if o != nil { + return o.val + } + + return nil +} + +func (o *OwnerID) SetValue(v []byte) { + if o != nil { + o.val = v + } +} diff --git a/v2/service/convert.go b/v2/service/convert.go new file mode 100644 index 00000000..bf2c3a24 --- /dev/null +++ b/v2/service/convert.go @@ -0,0 +1,201 @@ +package service + +import ( + service "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" +) + +func VersionToGRPCMessage(v *Version) *service.Version { + if v == nil { + return nil + } + + msg := new(service.Version) + + msg.SetMajor(v.GetMajor()) + msg.SetMinor(v.GetMinor()) + + return msg +} + +func VersionFromGRPCMessage(m *service.Version) *Version { + if m == nil { + return nil + } + + v := new(Version) + + v.SetMajor(m.GetMajor()) + v.SetMinor(m.GetMinor()) + + return v +} + +func XHeaderToGRPCMessage(x *XHeader) *service.XHeader { + if x == nil { + return nil + } + + m := new(service.XHeader) + + m.SetKey(x.GetKey()) + m.SetValue(x.GetValue()) + + return m +} + +func XHeaderFromGRPCMessage(m *service.XHeader) *XHeader { + if m == nil { + return nil + } + + x := new(XHeader) + + x.SetKey(m.GetKey()) + x.SetValue(m.GetValue()) + + return x +} + +func SessionTokenToGRPCMessage(t *SessionToken) *service.SessionToken { + // TODO: fill me + return nil +} + +func SessionTokenFromGRPCMessage(m *service.SessionToken) *SessionToken { + // TODO: fill me + return nil +} + +func BearerTokenToGRPCMessage(t *BearerToken) *service.BearerToken { + // TODO: fill me + return nil +} + +func BearerTokenFromGRPCMessage(m *service.BearerToken) *BearerToken { + // TODO: fill me + return nil +} + +func RequestVerificationHeaderToGRPCMessage(r *RequestVerificationHeader) *service.RequestVerificationHeader { + if r == nil { + return nil + } + + m := new(service.RequestVerificationHeader) + + m.SetBodySignature( + SignatureToGRPCMessage(r.GetBodySignature()), + ) + + m.SetMetaSignature( + SignatureToGRPCMessage(r.GetMetaSignature()), + ) + + m.SetOriginSignature( + SignatureToGRPCMessage(r.GetOriginSignature()), + ) + + m.SetOrigin( + RequestVerificationHeaderToGRPCMessage(r.GetOrigin()), + ) + + return m +} + +func RequestVerificationHeaderFromGRPCMessage(m *service.RequestVerificationHeader) *RequestVerificationHeader { + if m == nil { + return nil + } + + r := new(RequestVerificationHeader) + + r.SetBodySignature( + SignatureFromGRPCMessage(m.GetBodySignature()), + ) + + r.SetMetaSignature( + SignatureFromGRPCMessage(m.GetMetaSignature()), + ) + + r.SetOriginSignature( + SignatureFromGRPCMessage(m.GetOriginSignature()), + ) + + r.SetOrigin( + RequestVerificationHeaderFromGRPCMessage(m.GetOrigin()), + ) + + return r +} + +func RequestMetaHeaderToGRPCMessage(r *RequestMetaHeader) *service.RequestMetaHeader { + if r == nil { + return nil + } + + m := new(service.RequestMetaHeader) + + m.SetTtl(r.GetTTL()) + m.SetEpoch(r.GetEpoch()) + + m.SetVersion( + VersionToGRPCMessage(r.GetVersion()), + ) + + m.SetSessionToken( + SessionTokenToGRPCMessage(r.GetSessionToken()), + ) + + m.SetBearerToken( + BearerTokenToGRPCMessage(r.GetBearerToken()), + ) + + m.SetOrigin( + RequestMetaHeaderToGRPCMessage(r.GetOrigin()), + ) + + xHeaders := r.GetXHeaders() + xHdrMsg := make([]*service.XHeader, 0, len(xHeaders)) + + for i := range xHeaders { + xHdrMsg = append(xHdrMsg, XHeaderToGRPCMessage(xHeaders[i])) + } + + return m +} + +func RequestMetaHeaderFromGRPCMessage(m *service.RequestMetaHeader) *RequestMetaHeader { + if m == nil { + return nil + } + + r := new(RequestMetaHeader) + + r.SetTTL(m.GetTtl()) + r.SetEpoch(m.GetEpoch()) + + r.SetVersion( + VersionFromGRPCMessage(m.GetVersion()), + ) + + r.SetSessionToken( + SessionTokenFromGRPCMessage(m.GetSessionToken()), + ) + + r.SetBearerToken( + BearerTokenFromGRPCMessage(m.GetBearerToken()), + ) + + r.SetOrigin( + RequestMetaHeaderFromGRPCMessage(m.GetOrigin()), + ) + + xHdrMsg := m.GetXHeaders() + xHeaders := make([]*XHeader, 0, len(xHdrMsg)) + + for i := range xHdrMsg { + xHeaders = append(xHeaders, XHeaderFromGRPCMessage(xHdrMsg[i])) + } + + return r +} diff --git a/v2/service/meta.go b/v2/service/grpc/meta.go similarity index 97% rename from v2/service/meta.go rename to v2/service/grpc/meta.go index a44e464d..c5e9c784 100644 --- a/v2/service/meta.go +++ b/v2/service/grpc/meta.go @@ -1,8 +1,8 @@ package service import ( - "github.com/nspcc-dev/neofs-api-go/v2/acl" - "github.com/nspcc-dev/neofs-api-go/v2/refs" + acl "github.com/nspcc-dev/neofs-api-go/v2/acl/grpc" + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" ) // SetKey sets key to the X-Header. diff --git a/v2/service/meta.pb.go b/v2/service/grpc/meta.pb.go similarity index 91% rename from v2/service/meta.pb.go rename to v2/service/grpc/meta.pb.go index 648f7f0a89c56b7eaab9cbdfbb49ddd4645713a9..397dc3a358be76a6e9530cec1a5c322c19637908 100644 GIT binary patch delta 5365 zcmZ{oJ&a~m8OJm1Eba^>_))MB875LFVP)_8-uvE<7zo5Aan%G#CDjMoCmYtZYoIEKDe*@SNZ85Qd$#Idk80&w2jO^M5|? z{OPaTKl$7CYZte_e|V+8{*7l&$G?l~?|u1>wm&!@e|%|ohj;HiaGKwn?X7=)=Cg~c z7`t+unsHoq`KsLf_slPEIl23*+x~d^4_Ne@WkN@cMczE%`djDH{ zn}2=vw_Cn{^Zflcx&J}_(J5(IzhAxS$ye&PZem^YwX>)0fUpN2d-UtyezNTj#@8?I ztzUZh!cAZwzL`Nsj~(oO@&8d#UfaF4e)WyL&E9vOIHTE@pStIpHy*!#|Jv^E3+>_l zbm?HcFh1WOUb=Gixx??>cy9lpKymlutK*BiJLk{u*Ll7E%TvFf>-OA!cGMMdUFLBu zySR?4xYk2lv;N%fPIgq(@kf=#wdZ-o8eWH;mi>vfL(mdI<%087T-_I-;7p^Sq6DD? zuAJi88kM?ZI1@KktW~*w{OS9)^7Zpi|8(wAU|Gg%t1+$+vSTFFTX;NU+0tYPFm()OT1TeUopyV7Dj$Uwd!orXy5y9kJfn)s|A;xGhmvQ2eanpidV`n2Vh?@|dvzk4X z0NHeI4*6&<*W4%|K%)m7m$NfLiO-`Mg9lv0~gT^ zLfaxN69oiV>MCqA-y1HE&``5)3+OP=LfoN?4hsP=M+9$MeJz^S;NYg9UW!j-m}!Y5 zEKH3>Eg&y=HQX|iLam4ZOI1Q#PnxJ+-p}!@4lp!(9c@5^X=9UN?Xk((r-JSgVWEFe zKtY;l53(qUY}2%G4K?_>d&HBinMT%GtwXVh2p!sY7-wNKSyMm4Dyix{W5I)%+~UG> z1wgDl!LP7OU~4k}HohHnE^BUD+x2N2TK0FH7(Y+-`bW5@!SVn&Z8 zTb9}qEu^@$ymPdb9@d&O8Tbo!lA~qM5|pEu397HG;(A-fhS_}65}qA7QWD|SL6_K~ zHP^Q2I%4zyT8=UcNXk)ifzXN_o$d%_9**Lt0F)&oEp;|-TeMPtLscDJK#U#2+*_fl zgPaVTL#5%-;Rc(N!`7_1mT_CYwEDUOO=lP~+H6mg;k1$~q157NV+Be|V}jStKNfte z^=wZ~Wf}I=)gabmO9Yu>f#--|CDsz>q9v+Y{Vfn_Rz+xoh$V!jY5*m(Y#&!L43ZH+ zmpN6Y&Y}!lA`KF4c8gYl;LKH%H!CxSeM@jCq7i@yoR3;Ez(}`3*nS;zCW|>TbdtR@ zkpZ_8vUQKQLXrK1q_l3ldjriK-JlP{6dFmAl7edKV`__3RfI7j1Y}EIn_tFgpE4@N>&JOW*rcV~1Hgy76k1*%Q*7 zVko%f$ANu4YZ#X-dd@6 zcEj!U&whB%=KX{1XFvTfwd;SsbN$YTFa6@*w`@JK`Q5v3@A!|pEB`1y??3N0zy8me NQz!0h-udw5{C^e$di4MR delta 5318 zcmZvgO{iU08HS0uNqVmlq@mhDwO2FH>TR?C&faGuW*`-itJywm_~aW^hz4{ z#7TvM;eZooMQ|A544erSM>=t&7H3YJCM>C*@MC)51K{Rf}fi+{IIo%{QxkG5qoWkojDZ8uHj zoNX`f|NKK|SAYHCKU{d`(Y;59uYT+J_MN-=y@Pw3PrZI+Q@--0&F5d=-#mNe!lrq4 z+`N2ce|!7Mw=SH$@6yx1ym)r?H=q33p0?e%`mepS?{9wg!Fk_*0~r_n5Q)DF1stGO_t*^NuHPT$2Lsf8)1HRvjH?r`;Hz`6@n(JU;80CvU6l=wLrPT^DhwD&upg zdCkgd9e?L+^}4=ig|`hm%OS3~Ub3=ge_QintU#D~Q}N8WHEZL!70(&u70+tg9N)Zp zZrr?m^CwFQT#em5p3L03=2*soqTwQ*4SQDZ#OKut{1vZfmL`7ZT|CxcOTqfgddYeY z%+iCPi(>W}$5>xuS5bh_@FLxfdAXaoNisSR1~5m~3wAcFH|!q>Pl-i~2Lib` zT3KO0$@&CUYwjL6tq;9aP0{R;J(5(i{_wU4kh4^=b&kK6(@ZMyZDn-DL;(YK7kJWg zxbQF*Y29oHM_lMIui=114_saFRC;UQ#+}RQiWd#Hs?s(0b=cD5XN?s>9?=H{)$wA) zNNH0^Mz7_%%wv#VX{3&DHKJcm#c5@s20^K7m?TQKcB{rj307nfmV-9%y9Tobr-QZ* z!ZHCyj;(`{OGrw5Xg$HMn%4y~tuU-(kKWeYC+Q>P<#4W&gLRRlmZcmT)V{fArVm_^ z1(<+8m?k^PqBKn?tvBsk>Szmh*J_`wO0VU&{!IK1Y)6E7M={AT z+{wKHd!w;d(mM}WxyXa@9{pn1JSOogk) zdus+3`FqwAo*6!PorOJwDk9i;b-@IkaMWrk-67loY|vTV?7^3Mlf_~#vgL5H`&c?> z&Q0X+2mvYR86rA=}Pw3HNjt0OARm4&U2JmESJ z%ne*rM3%JCD$m;tQ&pxjQX{gMoOKAX@1|Xne{p z=$SFzidJ)7YLVdEKUzqt09Z@}`Lw@<0V^UnU}W6qCOe+t*27$?z-hS8RxGl4U^S@0 zS9)PCi~tz6oQ_ajTO4^hk*p*@uZUR6S~rFZZWO4-4FoPU&q{nEh*7ga-Q$e^hbhj?W$ z8dkiuH`%()j1b`%h7=zn>2+4uGOPrAhg);p0E|0Uq@qN4jGhJB7>1ENBA6^mF&MA9 zotpeg@R+)h!Zw9fRkMq3&;kpb9mCvAi6mJ zIhk5aosxTV3}TF!mCJQi>eB)p@FRj6vqh=&G%2Y=RAM=>Er((i@dxB<$`~KN9A(J? zJPcJ4A7}y$4Em`vhF_z z^u!YE9Fyua8uquRLJy2Cq_0?m;rt;>sZs0%H1%$5)vlCRni<@_U|MAVm l58m89_{;nI{!i_lzg17h|Hy6s`tK*spV_><_`#3L{{g23V0{1p diff --git a/v2/service/verify.go b/v2/service/grpc/verify.go similarity index 100% rename from v2/service/verify.go rename to v2/service/grpc/verify.go diff --git a/v2/service/verify.pb.go b/v2/service/grpc/verify.pb.go similarity index 91% rename from v2/service/verify.pb.go rename to v2/service/grpc/verify.pb.go index 39a512be21b745df61c12312174f4a18eb6f99c0..3f270b66da875564a3071e1bec341b8b082456f5 100644 GIT binary patch delta 2306 zcmZXV&5G4P5QP~~aqdFg>B_kqL2+O@>7>(HxD)(&1rfU8DzkG*d{_deV`^Jw#I_;}~-*&`O8Z|rZ6v2=F^!?d)=l|cme&NOH|J^T_Kb-^N;9KW2d0ZB=@;Obu`#bRb7Oa?5g(0UWj1gO-S`3ainzgu(sB5ZqSK z0f{MunqkE=d@)g5DSAm0Yl>d8b~yLsBIcgcFoGcMNg0knJ+_6&L^30xN7b1o^}?5| zRIz|t#1>#Wap)nctxgn4#?hFTBy%!WBrpriA+lyDh%s<806zr1=;5L=19sb*sm zVIqWt-=L^uui-O+pq4o9XeSRMi=dt5y{Su5owUz!MSFHt5~@q)Ei{QZa;ZJ}b@kF* z4U}Y=iX@{h=@se0dt!TPSaL_rE%i#ErrGQvr9aB@CZ$Zx5|49~7;QaoC$*B4k~BfQ zo=77*6+HDOwJ$Ug$)m}%uaVx+TTuuE)q~c|)@ag$<{9RH6Ziv73{+KFXk=|FhxpZqJwh{1Ljw2)4tWTpLnJRfJ(v_?XGT!~!YXq3z>Cv_CcmDwNk4HoR delta 2263 zcmZXVJ!=&~6ov_?m|I9nD|0Oafy{o*&K7nSDq=4xGCMO10YOPZxT3PPV4>Vf@L#02 zP=AJb;?y54r^6TNZaNM}hp$dv9zDN! zZh2?<;3u37)sJ)YZXe`!|jSjNzlu`&CLZL_KzOSX(QveB2(u+lOP ztdCqXp7W`Ubydc;D`U^esV;MC%2+i3_>lk1tH_O}{8^=;j1%)7N)?f`9=Pp5tC>fl z_TX5ASZ+m0sM%;31ECEUCTQ1%*u3h&m#RRFB(A8Pz)5(~vNEtT4QP-=-$I_K7P*e2 zme3;?Mu>UVM+72yUWwR*s&Fn1MlRJ*>M%EQyC&*@F|wfn-+=ExvkEbmT^OD~TC8r@?{KYL0s&PC7_R;RGWgtA?aAh|#1Isk zD8RyVNQI+oQq{p;yu>0z5IUqwXv8p2AXSgN?I7Q=y9t+9GQJdgwhek(+)FBG3&KFW z5z|M|R1>=9G076b>kJB27-HeEZP1A1A)A!(HyZL!wxNSS?vOlJ*Y%K59Y)#88BYw4 zw~_PeSh=9{6^v4cghbXWMzvV3q&edl5X8?(1JWxPsXtq31}(wDackgYs+4FJa%)n zp&!jorBt(1K}qjnNmEV+QS}6=f081hNAF56W6)n?%m{MFdhX;RK?EdZh;xZ;IHe_} zRcTP_RiAp^HqV4iBC2}NP}a5uAwXatsN>MYcBC?+q_OKK@Rj0$Yw9rr&lFDLcV2d5Jk3=4WDSXbBe0fdI7 z^KZ6eWgzIrl9{F4KiS+!9d2r$s3NJatiBDJXO6`r#Zdd|b16$?hLJ)>6@bQE=oxJD gg}M!n60NsUUgXOKA^)r&?(MD@``^wU@BO*=4-5)I>Hq)$ diff --git a/v2/service/version.go b/v2/service/grpc/version.go similarity index 100% rename from v2/service/version.go rename to v2/service/grpc/version.go diff --git a/v2/service.go b/v2/service/service.go similarity index 91% rename from v2/service.go rename to v2/service/service.go index 55a39479..39557eef 100644 --- a/v2/service.go +++ b/v2/service/service.go @@ -1,4 +1,8 @@ -package v2 +package service + +import ( + service "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" +) type Signature struct { key, sign []byte @@ -42,10 +46,6 @@ type RequestMetaHeader struct { origin *RequestMetaHeader } -type OwnerID struct { - val []byte -} - func (s *Signature) GetKey() []byte { if s != nil { return s.key @@ -316,16 +316,28 @@ func (r *RequestMetaHeader) StableSize() int { return RequestMetaHeaderToGRPCMessage(r).Size() } -func (o *OwnerID) GetValue() []byte { - if o != nil { - return o.val +func SignatureToGRPCMessage(s *Signature) *service.Signature { + if s == nil { + return nil } - return nil + m := new(service.Signature) + + m.SetKey(s.GetKey()) + m.SetSign(s.GetSign()) + + return m } -func (o *OwnerID) SetValue(v []byte) { - if o != nil { - o.val = v +func SignatureFromGRPCMessage(m *service.Signature) *Signature { + if m == nil { + return nil } + + s := new(Signature) + + s.SetKey(m.GetKey()) + s.SetSign(m.GetSign()) + + return s } diff --git a/v2/session/service.go b/v2/session/grpc/service.go similarity index 93% rename from v2/session/service.go rename to v2/session/grpc/service.go index 41a050d5..8c786486 100644 --- a/v2/session/service.go +++ b/v2/session/grpc/service.go @@ -1,8 +1,8 @@ package session import ( - "github.com/nspcc-dev/neofs-api-go/v2/refs" - "github.com/nspcc-dev/neofs-api-go/v2/service" + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + service "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" ) // SetOwnerId sets identifier of the session initiator. diff --git a/v2/session/service.pb.go b/v2/session/grpc/service.pb.go similarity index 83% rename from v2/session/service.pb.go rename to v2/session/grpc/service.pb.go index 13b8ad53754c52021d7aa5e87728a1e96cac0c63..7dd61a38ed5fb0cb968dbb4e2b31c1533ab659a3 100644 GIT binary patch delta 3329 zcmZXXOK99x6vmmR$(S+Gfwq#GPMfwi)taRL_d{D~K*WHk2!h}P=Ks>5mYURNY72wz z3W_av;iH>^3sJF~!JSy$xah*2TNjE2H`0xJ@BMvK3GL?2opaAU-#OoT+?mT)cYJtt z$K|!1Z)}_?uROCk=|24{Hy)ok?skVd(;VD5x_h(UIJaKb+r@!7)0!Ktwr)<$IIWcz z>v!L)H_w`Dd$!D#$*-|#R;Ru<-MRbC&UV7*4-YJx+f%zoAGN1jb5ULSVG@^RR{Kd= zMN12>ytaP&>;>a@=gsxb)acjyvI*Ilo!Po$aNex-PMKRXZ_eWF%JW;N>y5Ri%Nv>s{~*0~XVjhB+qxGe-}}xusPFcjm$~KM3lsM$ ze!NgjD(HWXEZlQ!_AkyIx;uo0la|8b{Mq_KXZrZ@g(ykP%Zr=yQM0t*4HDKWboP&kBKQp%$S9TYkljW@a% zp8D?8XZ2FIx3?UAjOhjw1*&!Kj{EHWAveOpi7ITzs0P@sh$q9Z0G$}yp*+e#h_;I` z7X{8-4RXe{zRUqo$rp?!L%zhgluDJgVYN6eh7vbw$f!YUDnjI1l(>C}yw9~jfq)=n zpS`cdh)C9Qs2D;#_OR;XcZrRx?`-#xC?ye+0OSIzC9#c(LGE!k$EKx?H1H*oX*q`K zFykPF1|erC`I56HNW^C$eDovOw&Xd4aRuOvsw5!9grE!PDcO56jTggOO4~Rrv8^=# z&6cf0kiEW=0aYnBYDmviE36^ra`q8%W>69mNQ{pSl3|K7UIc>3Rib?mL~)Ki*-+uu zIH`(>R2ZO*tCwgiQN>+bHjs2D9-CFqIWruD;8b|21gIJ#}tRk|( zM1rP9Q;OT6%lvTQp{lY*GLs|A2ju6BYf;-;OAHSDUsEyJ zo=_DO-YaI!0gcy8Ln%Z_$*|>X3rZ#wP9lma08t+!$uukoGqI-@UrAR!YYf?_T%tp~ zmu(GjRkQ|p&1ohCIjla!ZFOTxv?Y@9m;%5Si~}gLrJ-vCh*Ko;HG|>?Un__SL^rql zq6(c5NsWa9xq9C=fJ3NoNf#1bRwd!K1$Ou)%#1r78%nW!(fklSnh$CyuK_`0LcIBu za)UFH>#flP+7N=8I|I^oqr+Em*|geytjws0`ygnVtA0g&#j#!mIinI2f(Pj}>zGdV zN`~Gb4X(VuG=wEmsYh6$>w%5Ar_rtFUnx;{Rm7vm-p7Lc(g^fm*lJQqDrH2P!Q+XN z4PDS0YZ0;wswqf$9y4B`>L!m{mUxVv-d5;OhrQ z468X&$xulArP82>T;zt}=snOi&1u!49$rb*hXH5|yg@^+h+w}_{CcDHI%@1Rgs6V= zsR>^MXs_PKsv=aESTY=)c&CaL+twy|hLREvHM!DRLR4DA#w`2$4ws?^Q>v2^PBbTM zemc|UEq|*Om_PilTEXa2@L9`#IT*cU*K<*1*KeXPksKLq#78IW_VesFyPnQ}xBAaM z@to8D;>nA4edxrdT`!$j)X(JWCoUY+&U^i_@o(tWsfS1J_djXtughq5y{m)KBX9rM ck@DZ?j*XR delta 3350 zcmZWr%WGU!7-y1}+nG*cV3H;^2^j-TY)RAme$*(H1|daS5!^(4+{d}?KuE(RBx7oF zqqw)>Yy^uNS1v^G?nT@P6_;*X{{UUobp_A){ca{{gm7}_oO{0CQ+qsURBPq**;i{vKjdos zvi$wRBe`!3$-3doJ!4pYKYT_0IX+bG8y9L5ablW*8(V%DdWmDF3+?wm=&Wx&kTWBb z<*(=7=*N}y=FSUYXQtnjPn-8ZQNBI&sK5Bv&}YD@8&~ClaUOVk#=LwuVw3|f4b(MR|cC};^Lj1bm6<&AgG$xkwgRxOL)x3qRe^0fJh-kQSX4)J4zlf}z zoRz;_nz?lv<#Kzk(b$f=?Yy%lmc?e;?QCq_?|yXpz4q(M`{a`?@t{$^cCGFDj&$cX zC$oH^ZT5Vj$IQ{AV=gr6X3uivFLR59`laS#jGm{TlT43xs7D_&zOA3b5c|vo3z%~8 zY+8E8jP#h}Sp?YNV;(aWpe=+8RhcLnAXeC5CJ@fFiGWBhq46AGIl<^*#zwpV2#T1B zN7^ogWC$9%dfp>n%mfjoBM^|sdTLI+rJ&Ww9ce88ou4Xvge8p(Kpui5Am#{!$~lEm zKv4vBIrw=PsW*?o2Af@krW-Um#eB>W8VWN8LW+GMMjO6TBWFDD_W2H-0SmQR>4^}@ zrVro}MX z9vE4AZ_#7xxDF6}%EDU_G_WQDAp1ZTGzK$*IGAy;m#YaCLV}M~mnOMbU`6Y;D^%%1 zg9A+RBV)emonSA($l?fms%0^%XWj7`mUGq+UP@s}4xdAeCMYF}u)>dk%u*I`HN;Ga z=Lm#}sft7+D6f?DIdDiRz)LyIFew_yOb<6xP6#e3LleI`mEfKq0Ko)%_BvBSTOHaB zWCuzjyh(+u(#l)lv(p_sn-~)|G%;0=7fOlGk_9IV2r*c42X*p1Voy>J&%g{$vU?Kr zyW*uyA~71k4q$`Euqr~%^91;e#Iuv^SpX*DrBG-?bHMcQh;~4meUOtd$UC5v0;j5d zNas8c5!SXcRqKzr%_Db7G91`SrJVy`ww7(<{1P{rdbMUU|i;Sp1n9spFw zYLkMz&@tGjId+5~W3yPHg!Fv$fdvC-7|&@QM7&ud?B&7XRNVlRctBK@iRxurrvms6 zw0RgK@JoPf(F}|pVpoL;7edx5W2+xZNWyA_C7h2ynDlsZ#()uEVfoZg5AiB1v&tsvSPudmB@22y#$j>=v8tD0=N@5zqq%5U6n)$^tD zt~Wm@zYPD7B6?CTU%y?G^0iOp$kL|#Vrj1YVQKf3qfh1X>W7#6-_zx4{GIXQC;qeT c@p8WNY@q-C)Y?yt{*NcySB^I~ceh*r0X6u0u>b%7 diff --git a/v2/signature/sign.go b/v2/signature/sign.go index 79fef30c..d2fd1494 100644 --- a/v2/signature/sign.go +++ b/v2/signature/sign.go @@ -5,14 +5,15 @@ import ( "fmt" "github.com/nspcc-dev/neofs-api-go/util/signature" - v2 "github.com/nspcc-dev/neofs-api-go/v2" + "github.com/nspcc-dev/neofs-api-go/v2/accounting" + "github.com/nspcc-dev/neofs-api-go/v2/service" "github.com/pkg/errors" ) type SignedRequest interface { - GetRequestMetaHeader() *v2.RequestMetaHeader - GetRequestVerificationHeader() *v2.RequestVerificationHeader - SetRequestVerificationHeader(*v2.RequestVerificationHeader) + GetRequestMetaHeader() *service.RequestMetaHeader + GetRequestVerificationHeader() *service.RequestVerificationHeader + SetRequestVerificationHeader(*service.RequestVerificationHeader) } type stableMarshaler interface { @@ -32,14 +33,14 @@ func (s stableMarshalerWrapper) SignedDataSize() int { return s.sm.StableSize() } -func keySignatureHandler(s *v2.Signature) signature.KeySignatureHandler { +func keySignatureHandler(s *service.Signature) signature.KeySignatureHandler { return func(key []byte, sig []byte) { s.SetKey(key) s.SetSign(sig) } } -func keySignatureSource(s *v2.Signature) signature.KeySignatureSource { +func keySignatureSource(s *service.Signature) signature.KeySignatureSource { return func() ([]byte, []byte) { return s.GetKey(), s.GetSign() } @@ -47,7 +48,7 @@ func keySignatureSource(s *v2.Signature) signature.KeySignatureSource { func requestBody(req SignedRequest) stableMarshaler { switch v := req.(type) { - case *v2.BalanceRequest: + case *accounting.BalanceRequest: return v.GetBody() default: panic(fmt.Sprintf("unknown request %T", req)) @@ -60,7 +61,7 @@ func SignRequest(key *ecdsa.PrivateKey, req SignedRequest) error { } // create new level of matryoshka - verifyHdr := new(v2.RequestVerificationHeader) + verifyHdr := new(service.RequestVerificationHeader) // attach the previous matryoshka verifyHdr.SetOrigin(req.GetRequestVerificationHeader()) @@ -86,8 +87,8 @@ func SignRequest(key *ecdsa.PrivateKey, req SignedRequest) error { return nil } -func signRequestPart(key *ecdsa.PrivateKey, part stableMarshaler, sigWrite func(*v2.Signature)) error { - sig := new(v2.Signature) +func signRequestPart(key *ecdsa.PrivateKey, part stableMarshaler, sigWrite func(*service.Signature)) error { + sig := new(service.Signature) // sign part if err := signature.SignDataWithHandler( @@ -125,7 +126,7 @@ func VerifyRequest(req SignedRequest) error { return nil } -func verifyRequestPart(part stableMarshaler, sigRdr func() *v2.Signature) error { +func verifyRequestPart(part stableMarshaler, sigRdr func() *service.Signature) error { if err := signature.VerifyDataWithSource( &stableMarshalerWrapper{part}, keySignatureSource(sigRdr()), diff --git a/v2/storagegroup/types.go b/v2/storagegroup/grpc/types.go similarity index 93% rename from v2/storagegroup/types.go rename to v2/storagegroup/grpc/types.go index 5f4bd37e..b1159c48 100644 --- a/v2/storagegroup/types.go +++ b/v2/storagegroup/grpc/types.go @@ -1,7 +1,7 @@ package storagegroup import ( - "github.com/nspcc-dev/neofs-api-go/v2/refs" + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" ) // SetValidationDataSize sets the total size of the payloads of the storage group. diff --git a/v2/storagegroup/types.pb.go b/v2/storagegroup/grpc/types.pb.go similarity index 82% rename from v2/storagegroup/types.pb.go rename to v2/storagegroup/grpc/types.pb.go index 2622367f0c4f47c4931e1f6e297e405e014014cf..91dae604fdf3cc453a52d83439409d9c834ecffb 100644 GIT binary patch delta 1938 zcmZ9NJ#G|15QT+gerySg03^bdL%d?UXL@>i0we-bd;trg`RTTdkao4+U@d~V0?2nD zAhXOJh{(vv$+!X2-&+aGNqM%rs@|(tRqe0oXZn1yceY;jU*7im`~CR-A|G7;K6${& zjeYp%-jif~sQSKfov%%B)y?t#>pkwTmXCiGIbyN7T*Zr*tMziTJetqa`N#MsUi9np z)n>VVe>cI^>hSr|-NV_d+3CCPauYut>@OCx(%7qShi9Yj=QFcyOt$@yt!uL_ORSwA z?3=9(`A4X-?Gn~y8#%GK`hs(tt>xR{)AAj>u0kf0a#TbIGF9Z3XDbAuQAsQ* zAwaCZMNHoYg(K(5XG%Tzbxu8Q6ZkdOfGL|m4unk=<~FnlATb;l1q3>gr*EDVHMeSs zctxa2+zylwa_qQOA9@dhCx>vvQuz$L8*UwST2(8-BoaOrVG`C;rxhbjk|CfXAUlmy z%Q&j3p`#uRPN&krsl*Goc}=}IbL6x>ZLCj2Qb4;oIoE~O{+ zND;${b!s&7X#xi*S?D$NFp4U)3+)O6pdD(F#At@5Vkdlu7z0kzb#C--0+kQwitmBk z24O1BJH#kK+oixKA*5QbeJemN1<)&9Hy@|c<*Q+7kYQTN>3p}dWYVTNNUE)j?>141 z$G?S3EGVJjhYBe)84w=S7)t0Z_yt)tVi7$(*BT5xP&FxbJFb1}B{WuD@{rMUqySB$ z9*#iGi2}9O(>DCC-$_Zh)QKAO1X!Ro0SUAMdgfNXN^K>#Ha%(pC@0~solrBThmJmn zF$>)=COyh%9i^DW4H6xC^3m=OU^XB)nxtF3+=EdG8ZLq*jH4W-wgvcl_Y*9%<5FqY zbS)9qf>vXv(c@79T2F>@M+nQ-gjM+HA&_SP%vPtlej!&J?M7CLX_WNT7;?xeKvv`% Y%^`Jq+R(H&Kc0Pfs{gaqi@%Tl0ZPp9xc~qF delta 1887 zcmZ9NziJgh6vh#P8o^+pAVK9~se#Py&hG3WR`w~h61CW!Kca<&rnn){ue>pjSdiv|&I^So{Zv4Ks z+xyPBHce>=%@|_dTfKSr;nU%<`MNoMw0rh?`@t5`o1@!5H!pV{-nn{Vv+Ue|eAT&n zUee4*hw1p%_Wu5=^=@;%^M2{W-pZ`KskTCywVkRBUA3LryR~iBjm0%!BL{rTpW5ni zq-glIef3NvvUnO_Juz{2thNPg@dF4J-%M_0HDC^8%G`_O7>NnwcG%=?zkIDgp1;HVSA=JZifQtvGBXT5N#NRkd@MIm7h;l|~=vpRq77P5) zUe+1iGVJy3NR+Uhl6D|Wh>;*>$k#%kr-T4J&syc9{OFAoqjR0gWOV6=fUj7eGMBE<6J-IU;)uVw@g&9d4 z)dtB!WZQzEY3v~oKvO>(NJ`rP)u~)7_*Puu9cYFX0xgjWi9|MlpczxgI-rGFM!C#k zCij4lhD1qIA_-L#T$)m5!Eez}i6#$1RQrgU_`aaTZH=--3U~~%MM)2iFx7O8K~QUF z0JNrMeU`%5P^c!_6E%o8_-cI*&OmKWmQhk0dOQJ7upsFD(1Dg;O_wB^q11uzqzq^Y zE^6zHp4#q6V`gH?5Z6aZvn<+LN&|rjF&ZvtGBq*6)CL;LDbG=@KcJhsrxh!UTM=gM zGN5J2OQ?gMHoE0BbE>h{aH*3$rxR9cOH{Sisn6CdHLIn?o;jG2{-TvkU3r5`Oan>H zYA-P^`K9eZ%!q8|U9Tn79W!e|mjx-`dPO@#@(uW^M-Qk5YM|OgTebDgrBU{%U^57k zTkoVUN7@hx(nC-;t+0Tw(`*xy@{4+)^^tCdAlWR0@>7E-P7j`%F;Lq$pZ&S_@vi