From 1f143e54bd63c13ca55631eb378598e012b4366b Mon Sep 17 00:00:00 2001 From: Alex Vanin Date: Thu, 13 Aug 2020 15:43:47 +0300 Subject: [PATCH] Move api-v2 files into v2 subdir This subdir contains generated proto files and small wrappers. --- {service => pkg}/signature/data.go | 0 {service => pkg}/signature/options.go | 0 {service => pkg}/signature/request.go | 0 {service => pkg}/signature/util.go | 0 service/v2/marshal.go | 21 ---- service/v2/signature.go | 17 --- {accounting/v2 => v2/accounting}/service.go | 6 +- .../v2 => v2/accounting}/service.pb.go | Bin 38493 -> 38701 bytes .../v2 => v2/accounting}/service.proto | 20 ++-- {acl/v2 => v2/acl}/types.go | 4 +- {acl/v2 => v2/acl}/types.pb.go | Bin 39370 -> 39528 bytes {acl/v2 => v2/acl}/types.proto | 12 +- {container/v2 => v2/container}/marshal.go | 2 +- .../v2 => v2/container}/marshal_test.go | 6 +- {container/v2 => v2/container}/service.go | 8 +- {container/v2 => v2/container}/service.pb.go | Bin 172025 -> 172937 bytes {container/v2 => v2/container}/service.proto | 86 +++++++------- {container/v2 => v2/container}/signature.go | 2 +- {container/v2 => v2/container}/types.go | 6 +- {container/v2 => v2/container}/types.pb.go | Bin 20400 -> 20511 bytes {container/v2 => v2/container}/types.proto | 16 +-- {netmap/v2 => v2/netmap}/marshal.go | 2 +- {netmap/v2 => v2/netmap}/types.go | 2 +- {netmap/v2 => v2/netmap}/types.pb.go | Bin 63966 -> 64103 bytes {netmap/v2 => v2/netmap}/types.proto | 4 +- {object/v2 => v2/object}/service.go | 6 +- {object/v2 => v2/object}/service.pb.go | Bin 259486 -> 260609 bytes {object/v2 => v2/object}/service.proto | 112 +++++++++--------- {object/v2 => v2/object}/types.go | 6 +- {object/v2 => v2/object}/types.pb.go | Bin 48908 -> 49123 bytes {object/v2 => v2/object}/types.proto | 38 +++--- {refs/v2 => v2/refs}/marshal.go | 2 +- {refs/v2 => v2/refs}/marshal_test.go | 2 +- {refs/v2 => v2/refs}/types.go | 2 +- {refs/v2 => v2/refs}/types.pb.go | Bin 23077 -> 23158 bytes {refs/v2 => v2/refs}/types.proto | 6 +- {service/v2 => v2/service}/meta.go | 6 +- {service/v2 => v2/service}/meta.pb.go | Bin 75795 -> 76037 bytes {service/v2 => v2/service}/meta.proto | 18 +-- {service/v2 => v2/service}/verify.go | 2 +- {service/v2 => v2/service}/verify.pb.go | Bin 29072 -> 28920 bytes {service/v2 => v2/service}/verify.proto | 7 +- {session/v2 => v2/session}/service.go | 6 +- {session/v2 => v2/session}/service.pb.go | Bin 35760 -> 35971 bytes {session/v2 => v2/session}/service.proto | 29 +++-- {storagegroup/v2 => v2/storagegroup}/types.go | 4 +- .../v2 => v2/storagegroup}/types.pb.go | Bin 13002 -> 13070 bytes .../v2 => v2/storagegroup}/types.proto | 8 +- 48 files changed, 213 insertions(+), 255 deletions(-) rename {service => pkg}/signature/data.go (100%) rename {service => pkg}/signature/options.go (100%) rename {service => pkg}/signature/request.go (100%) rename {service => pkg}/signature/util.go (100%) delete mode 100644 service/v2/marshal.go delete mode 100644 service/v2/signature.go rename {accounting/v2 => v2/accounting}/service.go (92%) rename {accounting/v2 => v2/accounting}/service.pb.go (84%) rename {accounting/v2 => v2/accounting}/service.proto (79%) rename {acl/v2 => v2/acl}/types.go (96%) rename {acl/v2 => v2/acl}/types.pb.go (83%) rename {acl/v2 => v2/acl}/types.proto (91%) rename {container/v2 => v2/container}/marshal.go (99%) rename {container/v2 => v2/container}/marshal_test.go (92%) rename {container/v2 => v2/container}/service.go (97%) rename {container/v2 => v2/container}/service.pb.go (87%) rename {container/v2 => v2/container}/service.proto (77%) rename {container/v2 => v2/container}/signature.go (95%) rename {container/v2 => v2/container}/types.go (89%) rename {container/v2 => v2/container}/types.pb.go (84%) rename {container/v2 => v2/container}/types.proto (80%) rename {netmap/v2 => v2/netmap}/marshal.go (99%) rename {netmap/v2 => v2/netmap}/types.go (99%) rename {netmap/v2 => v2/netmap}/types.pb.go (90%) rename {netmap/v2 => v2/netmap}/types.proto (95%) rename {object/v2 => v2/object}/service.go (99%) rename {object/v2 => v2/object}/service.pb.go (88%) rename {object/v2 => v2/object}/service.proto (79%) rename {object/v2 => v2/object}/types.go (96%) rename {object/v2 => v2/object}/types.pb.go (84%) rename {object/v2 => v2/object}/types.proto (71%) rename {refs/v2 => v2/refs}/marshal.go (98%) rename {refs/v2 => v2/refs}/marshal_test.go (98%) rename {refs/v2 => v2/refs}/types.go (98%) rename {refs/v2 => v2/refs}/types.pb.go (90%) rename {refs/v2 => v2/refs}/types.proto (88%) rename {service/v2 => v2/service}/meta.go (97%) rename {service/v2 => v2/service}/meta.pb.go (90%) rename {service/v2 => v2/service}/meta.proto (89%) rename {service/v2 => v2/service}/verify.go (99%) rename {service/v2 => v2/service}/verify.pb.go (90%) rename {service/v2 => v2/service}/verify.proto (88%) rename {session/v2 => v2/session}/service.go (92%) rename {session/v2 => v2/session}/service.pb.go (83%) rename {session/v2 => v2/session}/service.proto (70%) rename {storagegroup/v2 => v2/storagegroup}/types.go (91%) rename {storagegroup/v2 => v2/storagegroup}/types.pb.go (80%) rename {storagegroup/v2 => v2/storagegroup}/types.proto (82%) diff --git a/service/signature/data.go b/pkg/signature/data.go similarity index 100% rename from service/signature/data.go rename to pkg/signature/data.go diff --git a/service/signature/options.go b/pkg/signature/options.go similarity index 100% rename from service/signature/options.go rename to pkg/signature/options.go diff --git a/service/signature/request.go b/pkg/signature/request.go similarity index 100% rename from service/signature/request.go rename to pkg/signature/request.go diff --git a/service/signature/util.go b/pkg/signature/util.go similarity index 100% rename from service/signature/util.go rename to pkg/signature/util.go diff --git a/service/v2/marshal.go b/service/v2/marshal.go deleted file mode 100644 index 54b7d10..0000000 --- a/service/v2/marshal.go +++ /dev/null @@ -1,21 +0,0 @@ -package v2 - -func (m *RequestMetaHeader) StableMarshal(buf []byte) ([]byte, error) { - // fixme: implement stable - return m.Marshal() -} - -func (m *RequestMetaHeader) StableSize() int { - // fixme: implement stable - return m.Size() -} - -func (m *RequestVerificationHeader) StableMarshal(buf []byte) ([]byte, error) { - // fixme: implement stable - return m.Marshal() -} - -func (m *RequestVerificationHeader) StableSize() int { - // fixme: implement stable - return m.Size() -} diff --git a/service/v2/signature.go b/service/v2/signature.go deleted file mode 100644 index 5470bea..0000000 --- a/service/v2/signature.go +++ /dev/null @@ -1,17 +0,0 @@ -package v2 - -func (m *RequestMetaHeader) ReadSignedData(buf []byte) ([]byte, error) { - return m.StableMarshal(buf) -} - -func (m *RequestMetaHeader) SignedDataSize() int { - return m.StableSize() -} - -func (m *RequestVerificationHeader) ReadSignedData(buf []byte) ([]byte, error) { - return m.StableMarshal(buf) -} - -func (m *RequestVerificationHeader) SignedDataSize() int { - return m.StableSize() -} diff --git a/accounting/v2/service.go b/v2/accounting/service.go similarity index 92% rename from accounting/v2/service.go rename to v2/accounting/service.go index 8898217..456d0e2 100644 --- a/accounting/v2/service.go +++ b/v2/accounting/service.go @@ -1,8 +1,8 @@ -package v2 +package accounting import ( - refs "github.com/nspcc-dev/neofs-api-go/refs/v2" - service "github.com/nspcc-dev/neofs-api-go/service/v2" + "github.com/nspcc-dev/neofs-api-go/v2/refs" + "github.com/nspcc-dev/neofs-api-go/v2/service" ) // SetValue sets value of the decimal number. diff --git a/accounting/v2/service.pb.go b/v2/accounting/service.pb.go similarity index 84% rename from accounting/v2/service.pb.go rename to v2/accounting/service.pb.go index 7d8eba9c142cd3bdfc04fc3636a872f81e73106b..0a4deda77a8622b5977ec4c77aa78d2c43c27304 100644 GIT binary patch delta 3686 zcmZ`+OK4nG7$#}jbS975rU|5(!D&+}d63-qLrANbN>vCHx)GK3KF)1MYZ8+fMoYQX zl~lx*vk+GbA})LoxVR{YkF~lHcUllcEP|kdI~ShweK(nDnQRVs&N=`8f8X~%?wvcI z^nUtT@6FTmTh@G(B&#p4Y&KUe&u@tJt!5(T*49@ySF6>vD0v~eEE??_x5S0Mb&+k{ z`r_naWvU-fR4b*K+N`S0@>g-J=bOI%oga7h&-U#6kV``o^1Ir*@>0D|e%XIUzF$9E zJ`c#h>Z9_#gZ(l&_|Lc#IGGn4!g7Rd`c^jEc;>n0%H~x={#`v@yj^*0->%Ca2V1+( zOGCc`q;!T~lWE`Bs6B*)~X zh7+sP7O^wU1rYiE;=|kN; zw5A{Le(>$|!q7bhDo1A;Pu`!nsm8Txbt_tLWX&sLQEVjZ&9%+d^^5o4Yb>bpiC@_i zSF4rz`G(^;GM`!QN#xy`lX;+&X(g^+(^RjqqgON1Yla;U&nE69p5Aw0<;40q#eK`r z&ylHD12@(EYQ<>THny+|7z8+`ft$nH3t`=X#ZB~1h8<7UztJkqbS7J=&}--*LIPs} zgV5Ipeg~uwr!H0>r#2{9z~bjPFagg+oCHiv9IMXL9DMjT5L7p#+JP_z;skKPeGBkx z7?Zh!Q^t(p+Jmi+ka6yJsKmX5-o*oeS`496jSTOeYyZa|vC_#Low7bs0Y zGQlBaG#D^33Xx8O1Ai$1$1n&XL%^gXGDT#fTgO5sM^&hmf3MWiUOgq>=&-Jbg893C6@0%Oqp@z-x&3M8TK_y8$R1 z#CLIDm=KAiT|xp38*;nQGs8}bV3Bs6w*oSRrx3*z;}V}!GK7K4j%I6;E-Q^?Wg{h& zn;l4bJV@mNaG3z0vox-}#ftHOLiM#yGzBnW$Ao4$rf-fT3;tL!?7f(GSfzl?j`86q zzCi4rR>F=GZ0$M9_;VPqTPCe_Yxs>X+oz{+F?Bq;F+31GVs zu_i;8S#%`A9l7R5uZUbODS+Is8)4fw-**nWT`M*#aObuu!;kd>C*x zl3U6|6ETOD$vVKw3S>|CKoJ121D>oWiV=Vm2Z{h4Ca+9`D&JfUQ#Lu@JDltRNOQ1R z9nT!Q9CfVE2$3zs;WPJDO0-BR=%xUcqD@lHPo~61{Iaic+}YRUOcV}8;z(t8JM6a% zo_tb=+~o*FCOKDa%76gOp~*Bji0=au->(8!iO3-bn~BES`6gm2BN(u(*mVL)3doR& zVPrNp-zYo{W^MtY=vxS_*h<;&PPW)Qu27fifw3 z44L8A0Y5*KffgykF<*#+P~n^Jngo&%a5+#YF+i4`0T28jv2hxNh_Bw-NCPC}NaLpf z-$5?aqcE&PDrv!Y3{M=B{1#(;V&nwap#ai+A+yn<9MoB2RK`KcFdF5~u*1q^q3g+^ z#xzQj?$kul6w22!4wwcyVgYc?AOlxtoSFbdnPRAr21VwXeceBg&z~7BZa@5H_tWD1 znOaYGyH_9i;oi^c;^{~KoZR^*QJfP~?Y|pKL&u7@mT&g+&rf4*`N;0Q8?R5d?`_v6 S)V=3>%YPF6#kn^|hyMrmS@%2u delta 3359 zcmZu!&ubl36edYSlGmmUt%)@W_L&B?$s?J$^PAFIrBu4Hq;yqvF+c9qC{1D#D{;y>R#OpBIw5c3+~D9scF( z;d>WfNb`L2y^Y=Vja#dGYIR3%@2%&0WovtLceB;nO7nNpTe`ic_HW-9*;DTR!Q!!P zUG9kNLTf^f4;EXEjvUo54m~_FEYIF(XGor=nw&Ei$G$LU#;45I^sE^jpO*bg@^{qq z7NN07=5CzmM8%Lq%IdwwSS5By* z!+Lk8{1Gc!|8(ln@ZswpW)9%rk8>;VuQ&f)pKmj=zts3PXKp_G*E55Db=t4LxxTS` zN15N-3-xDbUb9Y`Ul%^KkKX)zU7h{%e_%V$e?Kz$AJHo!{O7sL11Hy(E)1MJSV{&? z9xq)PIC*usUrTae_Ltj-0yhtrPcIAx)4m|lWFPG6JFSV;)wUl*=I`aVhI~_W7RUTf z+v(<^`Mfhzd4>JQ3+$>=yM~@!3!J#h?loi-_O5GBeB35Zr!^s#a(k3R*$tr#1UIw$ z1fns{X(EO>4Re)STA_f~vEB2+hftFAAtc&fr?Bn7$vm+q#Ls}A;XL3uR)v#@ru#g~ z0bFUukn~IS>G{x$5FtYsmju&;wvT;-jCexEhT8~1rwp_* zstngI6d=?M5gXIvKwdEokPKWPP{F4%6iSi-$0EmKl04FrT3@QJ15qY4z&<4cQ^I&W z#(<-el>tg(pcPaDRWbHNVA6RTA{_1+e`zgL-56>q6YYbz48Dd~Gcd*kXgC%?AtRqC zh5)`eSVMS(*t!KsBJ)Lv5MmfrFl0-=l58NV5NpCDg0~p^03M~dO@Yh=l(=<(FSdnS zCjtVqlz=x@g9E}MI2O}1lO$dUegrScB>Ny_p+hae>On^O(Ds{fC2$d-6F`#^wsM49 z2MX*!4Vj!P@YxfgSP*;#1quZj5FB{#fh8t@?dZ~PQjbI@prm900F%|*BnfOsutv`P z6aYcBXioL^P zB|-@@BG?F_?P6a7Im61nW{_zDqfM99X?Ayg7!@OQV2|TCgIWMJdGSk}>}yHA9ZDPltZ_S7d1<0iu>y7h^?{renisdX{)38lG3&hO#C9hckTub(wJZxBq zgf-508kOU$J{Gx0p8Sxl*Umo}I5KPJr|a2EV?$3$n&9Q1`%di7j;CIEd{(}|>+$j& zKFF)d+4}nWy|JV6OJL>N`x|=u>SgoQ$4}Rz?_NDAhb!0h&erC}j;^Q5=b+J>pA(I@ Ohwr~JS)cx7`uIQO@_xzy diff --git a/accounting/v2/service.proto b/v2/accounting/service.proto similarity index 79% rename from accounting/v2/service.proto rename to v2/accounting/service.proto index 6c12c6b..35d55a7 100644 --- a/accounting/v2/service.proto +++ b/v2/accounting/service.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package accounting.v2; +package neo.fs.v2.accounting; -option go_package = "github.com/nspcc-dev/neofs-api-go/accounting/v2"; +option go_package = "github.com/nspcc-dev/neofs-api-go/v2/accounting"; option csharp_namespace = "NeoFS.API.Accounting"; -import "refs/v2/types.proto"; -import "service/v2/meta.proto"; -import "service/v2/verify.proto"; +import "v2/refs/types.proto"; +import "v2/service/meta.proto"; +import "v2/service/verify.proto"; // The service provides methods for obtaining information // about the account balance in NeoFS system. @@ -27,7 +27,7 @@ message BalanceRequest { message Body { // Carries user identifier in NeoFS system for which the balance // is requested. - refs.v2.OwnerID owner_id = 1; + neo.fs.v2.refs.OwnerID owner_id = 1; } // Body of the balance request message. @@ -35,12 +35,12 @@ message BalanceRequest { // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.RequestMetaHeader meta_header = 2; + neo.fs.v2.service.RequestMetaHeader meta_header = 2; // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.RequestVerificationHeader verify_header = 3; + neo.fs.v2.service.RequestVerificationHeader verify_header = 3; } // Decimal represents the decimal numbers. @@ -66,10 +66,10 @@ message BalanceResponse { // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.ResponseMetaHeader meta_header = 2; + neo.fs.v2.service.ResponseMetaHeader meta_header = 2; // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.ResponseVerificationHeader verify_header = 3; + neo.fs.v2.service.ResponseVerificationHeader verify_header = 3; } diff --git a/acl/v2/types.go b/v2/acl/types.go similarity index 96% rename from acl/v2/types.go rename to v2/acl/types.go index 58eaf2e..6374787 100644 --- a/acl/v2/types.go +++ b/v2/acl/types.go @@ -1,7 +1,7 @@ -package v2 +package acl import ( - refs "github.com/nspcc-dev/neofs-api-go/refs/v2" + "github.com/nspcc-dev/neofs-api-go/v2/refs" ) // SetContainerId sets container identifier of the eACL table. diff --git a/acl/v2/types.pb.go b/v2/acl/types.pb.go similarity index 83% rename from acl/v2/types.pb.go rename to v2/acl/types.pb.go index 06711e2444aef32fb5b7d4bd24c2c646af31943b..e05fcf5ee1eb8d3b13a251b9d9b71cf212abfcf7 100644 GIT binary patch delta 4709 zcmZvgON%At8ONb#Y@LpZc*_K&Z3Y*K4Bb_A>MBtjapOWovkGdkt|E#v%narX3YDE3 z1JSb)7lwR;#AD(rA0WCAAzvZj+Ev`;eSg0qoavrTb)EO}{GZGJxm16%-TUFIy+1wk z`1{#O+rN8q^VYTT#__f5S8rZDIJnmK@3e1?M`7cW*RPzvK2A42`STNZhokZJZ{PfT zZ~K>X!`=f!wyN5$YN}>RhO(cwkL-VT{_N^M4?e!b+27uGc<$`kj~;mG?CRz}5B+%m zd*jvP>BjN<*>OuRP(`sEldhLz3-@Ez2=Gvu;n`eKq zzy0sU-`sWk#my^+-=10d`Q{G~Uf4eO_(Nwk+K!j*-M{_9_V>TMeg`vudh+Y@cyRmW z$rpFne>3}jkNwT6`0jRzn|sQq?qv2G<;$lIep$YDYUP!~!%bTK?#wDSZT?=}I<=G6 z&z)NNuzvB>%6IjZQ!9@)*}eqYywn_?iRR|R=HjK((KvcKgrmE4bNt}o!pX@|S+6$# zXx=)i`^!hky2#_RAL6qd<8x@^Gfy^8KlQ75NZBaa=;G508P}R3uB1tPwpo0x5Y#4@ z4=w~5Tw5U`Lu$eMz_kXn%xg`&+#x98Ov?JaVyS0a#a1BaEeP2Z@AWm%+{;n2=5`5Y ziJc|aR_x}SA6TC_ld@8we67}F1en)3&^0(6`xE;G&kRe{q5!kyOj<>a)FK5lLyj8d zSRQnVP8#?z>42SgR$g6~;B@F(ja+6}n71+!(n=iTg9ko2f=UWFlnHz5yF@HIB% z>cNFMSxflFfO4bI^=O}=y`l7d!VM$41-ghVNhX3(EhcWj*JD17 z&j2ON3<;fpSzxUeTIxc;qLXClN+$tr+R2Z`AQ=+OY%p+G@cGf>p9<}*871!vf+6k= z98R(XBsic`Juc+ZfOSig3TNCkY?ICodIkGK8I3kf+z@m`*WkYYm(*I*Q8K}Y7HzA% zd9BmUA&aF&DHPlYAXlXLfJ=h6=YU{*ERo76)dd`@OM+DvS<9~ZX)1Lk2!rg|F?~r{ z9HTOF$RsYsR~ef_if1hEIqxH?E`7}OHhd}0@Tg%(;G{txbuqEE#8~$wiG*3~A52rJ zWVh4BGP=SZ36Pm}@Y5chsW9O&(-JTZSkJpz5@-;^U@f!iw8I=jTwzHj4)St~B7R$e znc>@|@k#*6fbtcD2@MPc%YowXUeC78(cDv9IfC!}A))MMb})yE3UNIY50@i?yl#+c zA&`eUtcNQ)-GVc4QirX~6;|>U___SRhq+;J0BC?Vl(wj)%W%|`wJRBVRkd>4@#L-L zv%#r>hS7x4AG3i&n_YQkRK>1jFrZ7v!MBbl%L>_@a=z6`9q}>HrkL9bnt&W;{%DmW zi3D^Ou}6!aqOj{r$uI!cZ*i=U11=7p4BV3SUbB|gG6r$=3_q+{Y9UujOLxOrQ?T1n zK-nX1SRuj+-Qa-C!U2<=V3yD$!Q2lsS`5Rii`A(|UW@iN3h#yT5-gEidUYbNoSK%F zVn}!zyx_cupg37)gzX1by19a^RuK!qhz*5B9^0%p2`ko5J7k!cBZBNwrQB<}9wi&h zu?IN+6|Mj?TP@O^h#4zeM9?cDI96+}<;aHYux$F)8sl^-klvSAK|+J06;TDn99sC^I8H}z@(48+j&mc zTLIL?K`QivK#2r>!{8MW%mdq!2qUqT_0|}bY~)IGMwq{lVRLlDs?(ydnGr}A5&T-I zNp-8T!}XH5xZZa^!JK0(_UKNZD_|DCKS1sSES}0jfDDXpsBZ88QkIyB?2=|JoqliPL6~JKl^(jYx$zm_a8v>RDRk#0oVgGsm+wuJ$fBM<~0EIZqIsgCw delta 4633 zcmai&ONb@q8HS-XGfbPPWK=?w@gOcDX{W2|)Tzs0gfUq~qPsvMDs`1Xv77E@IOByP z1aTu`ayDWhNU{qdBy=FFEZho`jgUn)*$A$($j+7i|MOHgjXmI|sQ&B!ZtwSgm(!pB zee2`nt@ob1(sZxv-pqE7ZtV|;SN9M0j`p^<_nYqJ=A~hAGyBc+*SEs+5073v7{YIB(L(m8OJQ?m)-IG7v8_~{OLcp-?`1*Uwr4v9p~@9eeW~p zPdA@k{{O|`=+&Fq)y-co-naSUz7H<=_wk4KC+7u@|NFgL-#V3O?tWnNVgy2LImu{nq!tj=|32x#w@Zdh~kw z=BCLXJpNPm=ZM$lm#crxN;gGu?bMAJ%x{ZlPd@#xc<%JmiPwkai>GJ7>&=(tt&{6- zRZpF~ep>zPrB(c;l7fC&OWPaAW^y@8HF+2l3eA&F$@*&A~U_ zTl^?Q+uk}FUf;g7ySpgLd=dXTT~8k6-)wqU?4S$$FK?XWz$XG4S5R zXWnf7cbcM7e@UIxf}fMmR-x#d*OqF_1b+Ee*~06P+Q1 zY2BhD$G;W9HD@GBtX0@I9#3j+7T9dLlj6n7KsX-?Lhw?D14~Tz7;EFn3+uB-MpXiI zf`$1j!c7|^@lJzPS(n@l7 zrlH2bz#k(JSJ96Nmw`GP*3+xJPNP)8>=@#n}*%jw-by|-o z3c7Jj7$GI+f(&K!Bs|j|Dv*28i5+JO=yvs0Pmd4=Z6gq_P2?I8@ zoZ*sHrx(WDW35CgwYxyElJ_jdLa9p_HDj5X6nf00;ZCqGl}zP;*b=cCR4qqSFOng&HKM!XB!~Mw zb`tJ;N5F#8kYQV3=%O*tO};aQGs7)Nu8q3JdlPNb4$UOo)N)PacCJ*S0hKhAfC1EK zA;&RmLU?RJE$WsP_HD9OafKHpG&RLDS3p>6qP?=B6HIrwQ42IDa@f(86V5!$0Hy%c zy2t*Ccx-h!!YU2JB*rkHH33{Xnc<#E9H>C8^$6#LAU&K)JsMg)#j>q5;*SNqw^52r zPq>wGU}b05f~{7*+gR=5v#cp0sNffAz@?rKB~QWV+bO2iRK{`)6NK2D-I8uFa#6sS z0Su*e054jw`8b^$;1+uM=|Cz0z|a+Lv@cBuh&xvU*5pc6Cxw^QpvSIY@Il6N^@1sTorm? zkPYKRqBBVe(6V0W84>HHHi=vdJ)X*22Y;AcF$4uFToqNBX+NH~Ei-926S{Lr%)8ke zNrru(vUAzGt>~2?>XKYVg`-_?wePlNFBP_y`;sxAXb^r5?SL4-M?lr#)O0Ks_$?$x z>kP8J*-B>K08%H~*j&wf46cU$5$HbeKkjhKEzJ^+bzH5*N~qB4xVF_=jrtYR6GN~Z z&vukq1xVVCtd+@?BXok`OpWElW{zcBsx_(7P>s>TJP^@0a@7r70L-C%T{86Cna3Cg z%Zc2_+7-Nae#yH`A_=$nXbM~;{$}?!eyLv!#hS~rh_qC1m{8l7!u}!9DQ8xT+p7&!teg#QM^dk(i;Q*vYz?kc?wS5hg+1$Po<8P;^0DLFEJDGDvT|~0z+hWT zJh&a~+vH|K6OVOmxC@jzaoY@?0Z(W90hjNF_?Hq)$ diff --git a/acl/v2/types.proto b/v2/acl/types.proto similarity index 91% rename from acl/v2/types.proto rename to v2/acl/types.proto index 58bbe25..a0a4c0b 100644 --- a/acl/v2/types.proto +++ b/v2/acl/types.proto @@ -1,18 +1,18 @@ syntax = "proto3"; -package acl.v2; +package neo.fs.v2.acl; -option go_package = "github.com/nspcc-dev/neofs-api-go/acl/v2"; +option go_package = "github.com/nspcc-dev/neofs-api-go/v2/acl"; option csharp_namespace = "NeoFS.API.Acl"; -import "refs/v2/types.proto"; +import "v2/refs/types.proto"; // Target of the access control rule in access control list. enum Target { // Unknown target, default value. UNKNOWN = 0; - // User target rule is applied if sender is the owner of the container.v2. + // User target rule is applied if sender is the owner of the container. USER = 1; // System target rule is applied if sender is the storage node within the @@ -85,7 +85,7 @@ message EACLRecord { // TargetInfo groups information about extended ACL target. message TargetInfo { // target carries target of ACL rule. - acl.v2.Target target = 1 [json_name="Role"]; + Target target = 1 [json_name="Role"]; // key_list carries public keys of ACL target. repeated bytes key_list = 2 [json_name="Keys"]; @@ -99,7 +99,7 @@ message EACLRecord { message EACLTable { // Carries identifier of the container that should use given // access control rules. - refs.v2.ContainerID container_id = 1 [json_name="ContainerID"]; + neo.fs.v2.refs.ContainerID container_id = 1 [json_name="ContainerID"]; // Records carries list of extended ACL rule records. repeated EACLRecord records = 2 [json_name="Records"]; diff --git a/container/v2/marshal.go b/v2/container/marshal.go similarity index 99% rename from container/v2/marshal.go rename to v2/container/marshal.go index 7dd25d2..2d8e1d0 100644 --- a/container/v2/marshal.go +++ b/v2/container/marshal.go @@ -1,4 +1,4 @@ -package v2 +package container import ( "encoding/binary" diff --git a/container/v2/marshal_test.go b/v2/container/marshal_test.go similarity index 92% rename from container/v2/marshal_test.go rename to v2/container/marshal_test.go index 180dcb1..43fa57f 100644 --- a/container/v2/marshal_test.go +++ b/v2/container/marshal_test.go @@ -1,10 +1,10 @@ -package v2 +package container import ( "testing" - netmap "github.com/nspcc-dev/neofs-api-go/netmap/v2" - refs "github.com/nspcc-dev/neofs-api-go/refs/v2" + "github.com/nspcc-dev/neofs-api-go/v2/netmap" + "github.com/nspcc-dev/neofs-api-go/v2/refs" "github.com/stretchr/testify/require" ) diff --git a/container/v2/service.go b/v2/container/service.go similarity index 97% rename from container/v2/service.go rename to v2/container/service.go index 1995b48..bde2b48 100644 --- a/container/v2/service.go +++ b/v2/container/service.go @@ -1,9 +1,9 @@ -package v2 +package container import ( - acl "github.com/nspcc-dev/neofs-api-go/acl/v2" - refs "github.com/nspcc-dev/neofs-api-go/refs/v2" - service "github.com/nspcc-dev/neofs-api-go/service/v2" + "github.com/nspcc-dev/neofs-api-go/v2/acl" + "github.com/nspcc-dev/neofs-api-go/v2/refs" + "github.com/nspcc-dev/neofs-api-go/v2/service" ) // SetContainer sets container of the request. diff --git a/container/v2/service.pb.go b/v2/container/service.pb.go similarity index 87% rename from container/v2/service.pb.go rename to v2/container/service.pb.go index 29fd6330d37d3b4a386fc69e205596b18705f3fa..2c7861d409cf3afd98cf1fbe817d55faf01d8fc9 100644 GIT binary patch delta 9384 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 DIf5?P delta 8505 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 I^v_HG4_{KmBLDyZ diff --git a/container/v2/service.proto b/v2/container/service.proto similarity index 77% rename from container/v2/service.proto rename to v2/container/service.proto index 720abc6..3d6c9c2 100644 --- a/container/v2/service.proto +++ b/v2/container/service.proto @@ -1,15 +1,15 @@ syntax = "proto3"; -package container.v2; +package neo.fs.v2.container; -option go_package = "github.com/nspcc-dev/neofs-api-go/container/v2"; +option go_package = "github.com/nspcc-dev/neofs-api-go/v2/container"; option csharp_namespace = "NeoFS.API.Container"; -import "acl/v2/types.proto"; -import "container/v2/types.proto"; -import "refs/v2/types.proto"; -import "service/v2/meta.proto"; -import "service/v2/verify.proto"; +import "v2/acl/types.proto"; +import "v2/container/types.proto"; +import "v2/refs/types.proto"; +import "v2/service/meta.proto"; +import "v2/service/verify.proto"; // Service provides API to access container smart-contract in morph chain // via NeoFS node. @@ -46,7 +46,7 @@ service Service { message PutRequest { message Body { // Container to create in NeoFS. - container.v2.Container container = 1; + neo.fs.v2.container.Container container = 1; // Public Key of container owner. It can be public key of the owner // or it can be public key that bound in neofs.id smart-contract. @@ -61,18 +61,18 @@ message PutRequest { // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.RequestMetaHeader meta_header = 2; + neo.fs.v2.service.RequestMetaHeader meta_header = 2; // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.RequestVerificationHeader verify_header = 3; + neo.fs.v2.service.RequestVerificationHeader verify_header = 3; } message PutResponse { message Body { - // container_id carries identifier of the new container.v2. - refs.v2.ContainerID container_id = 1; + // container_id carries identifier of the new container. + neo.fs.v2.refs.ContainerID container_id = 1; } // Body of container put response message. @@ -80,19 +80,19 @@ message PutResponse { // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.ResponseMetaHeader meta_header = 2; + neo.fs.v2.service.ResponseMetaHeader meta_header = 2; // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.ResponseVerificationHeader verify_header = 3; + neo.fs.v2.service.ResponseVerificationHeader verify_header = 3; } message DeleteRequest { message Body { // container_id carries identifier of the container to delete // from NeoFS. - refs.v2.ContainerID container_id = 1; + neo.fs.v2.refs.ContainerID container_id = 1; // Signature of container id according to RFC-6979. bytes signature = 2; @@ -103,12 +103,12 @@ message DeleteRequest { // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.RequestMetaHeader meta_header = 2; + neo.fs.v2.service.RequestMetaHeader meta_header = 2; // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.RequestVerificationHeader verify_header = 3; + neo.fs.v2.service.RequestVerificationHeader verify_header = 3; } // DeleteResponse is empty because delete operation is asynchronous and done @@ -121,18 +121,18 @@ message DeleteResponse { // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.ResponseMetaHeader meta_header = 2; + neo.fs.v2.service.ResponseMetaHeader meta_header = 2; // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.ResponseVerificationHeader verify_header = 3; + neo.fs.v2.service.ResponseVerificationHeader verify_header = 3; } message GetRequest { message Body { // container_id carries identifier of the container to get. - refs.v2.ContainerID container_id = 1; + neo.fs.v2.refs.ContainerID container_id = 1; } // Body of container get request message. @@ -140,18 +140,18 @@ message GetRequest { // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.RequestMetaHeader meta_header = 2; + neo.fs.v2.service.RequestMetaHeader meta_header = 2; // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.RequestVerificationHeader verify_header = 3; + neo.fs.v2.service.RequestVerificationHeader verify_header = 3; } message GetResponse { message Body { // Container that has been requested. - container.v2.Container container = 1; + neo.fs.v2.container.Container container = 1; } // Body of container get response message. @@ -159,18 +159,18 @@ message GetResponse { // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.ResponseMetaHeader meta_header = 2; + neo.fs.v2.service.ResponseMetaHeader meta_header = 2; // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.ResponseVerificationHeader verify_header = 3; + neo.fs.v2.service.ResponseVerificationHeader verify_header = 3; } message ListRequest { message Body { // owner_id carries identifier of the container owner. - refs.v2.OwnerID owner_id = 1; + neo.fs.v2.refs.OwnerID owner_id = 1; } // Body of list containers request message. @@ -178,18 +178,18 @@ message ListRequest { // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.RequestMetaHeader meta_header = 2; + neo.fs.v2.service.RequestMetaHeader meta_header = 2; // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.RequestVerificationHeader verify_header = 3; + neo.fs.v2.service.RequestVerificationHeader verify_header = 3; } message ListResponse { message Body { // ContainerIDs carries list of identifiers of the containers that belong to the owner. - repeated refs.v2.ContainerID container_ids = 1; + repeated refs.ContainerID container_ids = 1; } // Body of list containers response message. @@ -197,18 +197,18 @@ message ListResponse { // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.ResponseMetaHeader meta_header = 2; + neo.fs.v2.service.ResponseMetaHeader meta_header = 2; // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.ResponseVerificationHeader verify_header = 3; + neo.fs.v2.service.ResponseVerificationHeader verify_header = 3; } message SetExtendedACLRequest { message Body { - // Extended ACL to set for the container.v2. - acl.v2.EACLTable eacl = 1; + // Extended ACL to set for the container. + neo.fs.v2.acl.EACLTable eacl = 1; // Signature of stable-marshalled Extended ACL according to RFC-6979. bytes signature = 2; @@ -219,12 +219,12 @@ message SetExtendedACLRequest { // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.RequestMetaHeader meta_header = 2; + neo.fs.v2.service.RequestMetaHeader meta_header = 2; // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.RequestVerificationHeader verify_header = 3; + neo.fs.v2.service.RequestVerificationHeader verify_header = 3; } message SetExtendedACLResponse { @@ -235,18 +235,18 @@ message SetExtendedACLResponse { // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.ResponseMetaHeader meta_header = 2; + neo.fs.v2.service.ResponseMetaHeader meta_header = 2; // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.ResponseVerificationHeader verify_header = 3; + neo.fs.v2.service.ResponseVerificationHeader verify_header = 3; } message GetExtendedACLRequest { message Body { // container_id carries identifier of the container that has Extended ACL. - refs.v2.ContainerID container_id = 1; + neo.fs.v2.refs.ContainerID container_id = 1; } // Body of get extended acl request message. @@ -254,18 +254,18 @@ message GetExtendedACLRequest { // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.RequestMetaHeader meta_header = 2; + neo.fs.v2.service.RequestMetaHeader meta_header = 2; // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.RequestVerificationHeader verify_header = 3; + neo.fs.v2.service.RequestVerificationHeader verify_header = 3; } message GetExtendedACLResponse { message Body { // Extended ACL that has been requested if it was set up. - acl.v2.EACLTable eacl = 1; + neo.fs.v2.acl.EACLTable eacl = 1; // Signature of stable-marshalled Extended ACL according to RFC-6979. bytes signature = 2; @@ -276,10 +276,10 @@ message GetExtendedACLResponse { // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.ResponseMetaHeader meta_header = 2; + neo.fs.v2.service.ResponseMetaHeader meta_header = 2; // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.ResponseVerificationHeader verify_header = 3; + neo.fs.v2.service.ResponseVerificationHeader verify_header = 3; } diff --git a/container/v2/signature.go b/v2/container/signature.go similarity index 95% rename from container/v2/signature.go rename to v2/container/signature.go index ca19ee6..0bdb334 100644 --- a/container/v2/signature.go +++ b/v2/container/signature.go @@ -1,4 +1,4 @@ -package v2 +package container func (m *Container) ReadSignedData(buf []byte) ([]byte, error) { return m.StableMarshal(buf) diff --git a/container/v2/types.go b/v2/container/types.go similarity index 89% rename from container/v2/types.go rename to v2/container/types.go index 1379be9..dd64a54 100644 --- a/container/v2/types.go +++ b/v2/container/types.go @@ -1,8 +1,8 @@ -package v2 +package container import ( - netmap "github.com/nspcc-dev/neofs-api-go/netmap/v2" - refs "github.com/nspcc-dev/neofs-api-go/refs/v2" + "github.com/nspcc-dev/neofs-api-go/v2/netmap" + "github.com/nspcc-dev/neofs-api-go/v2/refs" ) // SetKey sets key to the container attribute. diff --git a/container/v2/types.pb.go b/v2/container/types.pb.go similarity index 84% rename from container/v2/types.pb.go rename to v2/container/types.pb.go index 28c03d76efd90de3826e25cae0f1002bfbdc7532..50a0a36d03c6321f3e3f4a571239a1bab96c86d1 100644 GIT binary patch delta 2342 zcmZ{m&2Ah;6ooah6_1BMBg-Q%5R5D!LRjPe|3Lu+VwnYE8=S75=8XJE|(Q1zY0vI1;MHC6ZCbI-Z=R?p8@gR7qg-+%Jqljy9T zU98OcgyJJJG<<@-Mw?G`|s_?@4N2a@b&KUjd!}whsWLf!wU6a4OauR; z#x&rfEc{78#dnis{zCXo>GxV)79JtzI^iPIb>xj|5E{##C6cSgPpDe)S_uv(GIQM|5Rj6)-lNL4b_>{XtC+rG}eV4HQORx;`=!zR|87&ql zDAWx0DrAgJ;Z}zqiE}0dx5rlsZ`CKbpDQKe+eUK736kZW*tox@Pw+oEklxKj8kqTVmnM^mTv z4R8)o!M%6Bl{CdQ1nmAxLw7AE~` zK#nolxq0#w`s7I?#k7)=NFoYV3cfxg8Wv4=f@!M~laZ^H%T!;bK#!6-#wcwhQ386) z#85&f6h?Kf5lQbrtPrZ0n5#203x|-J=<}D8fDrojA<2GZ)ePW-I;YX9w)=8CzT>*y lYog}Y^Q)&=jiX1~X4~Q0e;(>z#$Vx!(Let(ez-e6{2Rv>Xv6>j delta 2293 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 E2fm048vpO|CHtYWJe0>zrJjuLHV(wQ-C zk+P5$yfC1$C?z7;Af>&i?ZARUuj^eeOX*cX5Rn!S|AFoIJ-=^{;>MegHQ(VqJn!=! z_FVsR_M`vJzIk@(TClQSJYSbvD_bvLtv82PH`ce-2ZO75`9l6&y~x>Hmmb``Q8$}! z{o|ek=7Ie@IoPvVZ(O@v)@E~HHr-$S%*-ElFEnM5)oIm?!k`I9W!(MsmPaL_+co#P zKKeK3HfL^~JevE?!P$kidVSbz4zC46wDxxoel~N^T^T-IZ*E>*Upv44LcP}AyzRA_ z#s2i(XJ(IlQ`Pd~GtXXL+j_5$)@wce9r++;7$*w6M`}Yp7?C$>gy@$J_$AGK5cF)1K=XRuDAD-^+KlPW%;i>+}>61>?*?WIExz>Mh@6Fk1`7hqL zy(9lr_r&o2o%`2^M`xyj)org_nBLs)Wz(Bac@Io)-teO7&3}0-dv*xg?e~vQnc1!S zhfjW!0*kAL1I5c*^(%utD=UkMpLQ?#&$Vf}yy%Uy(5_Wu*SOYqZr3nf9_;bPzK+XS z$0NIXsa+dANcAA_wWGDvPR+gq`FdLvk`UOn%Iw-Y4S`Myz2;V`cad)S$d-&;YZTen zf$n5FO||b!b}oBITEkE-crv?|xKNK{YkWJ-JSz#!UShv%LE=f?2zc~e>U1Q}Yv~Cq zd%wxiz*WgkWLPDgnV!XZ76`CL&I-bIj3-8h^+!@O%+oV4H@?|01Tq7q6%QmS(K-^` zgrv}Sg3o%D$-0sJkG0=ei`wxBZTP?+pi~P!U&p{x%Dh7&tSdd~F;L8}EIo?WhDC1L^ zT^bjR{z4ua9-07vSSTw(U5X^A6xs%7Wdoq=*s#ky^Yop_utHbip-;G_ljH)WJvH=2S5J0G6V2lMf^ZtpF+R|4j zGtw!chgIySI?V~E+%dtkAf;(5`Y7C`e8^=+CX>iwfC;1@4TOqfQA#!;rk4A%!cg35 zD1{jD@dXt%uF<8klKu*vFi@8o`JBk&5Ln0)>ZMkl?H+pNe^M7 zAEgQw*-#0RT0X#%TBihNq>@3;Xygt%6RyfI(wa`>s(1_2^_pbK6)^{ctfw3iR#0ek z$Cv)fWwc-=KD17f6@Ji)smCNV)jDe>g91uLA(HfKwaBrFn+*f7lDWV`6Qo-N;t&u5 z62;FsCFm)TQ~>%%)XH;1T&tnhA0v5Ekx_a_yCBm%;1O3m0S%t6`0B0O7v}U}Bf%;l zt*9u(xuuUZf`P#U%@k^q#lfIpxWcY)_MImlAj#}RW{}XCB8+GpfzOTZJmrEYc|-{^ zdV1!3CUNNvs3Sp`!YCOq!!Nr_-#^q643e1S5^R(#xSx<*%tD2jXe zaitKB^xc+XQYM?|LB)q0Y z;jSAY3DVaai*_g_%sLFUB%R^2b-|;Q*sJZByNQs2M2XymVw9$l9xzp>iW`9jPvRMf zfMyi68XEb-wCk8egjuCP^Ka|Mk5FiU7!wS6bVjiW^xJ{2nMsGRbceHo*@t24^;ettd%mS zQWi5?V=$wY`x&Ii=mdIJTyQNzmKIP?_f1_Nw3bRzm+71w14=R@)qX5~R9Y#-XoH{7 zkPy2zA+$~Hv0*UNyI~T9rV>MR^TXOswPX<)MfZWG5P+$PGRjXzx)LqT6n|xdG*B$S z6HYKkFx8XXRDY)Js8~K@^t*XYem0^zozM*pt|2Ggw*TEFEMTR` XgT?-l_rI8(yy&jHd!qlzc0d1ry`gb4 delta 5049 zcmai&O>7-k6~|>KB+YYLHz;aCn>a5Pc1Yyf^Zg+;MT8*O@u?s{5zNfHQ<(<8V7rb> zRE<=zYlRB4t5l$yiV784y=~dh4U3AhU|Wfb9R(qFZH0hy|G%kX8YC9Jo_FWmd%phX zf6jY<{`dT||C)d9(eu;#yRO;Y*o!uHpS4(7%4^c>n6Dqy3k@aLsippB=ij{B`rFHYll3=NoWJA7 z%7y-)E1#E&x7IK8e_B1#-&%c@SF5uxUsxVgVdo2TDv-ET|{k!2ey1ZE%2m58>*R=I(;`}4B<8xi% z^gQhAibgw`)<8R{x2W5Xr8zIrp!X3l+`A`7u4qtzNHV41uHHl?16 zL<%xpo#=3B*L8-p1Fk2^42fA0zoN6VRC_EF%S0-ut zLuCx}(up(_k_}``Cc7sxZz5xcfa-Z7ZK)(<>Cd$$dP{K^@-~#_oFK7f70_AYNMbFo za%m>%6L|c(+pl2~aWyFi3-i(+3FzWtkCB&+mP(_SJD|1L&e!R&TD``QUWJ4 z2AYspsqRP>wn95#GSm({FwvzGxf64>^f#1SI_Z2UAu#UarV4FB28n~%O8FC$D%qtf z-k-=@NVb7Qpo~oFz!Sv}f0a@YN9dPj6iWd#@l7eI6?!U=I%xIQ661pen^R*Xpj0r3 zY9-g9BQlu~dhHjD^y5P%%~k;xky1i-h1XC>mbOH?A=BtX5ZQr&-n0X5p-F%?RJ|1N z7G+`8Ndr*=-G%Oe#vmVdfG?EZDD>DeBv-WpO;Wdw?ipOjK>%JU+5p{kN*sM}C=kG< zeJA)hI7`Rifn57gz2(yf33>sIB!jXJbshMC8t4iXaoovDx*SzZ@1&VjWU`e8=p_^a z>2);wVK@NYloFYgBtZoXsiF`Fy``S(P6rx@)i(sII-SFAJTcO;eY#90*MTn;4Y(=- zDM?aKO9j=IU>_vn2D>n$bewZC19t<$4Op<1yR`$;r1BQpFSXxN4T(fsImZydyfnC@ zs-xpG7IgID0ig0NQ2j#e5tXiEcD45blt5{bM5(A4+)(@~+*sjczG2#;K8GGGmpi&P z)DWQ|(;KLcI)MTRC8(!E5C(c0vr{R9TZM-TC~!g6S@66IgNHsyHh;-tQi(s9gnoFR z@&OoBCd5kn_kGmbs3LFry#|~ns)eFAR0gq?gX*~5KFuDmRI)Xc^*lp|a3+}?rakD0 z5QAmtD3CGCE`cth4xN%gqo&Eq!k=5#4eLqtqx77VYSR!Fhb@|jVIEE#7>gMtKsL9Y}J^8!rFS0=u! zK~1%QL6sgHo*CN>9$vqr-WX4?jDe|A1(5Us#MFf7z0nH!U=iPp06H@gWNjmdccG@B zftaYi%{2coN<*?#BVR1h@8~|#%uY=Y6bvabi@(>vbdpIFp^Vlc%}g@@fSJa*&w8Ly zl)R30m>e><18$oyyasxglj|^U5caQMIr9k%qTK{2h`=z)&;D`cub2F9Kks~R@z6bc z(fSu}ZMp5A{OZBk$?yN@@aWF3Tz&ZT>Dlj|xOQAWv#dP*_9_2U&ik*7XRFWuML)y% o=j4UCL;A^Q@wM}_>pwqy#9!@RdhV$I|NbkBdO2Hs?T`2U2O2jsy#N3J diff --git a/object/v2/types.proto b/v2/object/types.proto similarity index 71% rename from object/v2/types.proto rename to v2/object/types.proto index 9462bc0..2881f0f 100644 --- a/object/v2/types.proto +++ b/v2/object/types.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package object.v2; +package neo.fs.v2.object; -option go_package = "github.com/nspcc-dev/neofs-api-go/object/v2"; +option go_package = "github.com/nspcc-dev/neofs-api-go/v2/object"; option csharp_namespace = "NeoFS.API.Object"; -import "refs/v2/types.proto"; -import "service/v2/meta.proto"; -import "service/v2/verify.proto"; +import "v2/refs/types.proto"; +import "v2/service/meta.proto"; +import "v2/service/verify.proto"; // Type of the object payload content enum ObjectType { @@ -21,14 +21,14 @@ enum ObjectType { message Header { // Object's container - refs.v2.ContainerID container_id = 1; + neo.fs.v2.refs.ContainerID container_id = 1; // Object's owner - refs.v2.OwnerID owner_id = 2; + neo.fs.v2.refs.OwnerID owner_id = 2; // Epoch when the object was created uint64 creation_epoch = 3; // Object format version. // Effectively the version of API library used to create particular object - service.v2.Version version = 4; + neo.fs.v2.service.Version version = 4; // Size of payload in bytes. // 0xFFFFFFFFFFFFFFFF means `payload_length` is unknown uint64 payload_length = 5; @@ -39,7 +39,7 @@ message Header { bytes homomorphic_hash = 8; // Session token, if it was used during Object creation. // Need it to verify integrity and authenticity out of Request scope. - service.v2.SessionToken session_token = 9; + neo.fs.v2.service.SessionToken session_token = 9; // Attribute groups the user-defined Key-Value pairs attached to the object message Attribute { @@ -52,18 +52,18 @@ message Header { // Information about spawning the objects through a payload splitting. message Split { - // Identifier of the origin object.v2. - // Parent and children objects must be within the same container.v2. + // Identifier of the origin object. + // Parent and children objects must be within the same container. // Parent object_id is known only to the minor child. - refs.v2.ObjectID parent = 1; + neo.fs.v2.refs.ObjectID parent = 1; // Previous carries identifier of the left split neighbor. - refs.v2.ObjectID previous = 2; - // `signature` field of the parent object.v2. Used to reconstruct parent. - service.v2.Signature parent_signature = 3; - // `header` field of the parent object.v2. Used to reconstruct parent. + neo.fs.v2.refs.ObjectID previous = 2; + // `signature` field of the parent object. Used to reconstruct parent. + neo.fs.v2.service.Signature parent_signature = 3; + // `header` field of the parent object. Used to reconstruct parent. Header parent_header = 4; // Children carries list of identifiers of the objects generated by splitting the current. - repeated refs.v2.ObjectID children = 5; + repeated neo.fs.v2.refs.ObjectID children = 5; } // Position of the object in the split hierarchy. Split split = 11; @@ -75,9 +75,9 @@ message Object { // Object is content-addressed. It means id will change if header or payload // changes. It's calculated as a hash of header field, which contains hash of // object's payload - refs.v2.ObjectID object_id = 1; + neo.fs.v2.refs.ObjectID object_id = 1; // Signed object_id - service.v2.Signature signature = 2; + neo.fs.v2.service.Signature signature = 2; // Object metadata headers Header header = 3; // Payload bytes. diff --git a/refs/v2/marshal.go b/v2/refs/marshal.go similarity index 98% rename from refs/v2/marshal.go rename to v2/refs/marshal.go index e2abec1..3503a44 100644 --- a/refs/v2/marshal.go +++ b/v2/refs/marshal.go @@ -1,4 +1,4 @@ -package v2 +package refs import ( "encoding/binary" diff --git a/refs/v2/marshal_test.go b/v2/refs/marshal_test.go similarity index 98% rename from refs/v2/marshal_test.go rename to v2/refs/marshal_test.go index c38b3ec..7bf3d6f 100644 --- a/refs/v2/marshal_test.go +++ b/v2/refs/marshal_test.go @@ -1,4 +1,4 @@ -package v2 +package refs import ( "crypto/rand" diff --git a/refs/v2/types.go b/v2/refs/types.go similarity index 98% rename from refs/v2/types.go rename to v2/refs/types.go index 9381202..357b4da 100644 --- a/refs/v2/types.go +++ b/v2/refs/types.go @@ -1,4 +1,4 @@ -package v2 +package refs // SetValue sets container identifier in a binary format. func (m *ContainerID) SetValue(v []byte) { diff --git a/refs/v2/types.pb.go b/v2/refs/types.pb.go similarity index 90% rename from refs/v2/types.pb.go rename to v2/refs/types.pb.go index c76f97c9b3aa846d572e8a8f0c737cf521322b2d..d5ecec60dc3162d9333a6111d771d14e85e29182 100644 GIT binary patch delta 1544 zcmZuwy>1gh7*rCau#q50h~S^%hy)ZkzTLgMJzoJ85)}w)WTCsgT@)q4mTg6LDEtbb z>nV_UfXHch2Hu2`{T)I zHflD{wX$d8z!WT(8*>^Emf^;u27SV_lthUKxuj z11QF7P*kR90HW3n|C%=y1k_B1Q>;m1Ay zRnD)5nQbO#p+HB_(QqL^M4e1CaL6%5YtRPL1PvCa78H^bpm_=X1PT_)8H#cgC2cqD^6<>*>Oa0x6$^Kv#*7ObPv(&W}Mrj!bIc@4!9|Acca0ass{q zqXLrQG=drjUqB&63Q@)}Fi#kWv5%JcQFtm6d%mm)d@C2pdaB%`N2>{FD|k>ec-95@`L*slkJHkNWNP{RoMZZ&E)dvog7 z+;!TT3glz=00$fyUj}iyXB+uSJhA#CtceodpN=?GWRay9!#V&=rjY!u&|x`-jd1Ck u1I@t1W?J#|{Wr0h2Khj)xzs)~g@EMfMj-`IW)| delta 1511 zcmZ`((P|Sx6s2i{bVV#8YS*Aq5Cvm0JF~O9^PsOj6?_-b+1XhUr44Ne4JF1WpN0Ja z5q$GS(hpGl3qQb5@Y$VnN+>P9Tqbw!J?EZtXY==X?d$Q{rzf}feSI*R%F$#t_6Ni9 z{@!FSipJKxwXc1DD!;!>x?A4V)@G&mQfY0STYm0->BeWXgZ}duZ+0g~$-H@WDPB%5 zKI-=VS0m@qy!rXydh_hc#`5=8w%(b_<>jlx&Uvn#YxmYKgeiwp*?icRtMiZTY<1p< z_3HdI7C5)6n)mUobBN8i_{QC{gY_S`)0eY}KZ-U-qrOb@=1)AkpV~oR9Hv!>vK&O4 z;;_o_qYhE25G&byytyMY8GeWy(S+#HZFD#%$VkKlnLKH--a{EM6E>Bh(4Zs-a-D>X zOaX=(-^QltjXKe0^Q$*nwATf>icplIfsABVxOISQfdZR?9F16D=n~DIY#92a25klS zYeZHm)Yobd_zj9m0BH#Zrc&rhMHsB473g!PGJ@K`%$nMTdWVbxsPQ2q5nF*U3`L1p zgc}7rPpTl7YZKtqEJajc*3^lZ@C90oIJtEi0z03w5V%7LGzC%7npWYECr zxm$(pG2b?04KO1Csynsx5+l`o3|u-K=GY!I9$mQtzo$#ogMqyQLjhw_VB{z&a4qn7 z6O2k`g=U9Lj=3Z%9eOFv(q>HBnjIwQ1%J^WU>KNg=^jM`$$-;R70w#BT#tb&x@}p{ zuZ@mrg5t{~kRkMf&x&}sUUjz*LqiF%Ehi;EblMskXokQ-Ex!!fhB0zRHUOeV%xK;M znsZFS)eE{nCoLHGJ~%*zZbt?pfq`q~sQgzEki+joz#hgLVi~KLkF|o`n&L2k7R%_) GJM$0WQi;|8 diff --git a/refs/v2/types.proto b/v2/refs/types.proto similarity index 88% rename from refs/v2/types.proto rename to v2/refs/types.proto index 82049b4..eab1044 100644 --- a/refs/v2/types.proto +++ b/v2/refs/types.proto @@ -1,8 +1,8 @@ syntax = "proto3"; -package refs.v2; +package neo.fs.v2.refs; -option go_package = "github.com/nspcc-dev/neofs-api-go/refs/v2"; +option go_package = "github.com/nspcc-dev/neofs-api-go/v2/refs"; option csharp_namespace = "NeoFS.API.Refs"; // Address of object (container id + object id) @@ -25,7 +25,7 @@ message ContainerID { bytes value = 1; } -// OwnerID group information about the owner of the NeoFS container.v2. +// OwnerID group information about the owner of the NeoFS container. message OwnerID { // value carries the identifier of the container owner in a binary format. bytes value = 1; diff --git a/service/v2/meta.go b/v2/service/meta.go similarity index 97% rename from service/v2/meta.go rename to v2/service/meta.go index b9ac619..61da3fa 100644 --- a/service/v2/meta.go +++ b/v2/service/meta.go @@ -1,8 +1,8 @@ -package v2 +package service import ( - acl "github.com/nspcc-dev/neofs-api-go/acl/v2" - refs "github.com/nspcc-dev/neofs-api-go/refs/v2" + "github.com/nspcc-dev/neofs-api-go/v2/acl" + "github.com/nspcc-dev/neofs-api-go/v2/refs" ) // SetKey sets key to the X-Header. diff --git a/service/v2/meta.pb.go b/v2/service/meta.pb.go similarity index 90% rename from service/v2/meta.pb.go rename to v2/service/meta.pb.go index 34d2eb79af0dd80017cb315ec0f89bc17bb7f01b..88d56b3691c9923f98e1af53382ef18d7a5d51cf 100644 GIT binary patch delta 5665 zcmZ{o&5Krb6vxpS&3Uje7b%H0*c*|J_qp%4(q1&F$RbiBB<#M*;N-~6U=t!2i#E|B zd7xahi5AhSm*-!IHnqqg0$a2yXb}-av(RoA10) z!oJy)ug;%cxe#6)eZ1qY@#2n4o7bKEYR_BK)6Ry`m8=^5w)gGrXWPZOZh7u}IOiRh z8(p5dWBl&jzfP??J?`)Sd`id1!Gm9KK+v@VPmd2i^d7&)-_7ltUVm;&^!wCS!(#5K zCk{P#tgIGB8}{xQ?aD47>`M081lM1Dc;}RZa5d4o0sX+B04_ z{NP}{1)n~D@1~phI{M?K=Js_kj7}aKPFVfmSTM^k3TkH^^4;N zC#?Q^{P2X;BPWhbSpDF{BZKQHI{NvVesdgTeW7X||hRXb-o`_0s&gmBpn~ zH}0D~V5wBSxzb)3%xD#=I-BI~Yp9hrcJHP32elN$?sLByYA+hn$n8p{Ezs$q-V;5; z@cP%bbMJvPcUY&dg`RON4XJz^N@$1(9cW}~=ZxuB3t5)Qw-67tHP%-AX*s56t*==t z4Z#|aa(zf8qSbmWJ-Mt11Vf^)wNw^vfA2x(L!}RmP|9*N2~f}y6rVjS|JweK%U4qy?6330~qNc0b}Qb<>VS8BW=yK6=M>?PyvfZ_8tmDRxI6=O8SuL17rdikOJYU1v-@h5wa%$R2dxB z@*l)v4p0phP%4N(N&OT$9RdTMXeXQ*X{C{%7E%&OkOgv#jhqWZxe)hQvxac!EFIxf zaH$W-4|*k`X)jP+DRIzoMKxqnoeTOx?&3l&BRf6QUK;R<0|lVV^Fnr!0LX6jwW5PU zKJ=PI@?cJ14La;eNgxs7T<^4+vX^1R#8;ro)CyN9tpV3lm%zm&=7mOn(jwu^4s4~L zBjTSyT$1NO}Ttl^XNmhUD}ahDIobYlLIs$V@1sr!??qsKanG zIxS)jC1fP3w?^RNIy!mBD`p``i9Qi2!jyO}1&}Xf*(byShe#zTh`>?B$fyMXQkjAX ziGNqd+SFnm;yFP#pPdT~c$78coIdxfev*?{^cq+MpW%-fG8cNCP^k4z*nC9;E7?H% zWjurwLS?CI`4&%!kf46m7ot9_6+u*K7d9d|AAr^OAo`fh@CM6;p;C-+C(4@~NE8N~ zZBz$R(63r8W0FwP2~RkZL?5N^FnUwP@G;~|D19Z#BE0n@xn$bt;1tkOTIqD-l+7QO z0cHTHK{hhgqJf(M^a?yYeHtjy(QgUkG{A~vBZ5G(RSY{RW2$yDn&~&XH2qXM7X&}N zY29kfzQP7JXF3fYZUGu8qx}J`&{?5f-l2MKBenLErEXF){ed{HgRMzc2$Yod;A&Gw zi1lP5@>M6VAVuG~qzAKW(oK7kR4$N*MWgwH0L0o=DG!0(-)jUh@X)*cw5vcfoG=_f z#6t?2Orvmo?&E^QQL<)?oBt|V#sJJ9L8D?6por+86pjrw3WFpCa+HagwhYNu0twgX z3bamcGXA>NNk2V}k%y~{UC^8c00q8KOzgoGNaT%;ZRP?4D?<&*1#{Q35n#B8Vv+f; zTdY*$_0R(wKxU}#4h?lO%2JN*7Qq*P-5sNSqhniW&-USh#+Cm_7`4-fzF!h zRHi+#0_J-I=?fju>NuSA zN2c?nGCFw$9dR@B)0q;$&JJeASLZjL+3NlZoqOSpv+dF|hd;b@+lHN^Z~ne8KKJ9F cGyLON{*rHZ|3QvF`fJP7`rYGi{yrN04<)PFYybcN delta 5396 zcmZvgU5Hgx6vxpS)467dkkx~BH6x;N=6v3BPNr#Tgj68Rj8RCOPnpz4W`^O0#D$`_ zpya$rL4ovAKB(N+dI);!MIs{KBq-=92<)YT_Wu8Nc5r;zbMD^ztdIX%>%Z2S_rITP zZ%lr4XwOQ$ytY`@vunZZxq3C9IlsKLy435P&&xCU>AJrbT&#{vtOfqXoBOur@A2e@)0?+PQCS3`7bam51&tq!FKk)fxPJGa-gleU@BXyCzHj~R z%MX2dkKN6?-<{mJ7PQxrqWyjEdt03YGi$+2dwp`}_~XZZnOHCD!zZpzn778yJ@xGd z`?t6M2mSqdW_oh{?cL#T6V~armt3~DuO(mH!eBKXci-zD?7x1hczdxlB^`%aliKd2TFX$U1G{oF z*Zn{{USRiQ-Ki`4>}675{`9@ku+VwXkr!(xwa3F;?`3)~DD6%X+cog)TFAyqJ5_3T zV(p}P8@WQkM}uUe;PGVi=zxTAIm8&)8!0XS$l}AeV?h zR~tQhku>;H8tYQ3HI(d9X2*KYw2~zb9^Fg?D(*CT_DM!#wZ$JFLWMY&JfCbtwxG}D zA;CarEhF)Sn&dQ9(pA7IkP@l^!%~T>br7V}BNKEN0KHe}Jt`MG1Fp)GLRR2;BpU}3 zXM!Zk&?S!p1)5wTxl8RwLY1;^a_J|bIj%rb_%u9Ae})ekX6OLf0ofqg&{3!zAdV%- zkqbZq402-W2iuHfO=KUzprQtn9ZC{G%mqCF#Dat!G*hLHdt_+@mB6bc8fvO^WUG$k z0+WhrpvGk}!G$J0*&PboT&qoDZ&)jM#t|C^j7+$Sqk^QC3lKg$84RQ!Phhc3mvXR@ zZ?!Z~K88Q7hJg;E4)mFx$(35qkwAi#*?}ggMyM%Fq~8%*qS`CS0Kz@}9l=r9) zsHTvqFgMx?g(??#@MQX`3g(M&;EA58t41M*YdY{*KR zrA0ToQ}8mmF9kIAcm!6mf;yl%WuY{9kcni_*`R<5Bb6DXG7#7Dxe{PxEVjTp^bc6v zMBBPBA`u(G>d6>~m?Y8csQ}WtBGaWIlRvp`(z$4$(6oWdYDg6;j3jT!Cw4}SJn0T8 zR9DpT!EqLJBy9{NhQF)^iiI```N7{z3NR$RMt%+i8)PwJkfGOr518Y_0F)wvh^YdJ zGWC?7Oeb_D2!c8UDkH)q3F2^y3@0Qb6AkM_qZ%XYLS=)-vmwteJksW7F5RJunH14X zm7u|)&9s*iTU<~KMfjs39WfQSkakxF?cdp=ND@z2j2;-F!Iw$oJ1q^Nfg;HeQjzXJ zXss~wm+--J`gkDo7%&1|HHBtD;sBl|-%M*Y-~s^5ok|=)LzCnuK*lK3TcWZ%^B+S1 z-Hc?RD?m6*B$($YRbJJSm>RYc}R){$M68Ku>j85nMgHWT3_r zB(Q}PsSG-vp+gH&%s8d1Zamcv1QF1#AR?pS&iqCDXL#X*!cdUGmdOvcHn^zXltj!Z zz9iulFi?%;N1{_tP%)7)3==lHZ}ihBC=i3c)lkTK8lsaeAMhs=7_Q4{-+gsR8)Vh+ zEX||=Nn+^6DnNw6(9T~B59Avmqq7l)Oo&m-j+&H2unU6<0}kGr&S^E&fTWToGnrsa zbF!$)FypP&&j(U>o^=!~AG)(Bh!}sY24*Y1rRXMP1H(82DBxi#Akl;Y$+T{(ALuFH z0=A~22ZT=mm?FOeRihm<5}F+df@Hv}5}!#!JySy=X`rk&L}Oj3BF!IABz=^@W1#n9 z=``OM79_1uH{Up*>KH|~(7)I>gS6E!P$tp%`F=%Qs4!Hu^uzw3M;#*7msAq1Ozv`dE|<}vdh#e!kl2X!&@QZlZVWj1Wh_cPzMfCoHooK+^1tKMOF8e%0)SP7`<8n!^?uB!twT`6I| xD92yFx$%tsXWXURpR~8WIz0aL$E#EJA9^Qlr913D_{Janu|@wEymb3q_%G#leuDr2 diff --git a/service/v2/meta.proto b/v2/service/meta.proto similarity index 89% rename from service/v2/meta.proto rename to v2/service/meta.proto index c1a4ddf..203e7ce 100644 --- a/service/v2/meta.proto +++ b/v2/service/meta.proto @@ -1,13 +1,13 @@ syntax = "proto3"; -package service.v2; +package neo.fs.v2.service; -option go_package = "github.com/nspcc-dev/neofs-api-go/service/v2"; +option go_package = "github.com/nspcc-dev/neofs-api-go/v2/service"; option csharp_namespace = "NeoFS.API.Service"; -import "acl/v2/types.proto"; -import "refs/v2/types.proto"; -import "service/v2/verify.proto"; +import "v2/acl/types.proto"; +import "v2/refs/types.proto"; +import "v2/service/verify.proto"; message XHeader { // Key of the X-Header. @@ -40,7 +40,7 @@ message SessionToken { // ID is a token identifier. valid UUIDv4 represented in bytes bytes id = 1; // OwnerID carries identifier of the session initiator. - refs.v2.OwnerID owner_id = 2; + neo.fs.v2.refs.OwnerID owner_id = 2; // Verb is an enumeration of session request types enum Verb { // Refers to object.Put RPC call @@ -67,7 +67,7 @@ message SessionToken { // Carries context of the session. oneof context { // object_address represents the object session context. - refs.v2.Address object_address = 6; + neo.fs.v2.refs.Address object_address = 6; } } // Session Token body @@ -81,9 +81,9 @@ message SessionToken { message BearerToken { message Body { // EACLTable carries table of extended ACL rules - acl.v2.EACLTable eacl_table = 1; + neo.fs.v2.acl.EACLTable eacl_table = 1; // OwnerID carries identifier of the token owner - refs.v2.OwnerID owner_id = 2; + neo.fs.v2.refs.OwnerID owner_id = 2; // Token expiration and valid time period parameters TokenLifetime lifetime = 3; } diff --git a/service/v2/verify.go b/v2/service/verify.go similarity index 99% rename from service/v2/verify.go rename to v2/service/verify.go index 8e7e2cf..c9081fd 100644 --- a/service/v2/verify.go +++ b/v2/service/verify.go @@ -1,4 +1,4 @@ -package v2 +package service // SetKey sets public key in a binary format. func (m *Signature) SetKey(v []byte) { diff --git a/service/v2/verify.pb.go b/v2/service/verify.pb.go similarity index 90% rename from service/v2/verify.pb.go rename to v2/service/verify.pb.go index 6f1cd42a3ced3923d1550af67c4e86693589372c..34913d789beeaca11151825d06d888d6c703e017 100644 GIT binary patch delta 2057 zcmZvdJ!=$E6ov^Xm~En60wx)>h{c-B-1*p5fhgtlK$pM+fbE z`^C}W@!@FnqPEZKeHRU1Kh*a>|C(P~DYJ4~7#BNh%cf|~-d=upW$l8p7)N_g4xS&M zCjHlyaeuyguYY=Vy}!G*f408zYWbfSpH^RAzV_T5ZnrPDPt5j!*e4qg|D%1g@%TU5 z^Nk0izp3=MH#aY$^n06YH!c#5?s%rn{Men2mUnid)a3og&H2qV9Y^tOYQk&U@n|`o zWsVa7}DIZ=HEW@S{8u5gjQ=S6L7&)OC)dYY70y%CF>t==W!9!eC zu}o;Nw7f0OYL%1BTm5NaNTG#T%3HP}#p$9cvNR^Rbu+V2Ps5Znyfvl@r^fgWg8-QV zP!+Kjd9re(+h9{NNy=H|hxWjZ3F~Hld;&?;%7S2lR{1o=GSUE)#MT5R8UXSvpsfX$y1=LN3PA zi?@oQD@JWqHZ{rMo1(X%`QZr&+5pv4wM`(b{qP9}`~vTa&a_lUj7p)Q8S;mh+TG~v z8G2QV0P-+6q%s`n&6KS{kQ&tX4L(TlNlFePZU|cELDH7`A*4P-+P50RLph@8m z5F+&#@&_av|AQ;{E|l!txE0)Z@AKB+m~7k}Zk;;kyzlw^>-Teyo}PR3-nF$|ZRV|= zZOm+ASM&blaJgC>FM?oMw_nspHr$vW`kSBJ4X+-}k3avaIcyhS&hD?5ZF|t!&FsEi z^y`CqIX^gB%eWc{u)Z@zwF8y?6ej`!0TM{Aus4Q#VIq{9|wb!)Hk3 zZ-)v=Umh=3cb~Nj-wi+gtT{Qh-vqm}S(qf%cxV6Q<<#B?qpj(X z^^IV6{Bu7%pCtafGviKpXRyY9l*qL9Z(Dj4;fQ1VeW-Z_IshfxWaF82B;1woXe)~g!GBv37Jn6l#CBV#2+Xr*=* zrWC%5?ZcHqAYOxahBSC9>6pK<3d1|$U5JIyA|Eb=qk;S+tpHRvOj~a>Y3WYrVYdtLJpILzlIPLa@gj46usx2gIqu_S3V$2`Y8v7 zDy8>1U7AewMpmR=K|X?ZjC}@-`ds)p!&aTiRmqkd61=I;R->d$3iKVNN;O=NEWnJ& z&4Od0-D0n@X>8oI`&o@ZGtOvm%~HAXZed)a(Xbd8Cqz{ZRlS(l+6?`TH8v_zr=25Q z3!3OjA5p^0CF1ZSa_H4cOe@~XLGMC;;n@2{cAJK(hlWg*dI?pHftsZ0$;E|PnHae= z$G@*#7<}i|s+iCgBP~D*qfQkewDwan1wO+$C1tf!D z_o{-%ntlpj>14$2h$LBqtR*frVW;!w5oBZ`rqJ3|!|)X7E8eAf(c`Cfym|fdl?Gj} zgn%p6P!+n3$4l2Q4?2q_qhTqKZbPkcWTQIXx=QKkhI*i>ePpWTug>INNKa6mF$OZK!khgy5efF}-Su?BH?tnOY(#uj_y%JQt8M>k9K+q`^nVOPm zzjYNF4LOvwzZIHXJ;uIfqB8V}icay|VfQKMzUhEW-SSQTV5^QtaGE6E5wfQ-l3KM6 TglWfUvEv@>K6(AkUvK{d0|_)8 diff --git a/service/v2/verify.proto b/v2/service/verify.proto similarity index 88% rename from service/v2/verify.proto rename to v2/service/verify.proto index 2933896..0b9b87c 100644 --- a/service/v2/verify.proto +++ b/v2/service/verify.proto @@ -1,13 +1,10 @@ syntax = "proto3"; -package service.v2; +package neo.fs.v2.service; -option go_package = "github.com/nspcc-dev/neofs-api-go/service/v2"; +option go_package = "github.com/nspcc-dev/neofs-api-go/v2/service"; option csharp_namespace = "NeoFS.API.Service"; -import "acl/v2/types.proto"; -import "refs/v2/types.proto"; - // Signature of something in NeoFS message Signature { // Public key used for signing. diff --git a/session/v2/service.go b/v2/session/service.go similarity index 92% rename from session/v2/service.go rename to v2/session/service.go index 3c1b812..41a050d 100644 --- a/session/v2/service.go +++ b/v2/session/service.go @@ -1,8 +1,8 @@ -package v2 +package session import ( - refs "github.com/nspcc-dev/neofs-api-go/refs/v2" - service "github.com/nspcc-dev/neofs-api-go/service/v2" + "github.com/nspcc-dev/neofs-api-go/v2/refs" + "github.com/nspcc-dev/neofs-api-go/v2/service" ) // SetOwnerId sets identifier of the session initiator. diff --git a/session/v2/service.pb.go b/v2/session/service.pb.go similarity index 83% rename from session/v2/service.pb.go rename to v2/session/service.pb.go index 9d5d8af673fcad2c7ebc0ad9a453791a4e9e54a9..7759f67c373919eb3cbdbb3d9e7b2633f622d7cc 100644 GIT binary patch delta 3504 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 diff --git a/session/v2/service.proto b/v2/session/service.proto similarity index 70% rename from session/v2/service.proto rename to v2/session/service.proto index c980dcf..39650cf 100644 --- a/session/v2/service.proto +++ b/v2/session/service.proto @@ -1,27 +1,26 @@ syntax = "proto3"; -package session.v2; - -option go_package = "github.com/nspcc-dev/neofs-api-go/session/v2"; +package neo.fs.v2.session; +option go_package = "github.com/nspcc-dev/neofs-api-go/v2/session"; option csharp_namespace = "NeoFS.API.Session"; -import "refs/v2/types.proto"; -import "service/v2/meta.proto"; -import "service/v2/verify.proto"; +import "v2/refs/types.proto"; +import "v2/service/meta.proto"; +import "v2/service/verify.proto"; service Session { // Create opens new session between the client and the server. rpc Create (CreateRequest) returns (CreateResponse); } -// CreateRequest carries an information necessary for opening a session.v2. +// CreateRequest carries an information necessary for opening a session. message CreateRequest { message Body { // Carries an identifier of a session initiator. - refs.v2.OwnerID owner_id = 1; + neo.fs.v2.refs.OwnerID owner_id = 1; - // Carries a lifetime of the session.v2. - service.v2.TokenLifetime lifetime = 2; + // Carries a lifetime of the session. + neo.fs.v2.service.TokenLifetime lifetime = 2; } // Body of create session token request message. @@ -29,14 +28,14 @@ message CreateRequest { // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - service.v2.RequestMetaHeader meta_header = 2; + neo.fs.v2.service.RequestMetaHeader meta_header = 2; // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - service.v2.RequestVerificationHeader verify_header = 3; + neo.fs.v2.service.RequestVerificationHeader verify_header = 3; } -// CreateResponse carries an information about the opened session.v2. +// CreateResponse carries an information about the opened session. message CreateResponse { message Body { // id carries an identifier of session token. @@ -51,10 +50,10 @@ message CreateResponse { // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - service.v2.ResponseMetaHeader meta_header = 2; + neo.fs.v2.service.ResponseMetaHeader meta_header = 2; // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - service.v2.ResponseVerificationHeader verify_header = 3; + neo.fs.v2.service.ResponseVerificationHeader verify_header = 3; } diff --git a/storagegroup/v2/types.go b/v2/storagegroup/types.go similarity index 91% rename from storagegroup/v2/types.go rename to v2/storagegroup/types.go index a46acfb..5f4bd37 100644 --- a/storagegroup/v2/types.go +++ b/v2/storagegroup/types.go @@ -1,7 +1,7 @@ -package v2 +package storagegroup import ( - refs "github.com/nspcc-dev/neofs-api-go/refs/v2" + "github.com/nspcc-dev/neofs-api-go/v2/refs" ) // SetValidationDataSize sets the total size of the payloads of the storage group. diff --git a/storagegroup/v2/types.pb.go b/v2/storagegroup/types.pb.go similarity index 80% rename from storagegroup/v2/types.pb.go rename to v2/storagegroup/types.pb.go index e099149630cd68b3c27839e725a2c7f29302355c..e206d31c3853ee703a29d518ac4258daa60c39ad 100644 GIT binary patch delta 2005 zcmai#zlt135XKP*t!_cahjbDs8f+&A$6Zg)|G+}Vik%uEgy`w%5kf}0?A{%F2s3^H zVX;Wh;MCkZIB=@Sp&!ACV|V|)6&wzvq?xU*`o5~Ks(SwnZ^mCAK~?5fAx@ZI%Q7}sxq`(_q{)93FWez<{c`}OQ>`+jD( zf6VOVzq9>oUshewG&Z*I5Ke3fGR_pNIBL}FhZ zW#fyV!lSVEs~5|d{j>km9A-by=jU$qIlt`N?8(#q;xxRT@12}vwkxvqYn?5&@4k38 zRsJY5o5667=`3A3$0D7DIhya8P2Q#-rse`yi|f#1;kGRa;JX8~#FBT(URLRJc{+`5 zL71XzVlWL};Pu2+Az4}?3Y)%1BEl7H2Wl~-+nj`J{2d4Zd(1Hr6eM2*)IrmwLZ(fP zukvfi!h*Wv2erc96I^0Z{UvO{!O%iiB0xca((u3y3KI~8^r?_(GooifRU^SYmXW+V zS#lUE$pBI=k+4_^0Cr3F21HjD2L6`%Ew}P_DQenSfPA4g2v3rLs%9xdLJwd_PqnQ< zPc_4nMFE1K9n4Xk)P|PQD@-QVHpR9oZ>o}pJq(T-a&6H%vO>o@@pmx42Fwb{Gc|R9v<6JgGU(6ey28onrmX|n9^g!HZ`TG!!@@f z2wwH~m^}QuZSWu^eWGIcs^}4WsU$%iNUWjS4ogSE+6G2!W7Hlz<8r4q1fb1uG(`rZ zW+Ai#!!wP6lpJglK=O3RGved;Zt-dHZzYo2pu|$4@d;4E47aB-ks$G3ZF<0|mOf;x zH>1Sjs3eXDPX=lCTo_zCPKy9q)*d)blAaHVq4kaaiC@#$X-z)PM`EyQD+ATQQ{iMO zw~-8RHX1a(wIv-syPcptH9jqvaWE1=Sx-qBJ#V%40EUVhbZVC*uEfxjrM;H69xX~* zqIt?K44R2bQjtbMl4?d1;BUCr3$c3w>5{|Mpy94s@{0coG3z)gjFN=m^f2t+Y4u8W r2_`sv3=qa_zdzW&FM)v`wZt{SO~1_#ZeRX#@Z%l+PcQ#E{O9I>PCpW- delta 1904 zcmZXV-D(p-6vt7DZ6mE-Sk#L`D1xA&*`58!?nOnxYkdF_+04$Cs*sSRCB=)pfhc(i z@kS&*g^%Ek&)^G)Gr#|8L%rxQIWy<{KhBx$`{uj*@aX<@Hkwq&?szgf9rw>ne|A20 z)5Gy(G#hm~U%%bkoVaG{FMj>`?3#}(2edF!6KshymRJ=<58 zt1rj9cMdKGyGPv@FNfzd_pYB83=%7Q?GTk95X02o-4=X_iX``;=sz z8bl`)HKE*MF0KaTp$;gdcp_KThD81O|0-!iP7{!a$T2h~<9-3*OmbM+FXn}=W@rlf}v=-rA}?dNLYXf+I|+wJ@^6mxR^^Vfu9u%_UmAQx3#6rD}1(^)FQz6=EuT z#MB}|9n03}Nk~gcvj?TnVUM55C2FYY(i5qlic`+t46mV`44_L45Q61uq!u$(n#_2e zB$h-#`pFFVvBnpNT@FId4@+Lkuv%8_HN<)`vRgPgH6^nKb