diff --git a/prepare.sh b/prepare.sh index 5962123..c0e4a37 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 a14e5a1..a49f79b 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 0000000..9f04943 --- /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 456d0e2..0da7936 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 f8a40e8..aa9fdbe 100644 --- a/v2/accounting/service.pb.go +++ b/v2/accounting/grpc/service.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/accounting/service.proto +// source: v2/accounting/grpc/service.proto package accounting @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" - service "github.com/nspcc-dev/neofs-api-go/v2/service" - grpc "google.golang.org/grpc" + grpc1 "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + grpc "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" + grpc2 "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" io "io" @@ -40,21 +40,21 @@ type BalanceRequest struct { Body *BalanceRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *BalanceRequest) Reset() { *m = BalanceRequest{} } func (m *BalanceRequest) String() string { return proto.CompactTextString(m) } func (*BalanceRequest) ProtoMessage() {} func (*BalanceRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_484f6b0e24e3172f, []int{0} + return fileDescriptor_d9dd5af2ff2bbb25, []int{0} } func (m *BalanceRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -90,14 +90,14 @@ func (m *BalanceRequest) GetBody() *BalanceRequest_Body { return nil } -func (m *BalanceRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *BalanceRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *BalanceRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *BalanceRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -108,17 +108,17 @@ func (m *BalanceRequest) GetVerifyHeader() *service.RequestVerificationHeader { type BalanceRequest_Body struct { // Carries user identifier in NeoFS system for which the balance // is requested. - OwnerId *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OwnerId *grpc1.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *BalanceRequest_Body) Reset() { *m = BalanceRequest_Body{} } func (m *BalanceRequest_Body) String() string { return proto.CompactTextString(m) } func (*BalanceRequest_Body) ProtoMessage() {} func (*BalanceRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_484f6b0e24e3172f, []int{0, 0} + return fileDescriptor_d9dd5af2ff2bbb25, []int{0, 0} } func (m *BalanceRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -147,7 +147,7 @@ func (m *BalanceRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_BalanceRequest_Body proto.InternalMessageInfo -func (m *BalanceRequest_Body) GetOwnerId() *refs.OwnerID { +func (m *BalanceRequest_Body) GetOwnerId() *grpc1.OwnerID { if m != nil { return m.OwnerId } @@ -169,7 +169,7 @@ func (m *Decimal) Reset() { *m = Decimal{} } func (m *Decimal) String() string { return proto.CompactTextString(m) } func (*Decimal) ProtoMessage() {} func (*Decimal) Descriptor() ([]byte, []int) { - return fileDescriptor_484f6b0e24e3172f, []int{1} + return fileDescriptor_d9dd5af2ff2bbb25, []int{1} } func (m *Decimal) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -220,21 +220,21 @@ type BalanceResponse struct { Body *BalanceResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *BalanceResponse) Reset() { *m = BalanceResponse{} } func (m *BalanceResponse) String() string { return proto.CompactTextString(m) } func (*BalanceResponse) ProtoMessage() {} func (*BalanceResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_484f6b0e24e3172f, []int{2} + return fileDescriptor_d9dd5af2ff2bbb25, []int{2} } func (m *BalanceResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -270,14 +270,14 @@ func (m *BalanceResponse) GetBody() *BalanceResponse_Body { return nil } -func (m *BalanceResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *BalanceResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *BalanceResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *BalanceResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -297,7 +297,7 @@ func (m *BalanceResponse_Body) Reset() { *m = BalanceResponse_Body{} } func (m *BalanceResponse_Body) String() string { return proto.CompactTextString(m) } func (*BalanceResponse_Body) ProtoMessage() {} func (*BalanceResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_484f6b0e24e3172f, []int{2, 0} + return fileDescriptor_d9dd5af2ff2bbb25, []int{2, 0} } func (m *BalanceResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -341,67 +341,67 @@ func init() { proto.RegisterType((*BalanceResponse_Body)(nil), "neo.fs.v2.accounting.BalanceResponse.Body") } -func init() { proto.RegisterFile("v2/accounting/service.proto", fileDescriptor_484f6b0e24e3172f) } +func init() { proto.RegisterFile("v2/accounting/grpc/service.proto", fileDescriptor_d9dd5af2ff2bbb25) } -var fileDescriptor_484f6b0e24e3172f = []byte{ - // 472 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0xdf, 0x6e, 0xd3, 0x30, - 0x18, 0xc5, 0x49, 0x37, 0x28, 0x78, 0x0c, 0x84, 0x19, 0xea, 0x54, 0xa0, 0x42, 0xd5, 0x26, 0x01, - 0xa2, 0x8e, 0x14, 0x2e, 0x90, 0x86, 0x06, 0x5a, 0x35, 0x26, 0x7a, 0xc1, 0xbf, 0x4c, 0xda, 0x05, - 0x37, 0x93, 0xeb, 0x7c, 0xe9, 0x2c, 0x5a, 0x3b, 0xc4, 0xae, 0x51, 0xdf, 0x84, 0x17, 0xe0, 0x86, - 0x0b, 0x9e, 0x83, 0x4b, 0x1e, 0x01, 0x95, 0x17, 0x41, 0xb1, 0xdd, 0x36, 0x95, 0xb2, 0xad, 0x77, - 0xb1, 0x7d, 0xce, 0xf9, 0x7c, 0x7e, 0x8a, 0xd1, 0x7d, 0x13, 0x85, 0x94, 0x31, 0x39, 0x16, 0x9a, - 0x8b, 0x41, 0xa8, 0x20, 0x37, 0x9c, 0x01, 0xc9, 0x72, 0xa9, 0x25, 0xde, 0x12, 0x20, 0x49, 0xaa, - 0x88, 0x89, 0xc8, 0x42, 0xd3, 0xbc, 0x6b, 0xa2, 0x30, 0x87, 0x54, 0x85, 0x7a, 0x92, 0x81, 0x72, - 0xd2, 0xe6, 0x3d, 0x13, 0xcd, 0xcc, 0xe1, 0x08, 0x34, 0xf5, 0xdb, 0x8d, 0xd2, 0xb6, 0x81, 0x9c, - 0xa7, 0x13, 0x77, 0xd0, 0xfe, 0x51, 0x43, 0xb7, 0xba, 0x74, 0x48, 0x05, 0x83, 0x18, 0xbe, 0x8e, - 0x41, 0x69, 0xbc, 0x8f, 0xd6, 0xfb, 0x32, 0x99, 0x6c, 0x07, 0x8f, 0x82, 0xc7, 0x1b, 0xd1, 0x13, - 0x52, 0x35, 0x9c, 0x2c, 0x7b, 0x48, 0x57, 0x26, 0x93, 0xd8, 0xda, 0xf0, 0x1b, 0xb4, 0x51, 0x0c, - 0x3e, 0x3d, 0x03, 0x9a, 0x40, 0xbe, 0x5d, 0xb3, 0x29, 0x3b, 0xa5, 0x94, 0x59, 0x37, 0xef, 0x7d, - 0x07, 0x9a, 0xbe, 0xb5, 0xda, 0x18, 0x8d, 0xe6, 0xdf, 0xf8, 0x13, 0xda, 0x74, 0x17, 0x9d, 0x05, - 0xad, 0xd9, 0xa0, 0x67, 0xe7, 0x07, 0x9d, 0x14, 0x72, 0xce, 0xa8, 0xe6, 0x52, 0xf8, 0xc0, 0x9b, - 0x2e, 0xc2, 0xad, 0x9a, 0x7b, 0x68, 0xbd, 0xb8, 0x27, 0x8e, 0xd0, 0x75, 0xf9, 0x4d, 0x40, 0x7e, - 0xca, 0x13, 0x5f, 0xb2, 0x51, 0x4a, 0x2d, 0x90, 0x92, 0x0f, 0xc5, 0x79, 0xef, 0x30, 0xae, 0x5b, - 0x61, 0x2f, 0x69, 0xef, 0xa3, 0xfa, 0x21, 0x30, 0x3e, 0xa2, 0x43, 0xbc, 0x85, 0xae, 0x1a, 0x3a, - 0x1c, 0x83, 0xf5, 0xae, 0xc5, 0x6e, 0x81, 0x1f, 0xa0, 0x1b, 0x59, 0x0e, 0x8c, 0x2b, 0x2e, 0x85, - 0x2d, 0xbd, 0x19, 0x2f, 0x36, 0xda, 0xbf, 0x6a, 0xe8, 0xf6, 0x1c, 0x99, 0xca, 0xa4, 0x50, 0x80, - 0x5f, 0x2d, 0x71, 0x7e, 0x7a, 0x09, 0x67, 0x67, 0x2a, 0x83, 0x3e, 0xaa, 0x02, 0xbd, 0x5b, 0xc9, - 0xc7, 0x99, 0xcf, 0x21, 0x1d, 0x57, 0x93, 0xee, 0x5c, 0x90, 0x74, 0x29, 0xea, 0xd7, 0x1e, 0xf5, - 0x0b, 0x54, 0xef, 0xbb, 0x06, 0xbe, 0xe6, 0xc3, 0xea, 0x9a, 0x9e, 0x6d, 0x3c, 0x53, 0x47, 0x5f, - 0xd0, 0x9d, 0x83, 0xf9, 0xf1, 0xb1, 0x1b, 0x8f, 0x4f, 0x50, 0xdd, 0xf3, 0xc0, 0x3b, 0xab, 0xfc, - 0x96, 0xcd, 0xdd, 0x95, 0xa0, 0x76, 0xd3, 0xdf, 0xd3, 0x56, 0xf0, 0x67, 0xda, 0x0a, 0xfe, 0x4e, - 0x5b, 0xc1, 0xf7, 0x7f, 0xad, 0x2b, 0x9f, 0xf7, 0x06, 0x5c, 0x9f, 0x8d, 0xfb, 0x84, 0xc9, 0x51, - 0x28, 0x54, 0xc6, 0x58, 0x27, 0x01, 0x13, 0x0a, 0x90, 0xa9, 0xea, 0xd0, 0x8c, 0x77, 0x06, 0x32, - 0x5c, 0x7a, 0xb0, 0x2f, 0x17, 0x9f, 0x3f, 0x6b, 0x8d, 0xf7, 0x20, 0x8f, 0x8e, 0xc9, 0xc1, 0xc7, - 0x5e, 0x31, 0x77, 0x51, 0xa3, 0x7f, 0xcd, 0xbe, 0xb9, 0xe7, 0xff, 0x03, 0x00, 0x00, 0xff, 0xff, - 0x1e, 0x24, 0x48, 0xec, 0xed, 0x03, 0x00, 0x00, +var fileDescriptor_d9dd5af2ff2bbb25 = []byte{ + // 478 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x93, 0x4f, 0x6e, 0x13, 0x31, + 0x18, 0xc5, 0x99, 0xb4, 0x10, 0x70, 0x29, 0x08, 0xab, 0x52, 0xa3, 0x51, 0x89, 0xaa, 0xa8, 0x95, + 0x00, 0x11, 0x8f, 0x34, 0x2c, 0x90, 0x40, 0xa5, 0x6a, 0x54, 0x2a, 0xb2, 0xe0, 0xdf, 0x54, 0xea, + 0x82, 0x4d, 0xe5, 0x78, 0xbe, 0xa4, 0x56, 0x13, 0x7b, 0x18, 0x3b, 0x46, 0xb9, 0x09, 0x17, 0x60, + 0xc3, 0x82, 0x73, 0xb0, 0xe4, 0x08, 0x28, 0x5c, 0x04, 0x8d, 0xed, 0x64, 0x52, 0x98, 0xb6, 0xd9, + 0xc5, 0xf9, 0xde, 0x7b, 0xfe, 0xde, 0x4f, 0x63, 0xb4, 0x6d, 0xe2, 0x88, 0x32, 0x26, 0xc7, 0x42, + 0x73, 0x31, 0x88, 0x06, 0x79, 0xc6, 0x22, 0x05, 0xb9, 0xe1, 0x0c, 0x48, 0x96, 0x4b, 0x2d, 0xf1, + 0x86, 0x00, 0x49, 0xfa, 0x8a, 0x98, 0x98, 0x94, 0xc2, 0xb0, 0x61, 0xe2, 0x28, 0x87, 0xbe, 0x72, + 0x0e, 0x3d, 0xc9, 0x40, 0x39, 0x7d, 0x18, 0x9a, 0x78, 0x96, 0xe0, 0x86, 0x23, 0xd0, 0xd4, 0xcf, + 0xb6, 0xfe, 0x9d, 0x19, 0xc8, 0x79, 0x7f, 0xe2, 0xa6, 0xad, 0x6f, 0x35, 0x74, 0xaf, 0x43, 0x87, + 0x54, 0x30, 0x48, 0xe0, 0xf3, 0x18, 0x94, 0xc6, 0x7b, 0x68, 0xb5, 0x27, 0xd3, 0x49, 0x23, 0xd8, + 0x0e, 0x1e, 0xad, 0xc5, 0x8f, 0x49, 0xd5, 0x2e, 0xe4, 0xa2, 0x87, 0x74, 0x64, 0x3a, 0x49, 0xac, + 0x0d, 0xbf, 0x46, 0x6b, 0xc5, 0xed, 0xa7, 0x67, 0x40, 0x53, 0xc8, 0x1b, 0x35, 0x9b, 0xb2, 0xb3, + 0x90, 0x32, 0xab, 0xea, 0xbd, 0x6f, 0x41, 0xd3, 0x37, 0x56, 0x9b, 0xa0, 0xd1, 0xfc, 0x37, 0xfe, + 0x88, 0xd6, 0xdd, 0xa2, 0xb3, 0xa0, 0x15, 0x1b, 0xf4, 0xf4, 0xf2, 0xa0, 0x93, 0x42, 0xce, 0x19, + 0xd5, 0x5c, 0x0a, 0x1f, 0x78, 0xd7, 0x45, 0xb8, 0x53, 0xf8, 0x02, 0xad, 0x16, 0x7b, 0xe2, 0x18, + 0xdd, 0x96, 0x5f, 0x04, 0xe4, 0xa7, 0x3c, 0xf5, 0x25, 0x37, 0x17, 0x52, 0x0b, 0xc2, 0xe4, 0x7d, + 0x31, 0xef, 0x1e, 0x26, 0x75, 0x2b, 0xec, 0xa6, 0xad, 0x3d, 0x54, 0x3f, 0x04, 0xc6, 0x47, 0x74, + 0x88, 0x37, 0xd0, 0x4d, 0x43, 0x87, 0x63, 0xb0, 0xde, 0x95, 0xc4, 0x1d, 0xf0, 0x16, 0xba, 0x93, + 0xe5, 0xc0, 0xb8, 0xe2, 0x52, 0xd8, 0xd2, 0xeb, 0x49, 0xf9, 0x47, 0xeb, 0x47, 0x0d, 0xdd, 0x9f, + 0x23, 0x53, 0x99, 0x14, 0x0a, 0xf0, 0xab, 0x0b, 0x9c, 0x9f, 0x5c, 0xc3, 0xd9, 0x99, 0x16, 0x41, + 0x1f, 0x55, 0x81, 0xde, 0xad, 0xe4, 0xe3, 0xcc, 0x97, 0x90, 0x4e, 0xaa, 0x49, 0xb7, 0xaf, 0x48, + 0xba, 0x16, 0xf5, 0xbe, 0x47, 0xfd, 0x1c, 0xd5, 0x7b, 0xae, 0x81, 0xaf, 0xf9, 0xb0, 0xba, 0xa6, + 0x67, 0x9b, 0xcc, 0xd4, 0xf1, 0x39, 0x7a, 0x70, 0x30, 0x1f, 0x1f, 0xbb, 0xeb, 0xf1, 0x09, 0xaa, + 0x7b, 0x1e, 0x78, 0x67, 0x99, 0xcf, 0x32, 0xdc, 0x5d, 0x0a, 0x6a, 0xe7, 0xfc, 0xe7, 0xb4, 0x19, + 0xfc, 0x9a, 0x36, 0x83, 0xdf, 0xd3, 0x66, 0xf0, 0xf5, 0x4f, 0xf3, 0xc6, 0xa7, 0xfd, 0x01, 0xd7, + 0x67, 0xe3, 0x1e, 0x61, 0x72, 0x14, 0x09, 0x95, 0x31, 0xd6, 0x4e, 0xc1, 0x44, 0x02, 0x64, 0x5f, + 0xb5, 0x69, 0xc6, 0xdb, 0x03, 0x19, 0xfd, 0xff, 0x88, 0x5f, 0x96, 0xe7, 0xef, 0xb5, 0xcd, 0x77, + 0x20, 0x8f, 0x8e, 0xc9, 0xc1, 0x87, 0x6e, 0x71, 0x79, 0xd9, 0xa5, 0x77, 0xcb, 0x3e, 0xbc, 0x67, + 0x7f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x34, 0x56, 0xa2, 0x45, 0x06, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc2.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc2.SupportPackageIsVersion4 // AccountingServiceClient is the client API for AccountingService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type AccountingServiceClient interface { // Returns the amount of funds for the requested NeoFS account. - Balance(ctx context.Context, in *BalanceRequest, opts ...grpc.CallOption) (*BalanceResponse, error) + Balance(ctx context.Context, in *BalanceRequest, opts ...grpc2.CallOption) (*BalanceResponse, error) } type accountingServiceClient struct { - cc *grpc.ClientConn + cc *grpc2.ClientConn } -func NewAccountingServiceClient(cc *grpc.ClientConn) AccountingServiceClient { +func NewAccountingServiceClient(cc *grpc2.ClientConn) AccountingServiceClient { return &accountingServiceClient{cc} } -func (c *accountingServiceClient) Balance(ctx context.Context, in *BalanceRequest, opts ...grpc.CallOption) (*BalanceResponse, error) { +func (c *accountingServiceClient) Balance(ctx context.Context, in *BalanceRequest, opts ...grpc2.CallOption) (*BalanceResponse, error) { out := new(BalanceResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.accounting.AccountingService/Balance", in, out, opts...) if err != nil { @@ -424,11 +424,11 @@ func (*UnimplementedAccountingServiceServer) Balance(ctx context.Context, req *B return nil, status.Errorf(codes.Unimplemented, "method Balance not implemented") } -func RegisterAccountingServiceServer(s *grpc.Server, srv AccountingServiceServer) { +func RegisterAccountingServiceServer(s *grpc2.Server, srv AccountingServiceServer) { s.RegisterService(&_AccountingService_serviceDesc, srv) } -func _AccountingService_Balance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _AccountingService_Balance_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc2.UnaryServerInterceptor) (interface{}, error) { in := new(BalanceRequest) if err := dec(in); err != nil { return nil, err @@ -436,7 +436,7 @@ func _AccountingService_Balance_Handler(srv interface{}, ctx context.Context, de if interceptor == nil { return srv.(AccountingServiceServer).Balance(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc2.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.accounting.AccountingService/Balance", } @@ -446,17 +446,17 @@ func _AccountingService_Balance_Handler(srv interface{}, ctx context.Context, de return interceptor(ctx, in, info, handler) } -var _AccountingService_serviceDesc = grpc.ServiceDesc{ +var _AccountingService_serviceDesc = grpc2.ServiceDesc{ ServiceName: "neo.fs.v2.accounting.AccountingService", HandlerType: (*AccountingServiceServer)(nil), - Methods: []grpc.MethodDesc{ + Methods: []grpc2.MethodDesc{ { MethodName: "Balance", Handler: _AccountingService_Balance_Handler, }, }, - Streams: []grpc.StreamDesc{}, - Metadata: "v2/accounting/service.proto", + Streams: []grpc2.StreamDesc{}, + Metadata: "v2/accounting/grpc/service.proto", } func (m *BalanceRequest) Marshal() (dAtA []byte, err error) { @@ -910,7 +910,7 @@ func (m *BalanceRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -946,7 +946,7 @@ func (m *BalanceRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1036,7 +1036,7 @@ func (m *BalanceRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc1.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1254,7 +1254,7 @@ func (m *BalanceResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1290,7 +1290,7 @@ func (m *BalanceResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err 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 6374787..3091259 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 0425329..bba96ad 100644 --- a/v2/acl/types.pb.go +++ b/v2/acl/grpc/types.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/acl/types.proto +// source: v2/acl/grpc/types.proto package acl import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" + grpc "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" io "io" math "math" math_bits "math/bits" @@ -57,7 +57,7 @@ func (x Target) String() string { } func (Target) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{0} + return fileDescriptor_8233b6696fb3e24f, []int{0} } // Operation is an enumeration of operation types. @@ -109,7 +109,7 @@ func (x EACLRecord_Operation) String() string { } func (EACLRecord_Operation) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{0, 0} + return fileDescriptor_8233b6696fb3e24f, []int{0, 0} } // Action is an enumeration of EACL actions. @@ -141,7 +141,7 @@ func (x EACLRecord_Action) String() string { } func (EACLRecord_Action) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{0, 1} + return fileDescriptor_8233b6696fb3e24f, []int{0, 1} } // Header is an enumeration of filtering header types. @@ -173,7 +173,7 @@ func (x EACLRecord_FilterInfo_Header) String() string { } func (EACLRecord_FilterInfo_Header) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{0, 0, 0} + return fileDescriptor_8233b6696fb3e24f, []int{0, 0, 0} } // MatchType is an enumeration of match types. @@ -205,7 +205,7 @@ func (x EACLRecord_FilterInfo_MatchType) String() string { } func (EACLRecord_FilterInfo_MatchType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{0, 0, 1} + return fileDescriptor_8233b6696fb3e24f, []int{0, 0, 1} } // EACLRecord groups information about extended ACL rule. @@ -227,7 +227,7 @@ func (m *EACLRecord) Reset() { *m = EACLRecord{} } func (m *EACLRecord) String() string { return proto.CompactTextString(m) } func (*EACLRecord) ProtoMessage() {} func (*EACLRecord) Descriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{0} + return fileDescriptor_8233b6696fb3e24f, []int{0} } func (m *EACLRecord) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -303,7 +303,7 @@ func (m *EACLRecord_FilterInfo) Reset() { *m = EACLRecord_FilterInfo{} } func (m *EACLRecord_FilterInfo) String() string { return proto.CompactTextString(m) } func (*EACLRecord_FilterInfo) ProtoMessage() {} func (*EACLRecord_FilterInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{0, 0} + return fileDescriptor_8233b6696fb3e24f, []int{0, 0} } func (m *EACLRecord_FilterInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -375,7 +375,7 @@ func (m *EACLRecord_TargetInfo) Reset() { *m = EACLRecord_TargetInfo{} } func (m *EACLRecord_TargetInfo) String() string { return proto.CompactTextString(m) } func (*EACLRecord_TargetInfo) ProtoMessage() {} func (*EACLRecord_TargetInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{0, 1} + return fileDescriptor_8233b6696fb3e24f, []int{0, 1} } func (m *EACLRecord_TargetInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -422,7 +422,7 @@ func (m *EACLRecord_TargetInfo) GetKeyList() [][]byte { type EACLTable struct { // Carries identifier of the container that should use given // access control rules. - ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=ContainerID,proto3" json:"container_id,omitempty"` + ContainerId *grpc.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=ContainerID,proto3" json:"container_id,omitempty"` // Records carries list of extended ACL rule records. Records []*EACLRecord `protobuf:"bytes,2,rep,name=records,json=Records,proto3" json:"records,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -434,7 +434,7 @@ func (m *EACLTable) Reset() { *m = EACLTable{} } func (m *EACLTable) String() string { return proto.CompactTextString(m) } func (*EACLTable) ProtoMessage() {} func (*EACLTable) Descriptor() ([]byte, []int) { - return fileDescriptor_d237ab7979f0d6cf, []int{1} + return fileDescriptor_8233b6696fb3e24f, []int{1} } func (m *EACLTable) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -463,7 +463,7 @@ func (m *EACLTable) XXX_DiscardUnknown() { var xxx_messageInfo_EACLTable proto.InternalMessageInfo -func (m *EACLTable) GetContainerId() *refs.ContainerID { +func (m *EACLTable) GetContainerId() *grpc.ContainerID { if m != nil { return m.ContainerId } @@ -489,54 +489,55 @@ func init() { proto.RegisterType((*EACLTable)(nil), "neo.fs.v2.acl.EACLTable") } -func init() { proto.RegisterFile("v2/acl/types.proto", fileDescriptor_d237ab7979f0d6cf) } +func init() { proto.RegisterFile("v2/acl/grpc/types.proto", fileDescriptor_8233b6696fb3e24f) } -var fileDescriptor_d237ab7979f0d6cf = []byte{ - // 703 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xd1, 0x6e, 0xda, 0x3c, - 0x18, 0x6d, 0x42, 0x1a, 0xe0, 0x83, 0xff, 0x97, 0xe5, 0xad, 0x88, 0x32, 0x09, 0x21, 0xb6, 0x0b, - 0xb4, 0xae, 0x41, 0xa2, 0x9a, 0xb4, 0x69, 0x52, 0xa5, 0x14, 0x5c, 0x60, 0x83, 0x00, 0x8e, 0xd9, - 0xd4, 0xdd, 0xa0, 0x34, 0x98, 0x16, 0x2d, 0x24, 0x28, 0x49, 0x91, 0xd8, 0xd5, 0x1e, 0x63, 0xcf, - 0xb0, 0x27, 0xd9, 0xe5, 0x1e, 0x61, 0xea, 0xa4, 0x3d, 0xc3, 0x2e, 0x27, 0x27, 0xd0, 0x32, 0xb4, - 0x6a, 0xbd, 0xf2, 0x17, 0xfb, 0x9c, 0xcf, 0xc7, 0xc7, 0x27, 0x06, 0xbc, 0xa8, 0x55, 0x2d, 0xdb, - 0xa9, 0x86, 0xcb, 0x39, 0x0f, 0xb4, 0xb9, 0xef, 0x85, 0x1e, 0xfe, 0xcf, 0xe5, 0x9e, 0x36, 0x09, - 0xb4, 0x45, 0x4d, 0xb3, 0x6c, 0xa7, 0xf0, 0x60, 0x51, 0xab, 0xfa, 0x7c, 0x12, 0x6c, 0x62, 0xca, - 0xbf, 0x54, 0x00, 0xa2, 0xd7, 0x3b, 0x94, 0xdb, 0x9e, 0x3f, 0xc6, 0x3a, 0xa4, 0xbd, 0x39, 0xf7, - 0xad, 0x70, 0xea, 0xb9, 0x79, 0xa9, 0x24, 0x55, 0xfe, 0xaf, 0x3d, 0xd6, 0xfe, 0x68, 0xa3, 0xdd, - 0xa2, 0xb5, 0xde, 0x1a, 0x4a, 0xd3, 0x37, 0x25, 0x7e, 0x01, 0xaa, 0x65, 0x47, 0x7c, 0x39, 0xe2, - 0x97, 0xee, 0xe6, 0xeb, 0x11, 0x8e, 0xaa, 0xf1, 0x88, 0x8f, 0x21, 0x39, 0x99, 0x3a, 0x21, 0xf7, - 0x83, 0x7c, 0xa2, 0x94, 0xa8, 0x64, 0x6a, 0x4f, 0xee, 0xa6, 0x9e, 0x46, 0xc0, 0xb6, 0x3b, 0xf1, - 0x68, 0x32, 0xae, 0x03, 0xc1, 0x0f, 0x2d, 0xff, 0x82, 0x87, 0x41, 0x5e, 0xf9, 0x17, 0x9f, 0x45, - 0xc0, 0x98, 0x1f, 0xd7, 0x41, 0xe1, 0xa7, 0x0c, 0x70, 0xdb, 0x17, 0x37, 0x41, 0xbd, 0xe4, 0xd6, - 0x98, 0xfb, 0x2b, 0x23, 0x0e, 0xee, 0xa3, 0x46, 0x6b, 0x45, 0x14, 0x0a, 0xf1, 0xc8, 0x96, 0x73, - 0x8e, 0xbb, 0x00, 0x33, 0x2b, 0xb4, 0x2f, 0x47, 0xc2, 0xf8, 0x95, 0x2b, 0xda, 0xbd, 0x9a, 0x75, - 0x05, 0x4d, 0xf4, 0xa0, 0xe9, 0x9b, 0x12, 0xef, 0x43, 0x26, 0xd6, 0x35, 0x72, 0xad, 0x19, 0xcf, - 0x27, 0x4a, 0x52, 0x25, 0x4d, 0x15, 0xc3, 0x9a, 0x89, 0x25, 0x58, 0x2d, 0x2d, 0x2c, 0x27, 0xaf, - 0x44, 0x2b, 0xbb, 0x6f, 0x2d, 0xe7, 0x8a, 0x97, 0x5f, 0x82, 0x1a, 0x4b, 0xc2, 0x39, 0xc0, 0x2d, - 0xa2, 0x37, 0x08, 0x1d, 0x0d, 0x0d, 0xb3, 0x4f, 0xea, 0xed, 0xd3, 0x36, 0x69, 0xa0, 0x1d, 0x9c, - 0x81, 0x24, 0x25, 0x83, 0x21, 0x31, 0x19, 0x92, 0x30, 0x80, 0xda, 0x3b, 0x79, 0x4d, 0xea, 0x0c, - 0xc9, 0xe5, 0x1e, 0x6c, 0xec, 0x5e, 0x80, 0x5c, 0x57, 0x67, 0xf5, 0xd6, 0x88, 0x9d, 0xf5, 0xc9, - 0x56, 0x07, 0x04, 0x59, 0x93, 0xd1, 0xb6, 0xd1, 0x1c, 0x91, 0xc1, 0x50, 0xef, 0x20, 0x09, 0x3f, - 0x04, 0xb4, 0x9a, 0x31, 0x7a, 0x6c, 0x35, 0x2b, 0x17, 0x06, 0x00, 0xb7, 0xfe, 0xe3, 0x03, 0x50, - 0xe3, 0x6b, 0x5b, 0xf9, 0xbc, 0xb7, 0x65, 0x4d, 0x0c, 0xa5, 0x0a, 0xf5, 0x1c, 0x8e, 0x73, 0x90, - 0xfa, 0xc0, 0x97, 0x23, 0x67, 0x1a, 0x84, 0x79, 0xb9, 0x94, 0xa8, 0x64, 0xa9, 0xf2, 0x86, 0x2f, - 0x83, 0xf2, 0x47, 0xd8, 0x88, 0xe0, 0x3e, 0xec, 0xf5, 0xfa, 0x84, 0xea, 0xac, 0xdd, 0x33, 0xb6, - 0x24, 0x26, 0x21, 0xd1, 0x24, 0xe2, 0x80, 0x29, 0x50, 0x84, 0x0b, 0x48, 0x16, 0x53, 0xfd, 0x21, - 0x43, 0x09, 0x71, 0xe6, 0x06, 0xe9, 0x10, 0x46, 0x90, 0x22, 0x6a, 0x93, 0xe8, 0xb4, 0xde, 0x42, - 0xbb, 0x38, 0x0b, 0xa9, 0x26, 0x61, 0x54, 0x37, 0x9a, 0x04, 0xa9, 0xe2, 0x90, 0xeb, 0xaf, 0x96, - 0x6e, 0xb6, 0x50, 0xb2, 0xfc, 0x1c, 0xd6, 0x09, 0xce, 0x01, 0xd6, 0xeb, 0x7f, 0xd9, 0x35, 0x0d, - 0xbb, 0x7a, 0xa7, 0xd3, 0x7b, 0x17, 0xef, 0xdb, 0x20, 0xc6, 0x19, 0x92, 0xcb, 0x9f, 0x24, 0x48, - 0x8b, 0x6b, 0x67, 0xd6, 0xb9, 0xc3, 0xf1, 0x31, 0x64, 0x6d, 0xcf, 0x0d, 0xad, 0xa9, 0xcb, 0xfd, - 0xd1, 0x74, 0x1c, 0x79, 0x91, 0xa9, 0x3d, 0xda, 0xf0, 0x42, 0xfc, 0xbb, 0x5a, 0x7d, 0x8d, 0x69, - 0x37, 0x68, 0x66, 0xe3, 0x03, 0x1f, 0x41, 0xd2, 0x8f, 0xf2, 0x13, 0x44, 0xbe, 0x64, 0x6a, 0xfb, - 0x77, 0x26, 0x8c, 0x26, 0xe3, 0x31, 0x78, 0x7a, 0x02, 0x6a, 0xec, 0xae, 0x50, 0xce, 0x74, 0xda, - 0x24, 0x6c, 0x4b, 0x79, 0x0a, 0x94, 0xa1, 0x49, 0x68, 0x9c, 0x08, 0xf3, 0xcc, 0x64, 0xa4, 0x8b, - 0xe4, 0x28, 0x1d, 0xac, 0x45, 0xa8, 0x89, 0x12, 0x27, 0x83, 0xaf, 0xd7, 0x45, 0xe9, 0xdb, 0x75, - 0x51, 0xfa, 0x7e, 0x5d, 0x94, 0x3e, 0xff, 0x28, 0xee, 0xbc, 0x7f, 0x76, 0x31, 0x0d, 0x2f, 0xaf, - 0xce, 0x35, 0xdb, 0x9b, 0x55, 0xdd, 0x60, 0x6e, 0xdb, 0x87, 0x63, 0xbe, 0xa8, 0xba, 0xdc, 0x9b, - 0x04, 0x87, 0xd6, 0x7c, 0x7a, 0x78, 0xe1, 0x55, 0xe3, 0xd7, 0xea, 0x95, 0x65, 0x3b, 0x5f, 0x64, - 0x64, 0x70, 0xef, 0xd4, 0xd4, 0xf4, 0x7e, 0x5b, 0x48, 0xd5, 0x6d, 0xe7, 0x5c, 0x8d, 0xde, 0xa6, - 0xa3, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0xaa, 0x0d, 0x90, 0x3a, 0xd5, 0x04, 0x00, 0x00, +var fileDescriptor_8233b6696fb3e24f = []byte{ + // 710 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x54, 0xd1, 0x6e, 0xda, 0x3a, + 0x18, 0x6e, 0x42, 0x1a, 0xe0, 0x87, 0x73, 0x64, 0x59, 0xa7, 0x1c, 0xca, 0x91, 0x10, 0xe2, 0xec, + 0x02, 0xad, 0x6a, 0xd0, 0xa8, 0x26, 0x6d, 0x9a, 0x54, 0x29, 0x05, 0x17, 0xd8, 0x20, 0x50, 0xc7, + 0x74, 0xea, 0x6e, 0x50, 0x1a, 0x0c, 0x45, 0x0b, 0x09, 0x4a, 0x52, 0x24, 0x76, 0xb5, 0xc7, 0xd8, + 0x33, 0xec, 0x49, 0x76, 0xb9, 0x47, 0x98, 0x3a, 0x69, 0xcf, 0xb0, 0xcb, 0xc9, 0x09, 0xb4, 0x8c, + 0xad, 0x5a, 0xaf, 0xfc, 0xc7, 0xfe, 0xbe, 0xdf, 0x9f, 0x3f, 0x7f, 0x31, 0xfc, 0xbb, 0xa8, 0x55, + 0x2d, 0xdb, 0xa9, 0x4e, 0xfc, 0xb9, 0x5d, 0x0d, 0x97, 0x73, 0x1e, 0x68, 0x73, 0xdf, 0x0b, 0x3d, + 0xfc, 0x97, 0xcb, 0x3d, 0x6d, 0x1c, 0x68, 0x8b, 0x9a, 0x66, 0xd9, 0x4e, 0x21, 0xbf, 0xa8, 0x55, + 0x7d, 0x3e, 0x0e, 0x7e, 0x01, 0x96, 0xbf, 0xab, 0x00, 0x44, 0xaf, 0x77, 0x28, 0xb7, 0x3d, 0x7f, + 0x84, 0x75, 0x48, 0x7b, 0x73, 0xee, 0x5b, 0xe1, 0xd4, 0x73, 0xf3, 0x52, 0x49, 0xaa, 0xfc, 0x5d, + 0xfb, 0x5f, 0xfb, 0xa9, 0x97, 0x76, 0x87, 0xd6, 0x7a, 0x6b, 0x28, 0x4d, 0xdf, 0x96, 0xf8, 0x19, + 0xa8, 0x96, 0x1d, 0xf1, 0xe5, 0x88, 0x5f, 0xba, 0x9f, 0xaf, 0x47, 0x38, 0xaa, 0xc6, 0x23, 0x3e, + 0x86, 0xe4, 0x78, 0xea, 0x84, 0xdc, 0x0f, 0xf2, 0x89, 0x52, 0xa2, 0x92, 0xa9, 0x3d, 0xba, 0x9f, + 0x7a, 0x1a, 0x01, 0xdb, 0xee, 0xd8, 0xa3, 0xc9, 0xb8, 0x0e, 0x04, 0x3f, 0xb4, 0xfc, 0x09, 0x0f, + 0x83, 0xbc, 0xf2, 0x27, 0x3e, 0x8b, 0x80, 0x31, 0x3f, 0xae, 0x83, 0xc2, 0x37, 0x19, 0xe0, 0xae, + 0x2f, 0x6e, 0x82, 0x7a, 0xc5, 0xad, 0x11, 0xf7, 0x57, 0x46, 0x1c, 0x3c, 0x44, 0x8d, 0xd6, 0x8a, + 0x28, 0x14, 0xe2, 0x91, 0x2d, 0xe7, 0x1c, 0x77, 0x01, 0x66, 0x56, 0x68, 0x5f, 0x0d, 0x85, 0xf1, + 0x2b, 0x57, 0xb4, 0x07, 0x35, 0xeb, 0x0a, 0x9a, 0xe8, 0x41, 0xd3, 0xb7, 0x25, 0xde, 0x87, 0x4c, + 0xac, 0x6b, 0xe8, 0x5a, 0x33, 0x9e, 0x4f, 0x94, 0xa4, 0x4a, 0x9a, 0x2a, 0x86, 0x35, 0x13, 0x4b, + 0xb0, 0x5a, 0x5a, 0x58, 0x4e, 0x5e, 0x89, 0x56, 0x76, 0xcf, 0x2d, 0xe7, 0x9a, 0x97, 0x9f, 0x83, + 0x1a, 0x4b, 0xc2, 0x39, 0xc0, 0x2d, 0xa2, 0x37, 0x08, 0x1d, 0x0e, 0x0c, 0xb3, 0x4f, 0xea, 0xed, + 0xd3, 0x36, 0x69, 0xa0, 0x1d, 0x9c, 0x81, 0x24, 0x25, 0x67, 0x03, 0x62, 0x32, 0x24, 0x61, 0x00, + 0xb5, 0x77, 0xf2, 0x92, 0xd4, 0x19, 0x92, 0xcb, 0x3d, 0xd8, 0xd8, 0xbd, 0x00, 0xb9, 0xae, 0xce, + 0xea, 0xad, 0x21, 0xbb, 0xe8, 0x93, 0xad, 0x0e, 0x08, 0xb2, 0x26, 0xa3, 0x6d, 0xa3, 0x39, 0x24, + 0x67, 0x03, 0xbd, 0x83, 0x24, 0xfc, 0x0f, 0xa0, 0xd5, 0x8c, 0xd1, 0x63, 0xab, 0x59, 0xb9, 0x70, + 0x06, 0x70, 0xe7, 0x3f, 0x3e, 0x00, 0x35, 0xbe, 0xb6, 0x95, 0xcf, 0x7b, 0x5b, 0xd6, 0xc4, 0x50, + 0xaa, 0x50, 0xcf, 0xe1, 0x38, 0x07, 0xa9, 0xb7, 0x7c, 0x39, 0x74, 0xa6, 0x41, 0x98, 0x97, 0x4b, + 0x89, 0x4a, 0x96, 0x2a, 0xaf, 0xf8, 0x32, 0x28, 0xbf, 0x83, 0x8d, 0x08, 0xee, 0xc3, 0x5e, 0xaf, + 0x4f, 0xa8, 0xce, 0xda, 0x3d, 0x63, 0x4b, 0x62, 0x12, 0x12, 0x4d, 0x22, 0x0e, 0x98, 0x02, 0x45, + 0xb8, 0x80, 0x64, 0x31, 0xd5, 0x1f, 0x30, 0x94, 0x10, 0x67, 0x6e, 0x90, 0x0e, 0x61, 0x04, 0x29, + 0xa2, 0x36, 0x89, 0x4e, 0xeb, 0x2d, 0xb4, 0x8b, 0xb3, 0x90, 0x6a, 0x12, 0x46, 0x75, 0xa3, 0x49, + 0x90, 0x2a, 0x0e, 0xb9, 0xfe, 0x6a, 0xe9, 0x66, 0x0b, 0x25, 0xcb, 0x4f, 0x61, 0x9d, 0xe0, 0x1c, + 0x60, 0xbd, 0xfe, 0x9b, 0x5d, 0xd3, 0xb0, 0xab, 0x77, 0x3a, 0xbd, 0xd7, 0xf1, 0xbe, 0x0d, 0x62, + 0x5c, 0x20, 0xb9, 0xfc, 0x5e, 0x82, 0xb4, 0xb8, 0x76, 0x66, 0x5d, 0x3a, 0x1c, 0x1f, 0x43, 0xd6, + 0xf6, 0xdc, 0xd0, 0x9a, 0xba, 0xdc, 0x1f, 0x4e, 0x47, 0x91, 0x17, 0x99, 0xda, 0x7f, 0x1b, 0x5e, + 0x88, 0x1f, 0x58, 0xab, 0xaf, 0x31, 0xed, 0x06, 0xcd, 0x6c, 0x7c, 0xe0, 0x23, 0x48, 0xfa, 0x51, + 0x7e, 0x82, 0xc8, 0x97, 0x4c, 0x6d, 0xff, 0xde, 0x84, 0xd1, 0x64, 0x3c, 0x06, 0x8f, 0x4f, 0x40, + 0x8d, 0xdd, 0x15, 0xca, 0x99, 0x4e, 0x9b, 0x84, 0x6d, 0x29, 0x4f, 0x81, 0x32, 0x30, 0x09, 0x8d, + 0x13, 0x61, 0x5e, 0x98, 0x8c, 0x74, 0x91, 0x1c, 0xa5, 0x83, 0xb5, 0x08, 0x35, 0x51, 0xe2, 0xe4, + 0xfc, 0xd3, 0x4d, 0x51, 0xfa, 0x7c, 0x53, 0x94, 0xbe, 0xdc, 0x14, 0xa5, 0x0f, 0x5f, 0x8b, 0x3b, + 0x6f, 0x9e, 0x4c, 0xa6, 0xe1, 0xd5, 0xf5, 0xa5, 0x66, 0x7b, 0xb3, 0xaa, 0x1b, 0xcc, 0x6d, 0xfb, + 0x70, 0xc4, 0x17, 0x55, 0x97, 0x7b, 0xe3, 0xe0, 0xd0, 0x9a, 0x4f, 0x0f, 0x27, 0x5e, 0x75, 0xe3, + 0xdd, 0x7a, 0x61, 0xd9, 0xce, 0x47, 0x19, 0x19, 0xdc, 0x3b, 0x35, 0x35, 0xbd, 0xdf, 0x16, 0x7a, + 0x75, 0xdb, 0xb9, 0x54, 0xa3, 0x07, 0xea, 0xe8, 0x47, 0x00, 0x00, 0x00, 0xff, 0xff, 0xf6, 0x1c, + 0x01, 0xad, 0xe4, 0x04, 0x00, 0x00, } func (m *EACLRecord) Marshal() (dAtA []byte, err error) { @@ -1345,7 +1346,7 @@ func (m *EACLTable) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ContainerId == nil { - m.ContainerId = &refs.ContainerID{} + m.ContainerId = &grpc.ContainerID{} } if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/v2/container/marshal.go b/v2/container/grpc/marshal.go similarity index 100% rename from v2/container/marshal.go rename to v2/container/grpc/marshal.go diff --git a/v2/container/marshal_test.go b/v2/container/grpc/marshal_test.go similarity index 92% rename from v2/container/marshal_test.go rename to v2/container/grpc/marshal_test.go index a7e2888..ef8bfdd 100644 --- a/v2/container/marshal_test.go +++ b/v2/container/grpc/marshal_test.go @@ -3,8 +3,8 @@ package container import ( "testing" - "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" "github.com/stretchr/testify/require" ) diff --git a/v2/container/service.go b/v2/container/grpc/service.go similarity index 97% rename from v2/container/service.go rename to v2/container/grpc/service.go index bde2b48..3cbbe58 100644 --- a/v2/container/service.go +++ b/v2/container/grpc/service.go @@ -1,9 +1,9 @@ package container import ( - "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" + acl "github.com/nspcc-dev/neofs-api-go/v2/acl/grpc" + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + service "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" ) // SetContainer sets container of the request. diff --git a/v2/container/service.pb.go b/v2/container/grpc/service.pb.go similarity index 88% rename from v2/container/service.pb.go rename to v2/container/grpc/service.pb.go index 50a9347..c5ae473 100644 --- a/v2/container/service.pb.go +++ b/v2/container/grpc/service.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/container/service.proto +// source: v2/container/grpc/service.proto package container @@ -7,10 +7,10 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - acl "github.com/nspcc-dev/neofs-api-go/v2/acl" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" - service "github.com/nspcc-dev/neofs-api-go/v2/service" - grpc "google.golang.org/grpc" + grpc2 "github.com/nspcc-dev/neofs-api-go/v2/acl/grpc" + grpc1 "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + grpc "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" + grpc3 "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" io "io" @@ -35,21 +35,21 @@ type PutRequest struct { Body *PutRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PutRequest) Reset() { *m = PutRequest{} } func (m *PutRequest) String() string { return proto.CompactTextString(m) } func (*PutRequest) ProtoMessage() {} func (*PutRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{0} + return fileDescriptor_364186d99410ec35, []int{0} } func (m *PutRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -85,14 +85,14 @@ func (m *PutRequest) GetBody() *PutRequest_Body { return nil } -func (m *PutRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *PutRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *PutRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *PutRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -117,7 +117,7 @@ func (m *PutRequest_Body) Reset() { *m = PutRequest_Body{} } func (m *PutRequest_Body) String() string { return proto.CompactTextString(m) } func (*PutRequest_Body) ProtoMessage() {} func (*PutRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{0, 0} + return fileDescriptor_364186d99410ec35, []int{0, 0} } func (m *PutRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -173,21 +173,21 @@ type PutResponse struct { Body *PutResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PutResponse) Reset() { *m = PutResponse{} } func (m *PutResponse) String() string { return proto.CompactTextString(m) } func (*PutResponse) ProtoMessage() {} func (*PutResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{1} + return fileDescriptor_364186d99410ec35, []int{1} } func (m *PutResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -223,14 +223,14 @@ func (m *PutResponse) GetBody() *PutResponse_Body { return nil } -func (m *PutResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *PutResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *PutResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *PutResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -240,17 +240,17 @@ func (m *PutResponse) GetVerifyHeader() *service.ResponseVerificationHeader { // Response body type PutResponse_Body struct { // container_id carries identifier of the new container. - ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ContainerId *grpc1.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PutResponse_Body) Reset() { *m = PutResponse_Body{} } func (m *PutResponse_Body) String() string { return proto.CompactTextString(m) } func (*PutResponse_Body) ProtoMessage() {} func (*PutResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{1, 0} + return fileDescriptor_364186d99410ec35, []int{1, 0} } func (m *PutResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -279,7 +279,7 @@ func (m *PutResponse_Body) XXX_DiscardUnknown() { var xxx_messageInfo_PutResponse_Body proto.InternalMessageInfo -func (m *PutResponse_Body) GetContainerId() *refs.ContainerID { +func (m *PutResponse_Body) GetContainerId() *grpc1.ContainerID { if m != nil { return m.ContainerId } @@ -292,21 +292,21 @@ type DeleteRequest struct { Body *DeleteRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (m *DeleteRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{2} + return fileDescriptor_364186d99410ec35, []int{2} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -342,14 +342,14 @@ func (m *DeleteRequest) GetBody() *DeleteRequest_Body { return nil } -func (m *DeleteRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *DeleteRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *DeleteRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *DeleteRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -360,7 +360,7 @@ func (m *DeleteRequest) GetVerifyHeader() *service.RequestVerificationHeader { type DeleteRequest_Body struct { // container_id carries identifier of the container to delete // from NeoFS. - ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + ContainerId *grpc1.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` // Signature of container id according to RFC-6979. Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -372,7 +372,7 @@ func (m *DeleteRequest_Body) Reset() { *m = DeleteRequest_Body{} } func (m *DeleteRequest_Body) String() string { return proto.CompactTextString(m) } func (*DeleteRequest_Body) ProtoMessage() {} func (*DeleteRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{2, 0} + return fileDescriptor_364186d99410ec35, []int{2, 0} } func (m *DeleteRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -401,7 +401,7 @@ func (m *DeleteRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteRequest_Body proto.InternalMessageInfo -func (m *DeleteRequest_Body) GetContainerId() *refs.ContainerID { +func (m *DeleteRequest_Body) GetContainerId() *grpc1.ContainerID { if m != nil { return m.ContainerId } @@ -422,21 +422,21 @@ type DeleteResponse struct { Body *DeleteResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{3} + return fileDescriptor_364186d99410ec35, []int{3} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -472,14 +472,14 @@ func (m *DeleteResponse) GetBody() *DeleteResponse_Body { return nil } -func (m *DeleteResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *DeleteResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *DeleteResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *DeleteResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -497,7 +497,7 @@ func (m *DeleteResponse_Body) Reset() { *m = DeleteResponse_Body{} } func (m *DeleteResponse_Body) String() string { return proto.CompactTextString(m) } func (*DeleteResponse_Body) ProtoMessage() {} func (*DeleteResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{3, 0} + return fileDescriptor_364186d99410ec35, []int{3, 0} } func (m *DeleteResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -532,21 +532,21 @@ type GetRequest struct { Body *GetRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetRequest) Reset() { *m = GetRequest{} } func (m *GetRequest) String() string { return proto.CompactTextString(m) } func (*GetRequest) ProtoMessage() {} func (*GetRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{4} + return fileDescriptor_364186d99410ec35, []int{4} } func (m *GetRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -582,14 +582,14 @@ func (m *GetRequest) GetBody() *GetRequest_Body { return nil } -func (m *GetRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *GetRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *GetRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -599,17 +599,17 @@ func (m *GetRequest) GetVerifyHeader() *service.RequestVerificationHeader { // Request body type GetRequest_Body struct { // container_id carries identifier of the container to get. - ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ContainerId *grpc1.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetRequest_Body) Reset() { *m = GetRequest_Body{} } func (m *GetRequest_Body) String() string { return proto.CompactTextString(m) } func (*GetRequest_Body) ProtoMessage() {} func (*GetRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{4, 0} + return fileDescriptor_364186d99410ec35, []int{4, 0} } func (m *GetRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -638,7 +638,7 @@ func (m *GetRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_GetRequest_Body proto.InternalMessageInfo -func (m *GetRequest_Body) GetContainerId() *refs.ContainerID { +func (m *GetRequest_Body) GetContainerId() *grpc1.ContainerID { if m != nil { return m.ContainerId } @@ -651,21 +651,21 @@ type GetResponse struct { Body *GetResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetResponse) Reset() { *m = GetResponse{} } func (m *GetResponse) String() string { return proto.CompactTextString(m) } func (*GetResponse) ProtoMessage() {} func (*GetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{5} + return fileDescriptor_364186d99410ec35, []int{5} } func (m *GetResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -701,14 +701,14 @@ func (m *GetResponse) GetBody() *GetResponse_Body { return nil } -func (m *GetResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *GetResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *GetResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -728,7 +728,7 @@ func (m *GetResponse_Body) Reset() { *m = GetResponse_Body{} } func (m *GetResponse_Body) String() string { return proto.CompactTextString(m) } func (*GetResponse_Body) ProtoMessage() {} func (*GetResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{5, 0} + return fileDescriptor_364186d99410ec35, []int{5, 0} } func (m *GetResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -770,21 +770,21 @@ type ListRequest struct { Body *ListRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListRequest) Reset() { *m = ListRequest{} } func (m *ListRequest) String() string { return proto.CompactTextString(m) } func (*ListRequest) ProtoMessage() {} func (*ListRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{6} + return fileDescriptor_364186d99410ec35, []int{6} } func (m *ListRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -820,14 +820,14 @@ func (m *ListRequest) GetBody() *ListRequest_Body { return nil } -func (m *ListRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *ListRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *ListRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *ListRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -837,17 +837,17 @@ func (m *ListRequest) GetVerifyHeader() *service.RequestVerificationHeader { // Request body type ListRequest_Body struct { // owner_id carries identifier of the container owner. - OwnerId *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OwnerId *grpc1.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListRequest_Body) Reset() { *m = ListRequest_Body{} } func (m *ListRequest_Body) String() string { return proto.CompactTextString(m) } func (*ListRequest_Body) ProtoMessage() {} func (*ListRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{6, 0} + return fileDescriptor_364186d99410ec35, []int{6, 0} } func (m *ListRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -876,7 +876,7 @@ func (m *ListRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_ListRequest_Body proto.InternalMessageInfo -func (m *ListRequest_Body) GetOwnerId() *refs.OwnerID { +func (m *ListRequest_Body) GetOwnerId() *grpc1.OwnerID { if m != nil { return m.OwnerId } @@ -889,21 +889,21 @@ type ListResponse struct { Body *ListResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListResponse) Reset() { *m = ListResponse{} } func (m *ListResponse) String() string { return proto.CompactTextString(m) } func (*ListResponse) ProtoMessage() {} func (*ListResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{7} + return fileDescriptor_364186d99410ec35, []int{7} } func (m *ListResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -939,14 +939,14 @@ func (m *ListResponse) GetBody() *ListResponse_Body { return nil } -func (m *ListResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *ListResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *ListResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *ListResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -956,17 +956,17 @@ func (m *ListResponse) GetVerifyHeader() *service.ResponseVerificationHeader { // Response body type ListResponse_Body struct { // ContainerIDs carries list of identifiers of the containers that belong to the owner. - ContainerIds []*refs.ContainerID `protobuf:"bytes,1,rep,name=container_ids,json=containerIds,proto3" json:"container_ids,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ContainerIds []*grpc1.ContainerID `protobuf:"bytes,1,rep,name=container_ids,json=containerIds,proto3" json:"container_ids,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *ListResponse_Body) Reset() { *m = ListResponse_Body{} } func (m *ListResponse_Body) String() string { return proto.CompactTextString(m) } func (*ListResponse_Body) ProtoMessage() {} func (*ListResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{7, 0} + return fileDescriptor_364186d99410ec35, []int{7, 0} } func (m *ListResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -995,7 +995,7 @@ func (m *ListResponse_Body) XXX_DiscardUnknown() { var xxx_messageInfo_ListResponse_Body proto.InternalMessageInfo -func (m *ListResponse_Body) GetContainerIds() []*refs.ContainerID { +func (m *ListResponse_Body) GetContainerIds() []*grpc1.ContainerID { if m != nil { return m.ContainerIds } @@ -1008,21 +1008,21 @@ type SetExtendedACLRequest struct { Body *SetExtendedACLRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SetExtendedACLRequest) Reset() { *m = SetExtendedACLRequest{} } func (m *SetExtendedACLRequest) String() string { return proto.CompactTextString(m) } func (*SetExtendedACLRequest) ProtoMessage() {} func (*SetExtendedACLRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{8} + return fileDescriptor_364186d99410ec35, []int{8} } func (m *SetExtendedACLRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1058,14 +1058,14 @@ func (m *SetExtendedACLRequest) GetBody() *SetExtendedACLRequest_Body { return nil } -func (m *SetExtendedACLRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *SetExtendedACLRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *SetExtendedACLRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *SetExtendedACLRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1075,7 +1075,7 @@ func (m *SetExtendedACLRequest) GetVerifyHeader() *service.RequestVerificationHe // Request body type SetExtendedACLRequest_Body struct { // Extended ACL to set for the container. - Eacl *acl.EACLTable `protobuf:"bytes,1,opt,name=eacl,proto3" json:"eacl,omitempty"` + Eacl *grpc2.EACLTable `protobuf:"bytes,1,opt,name=eacl,proto3" json:"eacl,omitempty"` // Signature of stable-marshalled Extended ACL according to RFC-6979. Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1087,7 +1087,7 @@ func (m *SetExtendedACLRequest_Body) Reset() { *m = SetExtendedACLReques func (m *SetExtendedACLRequest_Body) String() string { return proto.CompactTextString(m) } func (*SetExtendedACLRequest_Body) ProtoMessage() {} func (*SetExtendedACLRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{8, 0} + return fileDescriptor_364186d99410ec35, []int{8, 0} } func (m *SetExtendedACLRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1116,7 +1116,7 @@ func (m *SetExtendedACLRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_SetExtendedACLRequest_Body proto.InternalMessageInfo -func (m *SetExtendedACLRequest_Body) GetEacl() *acl.EACLTable { +func (m *SetExtendedACLRequest_Body) GetEacl() *grpc2.EACLTable { if m != nil { return m.Eacl } @@ -1136,21 +1136,21 @@ type SetExtendedACLResponse struct { Body *SetExtendedACLResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SetExtendedACLResponse) Reset() { *m = SetExtendedACLResponse{} } func (m *SetExtendedACLResponse) String() string { return proto.CompactTextString(m) } func (*SetExtendedACLResponse) ProtoMessage() {} func (*SetExtendedACLResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{9} + return fileDescriptor_364186d99410ec35, []int{9} } func (m *SetExtendedACLResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1186,14 +1186,14 @@ func (m *SetExtendedACLResponse) GetBody() *SetExtendedACLResponse_Body { return nil } -func (m *SetExtendedACLResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *SetExtendedACLResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *SetExtendedACLResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *SetExtendedACLResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1211,7 +1211,7 @@ func (m *SetExtendedACLResponse_Body) Reset() { *m = SetExtendedACLRespo func (m *SetExtendedACLResponse_Body) String() string { return proto.CompactTextString(m) } func (*SetExtendedACLResponse_Body) ProtoMessage() {} func (*SetExtendedACLResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{9, 0} + return fileDescriptor_364186d99410ec35, []int{9, 0} } func (m *SetExtendedACLResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1246,21 +1246,21 @@ type GetExtendedACLRequest struct { Body *GetExtendedACLRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetExtendedACLRequest) Reset() { *m = GetExtendedACLRequest{} } func (m *GetExtendedACLRequest) String() string { return proto.CompactTextString(m) } func (*GetExtendedACLRequest) ProtoMessage() {} func (*GetExtendedACLRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{10} + return fileDescriptor_364186d99410ec35, []int{10} } func (m *GetExtendedACLRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1296,14 +1296,14 @@ func (m *GetExtendedACLRequest) GetBody() *GetExtendedACLRequest_Body { return nil } -func (m *GetExtendedACLRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *GetExtendedACLRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetExtendedACLRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *GetExtendedACLRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1313,17 +1313,17 @@ func (m *GetExtendedACLRequest) GetVerifyHeader() *service.RequestVerificationHe // Request body type GetExtendedACLRequest_Body struct { // container_id carries identifier of the container that has Extended ACL. - ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ContainerId *grpc1.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetExtendedACLRequest_Body) Reset() { *m = GetExtendedACLRequest_Body{} } func (m *GetExtendedACLRequest_Body) String() string { return proto.CompactTextString(m) } func (*GetExtendedACLRequest_Body) ProtoMessage() {} func (*GetExtendedACLRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{10, 0} + return fileDescriptor_364186d99410ec35, []int{10, 0} } func (m *GetExtendedACLRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1352,7 +1352,7 @@ func (m *GetExtendedACLRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_GetExtendedACLRequest_Body proto.InternalMessageInfo -func (m *GetExtendedACLRequest_Body) GetContainerId() *refs.ContainerID { +func (m *GetExtendedACLRequest_Body) GetContainerId() *grpc1.ContainerID { if m != nil { return m.ContainerId } @@ -1365,21 +1365,21 @@ type GetExtendedACLResponse struct { Body *GetExtendedACLResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetExtendedACLResponse) Reset() { *m = GetExtendedACLResponse{} } func (m *GetExtendedACLResponse) String() string { return proto.CompactTextString(m) } func (*GetExtendedACLResponse) ProtoMessage() {} func (*GetExtendedACLResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{11} + return fileDescriptor_364186d99410ec35, []int{11} } func (m *GetExtendedACLResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1415,14 +1415,14 @@ func (m *GetExtendedACLResponse) GetBody() *GetExtendedACLResponse_Body { return nil } -func (m *GetExtendedACLResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *GetExtendedACLResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetExtendedACLResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *GetExtendedACLResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1432,7 +1432,7 @@ func (m *GetExtendedACLResponse) GetVerifyHeader() *service.ResponseVerification // Response body type GetExtendedACLResponse_Body struct { // Extended ACL that has been requested if it was set up. - Eacl *acl.EACLTable `protobuf:"bytes,1,opt,name=eacl,proto3" json:"eacl,omitempty"` + Eacl *grpc2.EACLTable `protobuf:"bytes,1,opt,name=eacl,proto3" json:"eacl,omitempty"` // Signature of stable-marshalled Extended ACL according to RFC-6979. Signature []byte `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1444,7 +1444,7 @@ func (m *GetExtendedACLResponse_Body) Reset() { *m = GetExtendedACLRespo func (m *GetExtendedACLResponse_Body) String() string { return proto.CompactTextString(m) } func (*GetExtendedACLResponse_Body) ProtoMessage() {} func (*GetExtendedACLResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6e23291a5a71033a, []int{11, 0} + return fileDescriptor_364186d99410ec35, []int{11, 0} } func (m *GetExtendedACLResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1473,7 +1473,7 @@ func (m *GetExtendedACLResponse_Body) XXX_DiscardUnknown() { var xxx_messageInfo_GetExtendedACLResponse_Body proto.InternalMessageInfo -func (m *GetExtendedACLResponse_Body) GetEacl() *acl.EACLTable { +func (m *GetExtendedACLResponse_Body) GetEacl() *grpc2.EACLTable { if m != nil { return m.Eacl } @@ -1514,72 +1514,72 @@ func init() { proto.RegisterType((*GetExtendedACLResponse_Body)(nil), "neo.fs.v2.container.GetExtendedACLResponse.Body") } -func init() { proto.RegisterFile("v2/container/service.proto", fileDescriptor_6e23291a5a71033a) } +func init() { proto.RegisterFile("v2/container/grpc/service.proto", fileDescriptor_364186d99410ec35) } -var fileDescriptor_6e23291a5a71033a = []byte{ - // 833 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x98, 0xcd, 0x6e, 0xd3, 0x58, - 0x14, 0xc7, 0xc7, 0x6e, 0xd4, 0x99, 0x9e, 0xa4, 0xd5, 0xe8, 0x56, 0x6d, 0x23, 0xcf, 0x4c, 0x26, - 0xe3, 0x99, 0x0e, 0x15, 0x34, 0x36, 0x32, 0x9b, 0xd2, 0x56, 0x88, 0x36, 0x69, 0xdd, 0xa8, 0x05, - 0x5a, 0x17, 0xb1, 0x60, 0x53, 0x39, 0xf6, 0x49, 0x6b, 0x91, 0xda, 0x21, 0x76, 0x5c, 0xb2, 0x84, - 0xa7, 0x60, 0x81, 0x58, 0xa3, 0x8a, 0x05, 0x4f, 0xc0, 0x1a, 0x21, 0x84, 0x78, 0x04, 0x54, 0x78, - 0x02, 0x9e, 0x00, 0xf9, 0x23, 0x8e, 0x5d, 0x9c, 0x3a, 0xa9, 0xc2, 0xc2, 0x3b, 0xe7, 0xe6, 0x9c, - 0x73, 0xcf, 0xf9, 0xe9, 0x7f, 0xee, 0xb9, 0x36, 0x30, 0xb6, 0xc0, 0x2b, 0x86, 0x6e, 0xc9, 0x9a, - 0x8e, 0x2d, 0xde, 0xc4, 0x96, 0xad, 0x29, 0xc8, 0x35, 0x5b, 0x86, 0x65, 0x90, 0x69, 0x1d, 0x0d, - 0xae, 0x6e, 0x72, 0xb6, 0xc0, 0x05, 0x26, 0x0c, 0xb1, 0x05, 0x5e, 0x56, 0x1a, 0xbc, 0xd5, 0x69, - 0xa2, 0xe9, 0x19, 0x32, 0xf9, 0x48, 0x90, 0xf0, 0x3f, 0xd3, 0xb6, 0xc0, 0xb7, 0xb0, 0x6e, 0x46, - 0x16, 0x67, 0x6c, 0xa1, 0xbb, 0x13, 0x7f, 0x8c, 0x96, 0xec, 0x2f, 0xcf, 0x85, 0x96, 0x6d, 0x6c, - 0x69, 0xf5, 0x8e, 0xf7, 0x07, 0xfb, 0x95, 0x06, 0xd8, 0x6d, 0x5b, 0x12, 0x3e, 0x6e, 0xa3, 0x69, - 0x91, 0x25, 0xc8, 0xd4, 0x0c, 0xb5, 0x93, 0xa7, 0x8a, 0xd4, 0x42, 0x56, 0xf8, 0x8f, 0x8b, 0xc9, - 0x92, 0xeb, 0x99, 0x73, 0xeb, 0x86, 0xda, 0x91, 0x5c, 0x0f, 0xb2, 0x01, 0x59, 0x67, 0xbf, 0x83, - 0x23, 0x94, 0x55, 0x6c, 0xe5, 0xe9, 0x1f, 0x02, 0x74, 0xeb, 0xf7, 0x7d, 0xef, 0xa0, 0x25, 0x6f, - 0xb9, 0xb6, 0x12, 0x1c, 0x07, 0xcf, 0x64, 0x0f, 0x26, 0xbd, 0xfc, 0xba, 0x81, 0xc6, 0xdc, 0x40, - 0x8b, 0xfd, 0x03, 0x3d, 0x70, 0xcc, 0x35, 0x45, 0xb6, 0x34, 0x43, 0xf7, 0x03, 0xe6, 0xbc, 0x10, - 0xde, 0x2f, 0xe6, 0x29, 0x05, 0x19, 0x27, 0x51, 0xb2, 0x0a, 0x13, 0x41, 0x15, 0x7e, 0x85, 0x85, - 0xd8, 0x0a, 0xcb, 0xdd, 0x27, 0xa9, 0xe7, 0x40, 0xfe, 0x02, 0x68, 0xb6, 0x6b, 0x0d, 0x4d, 0x39, - 0x78, 0x84, 0x1d, 0xb7, 0xbe, 0x9c, 0x34, 0xe1, 0xad, 0x6c, 0x63, 0x87, 0xfc, 0x09, 0x13, 0xa6, - 0x76, 0xa8, 0xcb, 0x56, 0xbb, 0x85, 0x6e, 0xd2, 0x39, 0xa9, 0xb7, 0xc0, 0xbe, 0xa6, 0x21, 0xeb, - 0x72, 0x33, 0x9b, 0x86, 0x6e, 0x22, 0xb9, 0x19, 0xe1, 0x3c, 0xdf, 0x9f, 0xb3, 0x67, 0x1f, 0x06, - 0xbd, 0x19, 0x07, 0x7a, 0x3e, 0x96, 0x8f, 0xe7, 0xdc, 0x87, 0xb4, 0x14, 0x4f, 0xba, 0x74, 0x41, - 0xa4, 0x44, 0xd4, 0x9b, 0x3e, 0xe9, 0x5b, 0x90, 0x0b, 0xea, 0x38, 0xd0, 0x54, 0xbf, 0xcc, 0x3f, - 0x42, 0xa1, 0x1d, 0xe1, 0xf6, 0x38, 0x57, 0x2b, 0x52, 0x36, 0x70, 0xa8, 0xaa, 0xec, 0x07, 0x1a, - 0x26, 0x2b, 0xd8, 0x40, 0x0b, 0xbb, 0xc2, 0x5c, 0x89, 0x00, 0xbb, 0x12, 0x0b, 0x2c, 0xe2, 0x91, - 0x0e, 0x6d, 0xaa, 0xa3, 0x01, 0x16, 0x55, 0x1f, 0x7d, 0x5e, 0x7d, 0xdf, 0x28, 0x98, 0xea, 0xc2, - 0xf1, 0x05, 0xb8, 0x1a, 0xe1, 0xb9, 0x70, 0x21, 0xcf, 0x74, 0x69, 0x70, 0xdc, 0x43, 0xca, 0xbe, - 0xa2, 0x01, 0x44, 0x1c, 0xea, 0x64, 0xeb, 0x99, 0xa7, 0x43, 0x3d, 0xa3, 0x6a, 0xb7, 0x53, 0x1a, - 0xb2, 0x6e, 0xed, 0x43, 0x9c, 0x4e, 0x21, 0xfb, 0xb4, 0x28, 0xa3, 0x32, 0x8a, 0x39, 0xc0, 0xbe, - 0xa4, 0x21, 0xbb, 0xa3, 0x99, 0x81, 0xb0, 0x06, 0x81, 0x15, 0xb2, 0x4f, 0x87, 0xb2, 0x96, 0x7d, - 0x54, 0x02, 0xfc, 0x66, 0x9c, 0x44, 0x54, 0x35, 0x77, 0x5e, 0x55, 0xf7, 0x4e, 0x3c, 0x45, 0xfd, - 0xea, 0x1a, 0x56, 0x55, 0xf6, 0x0d, 0x0d, 0x39, 0xaf, 0x60, 0x5f, 0x4e, 0xcb, 0x11, 0x42, 0xff, - 0x5f, 0x40, 0x28, 0x5d, 0x7a, 0xda, 0xf2, 0x21, 0xdd, 0x86, 0xc9, 0x70, 0xfb, 0x99, 0x79, 0xaa, - 0x38, 0x96, 0xd4, 0x7f, 0xb9, 0x50, 0xff, 0x99, 0xec, 0x7b, 0x1a, 0x66, 0xf6, 0xd1, 0xda, 0x78, - 0x62, 0xa1, 0xae, 0xa2, 0xba, 0x56, 0xde, 0xe9, 0xaa, 0xab, 0x1c, 0x61, 0xc7, 0xc7, 0xb2, 0x8b, - 0xf5, 0x4c, 0x87, 0xce, 0x24, 0x1f, 0xe1, 0x22, 0x64, 0x50, 0x56, 0x1a, 0x7e, 0x99, 0xf9, 0x50, - 0x44, 0x59, 0x69, 0x70, 0x1b, 0x6b, 0xe5, 0x9d, 0xfb, 0x72, 0xad, 0x81, 0x92, 0x6b, 0x95, 0x30, - 0xed, 0x9e, 0xd1, 0x30, 0x7b, 0x1e, 0x89, 0xaf, 0xc4, 0x4a, 0x84, 0xe6, 0xf5, 0x81, 0x68, 0xa6, - 0x73, 0xfa, 0xbd, 0xa5, 0x61, 0x46, 0xbc, 0xb4, 0xa2, 0xc4, 0xf4, 0x2a, 0x6a, 0x54, 0x33, 0xf1, - 0x23, 0x0d, 0xb3, 0xe2, 0xe5, 0x55, 0x24, 0xa6, 0x5a, 0x45, 0x3f, 0xa1, 0x2d, 0x85, 0x17, 0x19, - 0xf8, 0x3d, 0xa0, 0xbd, 0xef, 0x65, 0x44, 0xb6, 0x60, 0x6c, 0xb7, 0x6d, 0x91, 0xbf, 0x13, 0x5e, - 0x34, 0x99, 0x62, 0xd2, 0x1b, 0x12, 0xd9, 0x83, 0x71, 0xef, 0xbe, 0x4a, 0xd8, 0xe4, 0x97, 0x03, - 0xe6, 0xdf, 0x01, 0x2e, 0xbc, 0x4e, 0x72, 0x22, 0xf6, 0x4b, 0xae, 0x77, 0x57, 0xec, 0x93, 0x5c, - 0xf8, 0x42, 0xb5, 0x0d, 0x19, 0x67, 0xc0, 0x91, 0x62, 0xd2, 0xed, 0x80, 0xf9, 0x27, 0x71, 0x3a, - 0x12, 0x0d, 0xa6, 0xa2, 0x67, 0x14, 0xb9, 0x3a, 0xf8, 0x58, 0x60, 0xae, 0x0d, 0x71, 0xe8, 0x39, - 0x5b, 0x89, 0x83, 0x6c, 0x25, 0x0e, 0xb1, 0x55, 0x7c, 0x67, 0xac, 0x2b, 0xef, 0xce, 0x0a, 0xd4, - 0xa7, 0xb3, 0x02, 0xf5, 0xf9, 0xac, 0x40, 0x3d, 0xff, 0x52, 0xf8, 0xe5, 0xe1, 0xd2, 0xa1, 0x66, - 0x1d, 0xb5, 0x6b, 0x9c, 0x62, 0x1c, 0xf3, 0xba, 0xd9, 0x54, 0x94, 0x92, 0x8a, 0x36, 0xaf, 0xa3, - 0x51, 0x37, 0x4b, 0x72, 0x53, 0x2b, 0x1d, 0x1a, 0x7c, 0xf8, 0xdb, 0xc8, 0x4a, 0xf0, 0x74, 0x4a, - 0xcf, 0xde, 0x45, 0x63, 0x73, 0x9f, 0x5b, 0xdb, 0xad, 0x3a, 0x7b, 0x07, 0xaa, 0xab, 0x8d, 0xbb, - 0x1f, 0x3d, 0x6e, 0x7c, 0x0f, 0x00, 0x00, 0xff, 0xff, 0x12, 0xb4, 0xb7, 0x71, 0x9a, 0x11, 0x00, - 0x00, +var fileDescriptor_364186d99410ec35 = []byte{ + // 840 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x98, 0x41, 0x6f, 0xd3, 0x4a, + 0x10, 0xc7, 0x9f, 0xdd, 0xa8, 0xef, 0x75, 0x92, 0x56, 0x4f, 0x7e, 0x6a, 0x1b, 0xf9, 0xb5, 0x69, + 0x30, 0x14, 0x2a, 0x68, 0x6c, 0x64, 0x2e, 0xd0, 0x16, 0x44, 0x9b, 0xb4, 0x6e, 0xd4, 0x02, 0xad, + 0x8b, 0x38, 0x70, 0xa9, 0x1c, 0x7b, 0x93, 0x5a, 0xa4, 0x76, 0xb0, 0x1d, 0x97, 0x1c, 0xe1, 0x53, + 0x70, 0x40, 0x9c, 0x51, 0xc5, 0x81, 0x4f, 0xc0, 0x19, 0x21, 0x84, 0xf8, 0x08, 0xa8, 0xf0, 0x09, + 0xf8, 0x04, 0xc8, 0x5e, 0xc7, 0xb1, 0x13, 0xa7, 0x4e, 0xaa, 0x70, 0xf0, 0xcd, 0xf6, 0xce, 0xcc, + 0xce, 0xfc, 0xf4, 0xdf, 0x9d, 0x5d, 0xc3, 0x82, 0xcd, 0x73, 0xb2, 0xae, 0x59, 0x92, 0xaa, 0x21, + 0x83, 0xab, 0x19, 0x0d, 0x99, 0x33, 0x91, 0x61, 0xab, 0x32, 0x62, 0x1b, 0x86, 0x6e, 0xe9, 0xd4, + 0x7f, 0x1a, 0xd2, 0xd9, 0xaa, 0xc9, 0xda, 0x3c, 0xeb, 0xdb, 0xd1, 0xb3, 0x36, 0xcf, 0x49, 0x72, + 0x1d, 0xdb, 0x5b, 0xad, 0x06, 0x32, 0xb1, 0x35, 0x3d, 0xdf, 0x1b, 0x2e, 0x38, 0x9c, 0xb5, 0x79, + 0xce, 0x40, 0x55, 0xb3, 0x77, 0x84, 0xb6, 0xf9, 0xf6, 0xc4, 0x78, 0xf0, 0x18, 0x59, 0x92, 0x37, + 0x36, 0xd7, 0x3d, 0x66, 0x23, 0x43, 0xad, 0xb6, 0xf0, 0x28, 0xf3, 0x93, 0x04, 0xd8, 0x6b, 0x5a, + 0x22, 0x7a, 0xde, 0x44, 0xa6, 0x45, 0xdd, 0x86, 0x54, 0x45, 0x57, 0x5a, 0x59, 0x22, 0x4f, 0x2c, + 0xa5, 0xf9, 0x2b, 0x6c, 0x44, 0xfa, 0x6c, 0xc7, 0x9c, 0xdd, 0xd0, 0x95, 0x96, 0xe8, 0x7a, 0x50, + 0x9b, 0x90, 0x76, 0x26, 0x3d, 0x3c, 0x42, 0x92, 0x82, 0x8c, 0x2c, 0xd9, 0x13, 0xa0, 0x0d, 0xc6, + 0xf3, 0x7d, 0x80, 0x2c, 0x69, 0xdb, 0xb5, 0x15, 0xe1, 0xd8, 0x7f, 0xa6, 0xf6, 0x61, 0x12, 0xe7, + 0xd7, 0x0e, 0x34, 0xe6, 0x06, 0x5a, 0xee, 0x1f, 0xe8, 0x89, 0x63, 0xae, 0xca, 0x92, 0xa5, 0xea, + 0x9a, 0x17, 0x30, 0x83, 0x43, 0xe0, 0x37, 0xfa, 0x25, 0x01, 0x29, 0x27, 0x51, 0x6a, 0x0d, 0x26, + 0xfc, 0x2a, 0xbc, 0x0a, 0x73, 0x91, 0x15, 0x16, 0xdb, 0x4f, 0x62, 0xc7, 0x81, 0x9a, 0x07, 0x68, + 0x34, 0x2b, 0x75, 0x55, 0x3e, 0x7c, 0x86, 0x5a, 0x6e, 0x7d, 0x19, 0x71, 0x02, 0x7f, 0xd9, 0x41, + 0x2d, 0x6a, 0x0e, 0x26, 0x4c, 0xb5, 0xa6, 0x49, 0x56, 0xd3, 0x40, 0x6e, 0xd2, 0x19, 0xb1, 0xf3, + 0x81, 0x79, 0x4f, 0x42, 0xda, 0xe5, 0x66, 0x36, 0x74, 0xcd, 0x44, 0xd4, 0x9d, 0x10, 0xe7, 0xc5, + 0xfe, 0x9c, 0xb1, 0x7d, 0x10, 0xf4, 0x56, 0x14, 0xe8, 0xc5, 0x48, 0x3e, 0xd8, 0xb9, 0x0f, 0x69, + 0x31, 0x9a, 0x74, 0xe1, 0x9c, 0x48, 0xb1, 0xa8, 0xb7, 0x3c, 0xd2, 0xf7, 0x20, 0xe3, 0xd7, 0x71, + 0xa8, 0x2a, 0x5e, 0x99, 0xff, 0x07, 0x42, 0x3b, 0x3a, 0xee, 0x70, 0x2e, 0x97, 0xc4, 0xb4, 0xef, + 0x50, 0x56, 0x98, 0x2f, 0x24, 0x4c, 0x96, 0x50, 0x1d, 0x59, 0xa8, 0x2d, 0xcc, 0xd5, 0x10, 0xb0, + 0x6b, 0x91, 0xc0, 0x42, 0x1e, 0xc9, 0xd0, 0xa6, 0x32, 0x1a, 0x60, 0x61, 0xf5, 0x91, 0xdd, 0xea, + 0xfb, 0x45, 0xc0, 0x54, 0x1b, 0x8e, 0x27, 0xc0, 0xb5, 0x10, 0xcf, 0xa5, 0x73, 0x79, 0x26, 0x4b, + 0x83, 0xe3, 0x18, 0x29, 0xf3, 0x8e, 0x04, 0x10, 0xd0, 0x50, 0x3b, 0x5b, 0xc7, 0x3c, 0x19, 0xea, + 0x19, 0xd5, 0x72, 0x3b, 0x25, 0x21, 0xed, 0xd6, 0x3e, 0xc4, 0xee, 0x14, 0xb0, 0x4f, 0x8a, 0x32, + 0x4a, 0xa3, 0xe8, 0x03, 0xcc, 0x5b, 0x12, 0xd2, 0xbb, 0xaa, 0xe9, 0x0b, 0x6b, 0x10, 0x58, 0x01, + 0xfb, 0x64, 0x28, 0x6b, 0xc5, 0x43, 0xc5, 0xc3, 0x3f, 0xfa, 0x49, 0x48, 0x55, 0xb3, 0xdd, 0xaa, + 0x7a, 0x74, 0x82, 0x15, 0xf5, 0xb7, 0x6b, 0x58, 0x56, 0x98, 0x0f, 0x24, 0x64, 0x70, 0xc1, 0x9e, + 0x9c, 0x56, 0x42, 0x84, 0xae, 0x9e, 0x43, 0x28, 0x59, 0x7a, 0xda, 0xf6, 0x20, 0xdd, 0x87, 0xc9, + 0xe0, 0xf2, 0x33, 0xb3, 0x44, 0x7e, 0x2c, 0x6e, 0xfd, 0x65, 0x02, 0xeb, 0xcf, 0x64, 0x3e, 0x93, + 0x30, 0x7d, 0x80, 0xac, 0xcd, 0x17, 0x16, 0xd2, 0x14, 0xa4, 0xac, 0x17, 0x77, 0xdb, 0xea, 0x2a, + 0x86, 0xd8, 0x71, 0x91, 0xec, 0x22, 0x3d, 0x93, 0xa1, 0x33, 0xd1, 0x43, 0xb8, 0x0c, 0x29, 0x24, + 0xc9, 0x75, 0xaf, 0xcc, 0x6c, 0x20, 0xa2, 0x24, 0xd7, 0xd9, 0xcd, 0xf5, 0xe2, 0xee, 0x63, 0xa9, + 0x52, 0x47, 0xa2, 0x6b, 0x15, 0xd3, 0xed, 0x5e, 0x91, 0x30, 0xd3, 0x8d, 0xc4, 0x53, 0x62, 0x29, + 0x44, 0xf3, 0xe6, 0x40, 0x34, 0x93, 0xd9, 0xfd, 0x3e, 0x92, 0x30, 0x2d, 0x5c, 0x58, 0x51, 0x42, + 0x72, 0x15, 0x35, 0xaa, 0x9e, 0xf8, 0x95, 0x84, 0x19, 0xe1, 0xe2, 0x2a, 0x12, 0x12, 0xad, 0xa2, + 0x3f, 0xb0, 0x2c, 0xf9, 0x37, 0x29, 0xf8, 0xd7, 0xa7, 0x7d, 0x80, 0x33, 0xa2, 0xb6, 0x61, 0x6c, + 0xaf, 0x69, 0x51, 0x0b, 0x31, 0x17, 0x4d, 0x3a, 0x1f, 0x77, 0x43, 0xa2, 0xf6, 0x61, 0x1c, 0x9f, + 0x57, 0x29, 0x26, 0xfe, 0x72, 0x40, 0x5f, 0x1e, 0xe0, 0xc0, 0xeb, 0x24, 0x27, 0xa0, 0x7e, 0xc9, + 0x75, 0xce, 0x8a, 0x7d, 0x92, 0x0b, 0x1e, 0xa8, 0x76, 0x20, 0xe5, 0x34, 0x38, 0x2a, 0x1f, 0x77, + 0x3a, 0xa0, 0x2f, 0xc5, 0x76, 0x47, 0x4a, 0x85, 0xa9, 0xf0, 0x1e, 0x45, 0x5d, 0x1f, 0xbc, 0x2d, + 0xd0, 0x37, 0x86, 0xd8, 0xf4, 0x9c, 0xa9, 0x84, 0x41, 0xa6, 0x12, 0x86, 0x98, 0x2a, 0x7a, 0x65, + 0x6c, 0x1c, 0x7d, 0x3a, 0xcb, 0x11, 0xdf, 0xce, 0x72, 0xc4, 0xf7, 0xb3, 0x1c, 0xf1, 0xfa, 0x47, + 0xee, 0xaf, 0xa7, 0x77, 0x6b, 0xaa, 0x75, 0xd4, 0xac, 0xb0, 0xb2, 0x7e, 0xcc, 0x69, 0x66, 0x43, + 0x96, 0x0b, 0x0a, 0xb2, 0x39, 0x0d, 0xe9, 0x55, 0xb3, 0x20, 0x35, 0xd4, 0x42, 0x4d, 0xe7, 0x7a, + 0xfe, 0x97, 0xac, 0xfa, 0xaf, 0xa7, 0xe4, 0xcc, 0x43, 0xa4, 0x6f, 0x1d, 0xb0, 0xeb, 0x7b, 0x65, + 0x27, 0x01, 0x5f, 0x7a, 0x95, 0x71, 0xf7, 0xcf, 0xc7, 0xad, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, + 0x27, 0x5d, 0xa8, 0x45, 0xbd, 0x11, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc3.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc3.SupportPackageIsVersion4 // ContainerServiceClient is the client API for ContainerService service. // @@ -1589,35 +1589,35 @@ type ContainerServiceClient interface { // response immediately. After new block in morph chain, request is verified // by inner ring nodes. After one more block in morph chain, container // added into smart-contract storage. - Put(ctx context.Context, in *PutRequest, opts ...grpc.CallOption) (*PutResponse, error) + Put(ctx context.Context, in *PutRequest, opts ...grpc3.CallOption) (*PutResponse, error) // Delete invokes 'Delete' method in container smart-contract and returns // response immediately. After new block in morph chain, request is verified // by inner ring nodes. After one more block in morph chain, container // removed from smart-contract storage. - Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) + Delete(ctx context.Context, in *DeleteRequest, opts ...grpc3.CallOption) (*DeleteResponse, error) // Get returns container from container smart-contract storage. - Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*GetResponse, error) + Get(ctx context.Context, in *GetRequest, opts ...grpc3.CallOption) (*GetResponse, error) // List returns all owner's containers from container smart-contract // storage. - List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) + List(ctx context.Context, in *ListRequest, opts ...grpc3.CallOption) (*ListResponse, error) // SetExtendedACL invokes 'SetEACL' method in container smart-contract and // returns response immediately. After new block in morph chain, // Extended ACL added into smart-contract storage. - SetExtendedACL(ctx context.Context, in *SetExtendedACLRequest, opts ...grpc.CallOption) (*SetExtendedACLResponse, error) + SetExtendedACL(ctx context.Context, in *SetExtendedACLRequest, opts ...grpc3.CallOption) (*SetExtendedACLResponse, error) // GetExtendedACL returns Extended ACL table and signature from container // smart-contract storage. - GetExtendedACL(ctx context.Context, in *GetExtendedACLRequest, opts ...grpc.CallOption) (*GetExtendedACLResponse, error) + GetExtendedACL(ctx context.Context, in *GetExtendedACLRequest, opts ...grpc3.CallOption) (*GetExtendedACLResponse, error) } type containerServiceClient struct { - cc *grpc.ClientConn + cc *grpc3.ClientConn } -func NewContainerServiceClient(cc *grpc.ClientConn) ContainerServiceClient { +func NewContainerServiceClient(cc *grpc3.ClientConn) ContainerServiceClient { return &containerServiceClient{cc} } -func (c *containerServiceClient) Put(ctx context.Context, in *PutRequest, opts ...grpc.CallOption) (*PutResponse, error) { +func (c *containerServiceClient) Put(ctx context.Context, in *PutRequest, opts ...grpc3.CallOption) (*PutResponse, error) { out := new(PutResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/Put", in, out, opts...) if err != nil { @@ -1626,7 +1626,7 @@ func (c *containerServiceClient) Put(ctx context.Context, in *PutRequest, opts . return out, nil } -func (c *containerServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { +func (c *containerServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc3.CallOption) (*DeleteResponse, error) { out := new(DeleteResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/Delete", in, out, opts...) if err != nil { @@ -1635,7 +1635,7 @@ func (c *containerServiceClient) Delete(ctx context.Context, in *DeleteRequest, return out, nil } -func (c *containerServiceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (*GetResponse, error) { +func (c *containerServiceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc3.CallOption) (*GetResponse, error) { out := new(GetResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/Get", in, out, opts...) if err != nil { @@ -1644,7 +1644,7 @@ func (c *containerServiceClient) Get(ctx context.Context, in *GetRequest, opts . return out, nil } -func (c *containerServiceClient) List(ctx context.Context, in *ListRequest, opts ...grpc.CallOption) (*ListResponse, error) { +func (c *containerServiceClient) List(ctx context.Context, in *ListRequest, opts ...grpc3.CallOption) (*ListResponse, error) { out := new(ListResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/List", in, out, opts...) if err != nil { @@ -1653,7 +1653,7 @@ func (c *containerServiceClient) List(ctx context.Context, in *ListRequest, opts return out, nil } -func (c *containerServiceClient) SetExtendedACL(ctx context.Context, in *SetExtendedACLRequest, opts ...grpc.CallOption) (*SetExtendedACLResponse, error) { +func (c *containerServiceClient) SetExtendedACL(ctx context.Context, in *SetExtendedACLRequest, opts ...grpc3.CallOption) (*SetExtendedACLResponse, error) { out := new(SetExtendedACLResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/SetExtendedACL", in, out, opts...) if err != nil { @@ -1662,7 +1662,7 @@ func (c *containerServiceClient) SetExtendedACL(ctx context.Context, in *SetExte return out, nil } -func (c *containerServiceClient) GetExtendedACL(ctx context.Context, in *GetExtendedACLRequest, opts ...grpc.CallOption) (*GetExtendedACLResponse, error) { +func (c *containerServiceClient) GetExtendedACL(ctx context.Context, in *GetExtendedACLRequest, opts ...grpc3.CallOption) (*GetExtendedACLResponse, error) { out := new(GetExtendedACLResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.container.ContainerService/GetExtendedACL", in, out, opts...) if err != nil { @@ -1720,11 +1720,11 @@ func (*UnimplementedContainerServiceServer) GetExtendedACL(ctx context.Context, return nil, status.Errorf(codes.Unimplemented, "method GetExtendedACL not implemented") } -func RegisterContainerServiceServer(s *grpc.Server, srv ContainerServiceServer) { +func RegisterContainerServiceServer(s *grpc3.Server, srv ContainerServiceServer) { s.RegisterService(&_ContainerService_serviceDesc, srv) } -func _ContainerService_Put_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_Put_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc3.UnaryServerInterceptor) (interface{}, error) { in := new(PutRequest) if err := dec(in); err != nil { return nil, err @@ -1732,7 +1732,7 @@ func _ContainerService_Put_Handler(srv interface{}, ctx context.Context, dec fun if interceptor == nil { return srv.(ContainerServiceServer).Put(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc3.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.container.ContainerService/Put", } @@ -1742,7 +1742,7 @@ func _ContainerService_Put_Handler(srv interface{}, ctx context.Context, dec fun return interceptor(ctx, in, info, handler) } -func _ContainerService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc3.UnaryServerInterceptor) (interface{}, error) { in := new(DeleteRequest) if err := dec(in); err != nil { return nil, err @@ -1750,7 +1750,7 @@ func _ContainerService_Delete_Handler(srv interface{}, ctx context.Context, dec if interceptor == nil { return srv.(ContainerServiceServer).Delete(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc3.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.container.ContainerService/Delete", } @@ -1760,7 +1760,7 @@ func _ContainerService_Delete_Handler(srv interface{}, ctx context.Context, dec return interceptor(ctx, in, info, handler) } -func _ContainerService_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_Get_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc3.UnaryServerInterceptor) (interface{}, error) { in := new(GetRequest) if err := dec(in); err != nil { return nil, err @@ -1768,7 +1768,7 @@ func _ContainerService_Get_Handler(srv interface{}, ctx context.Context, dec fun if interceptor == nil { return srv.(ContainerServiceServer).Get(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc3.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.container.ContainerService/Get", } @@ -1778,7 +1778,7 @@ func _ContainerService_Get_Handler(srv interface{}, ctx context.Context, dec fun return interceptor(ctx, in, info, handler) } -func _ContainerService_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_List_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc3.UnaryServerInterceptor) (interface{}, error) { in := new(ListRequest) if err := dec(in); err != nil { return nil, err @@ -1786,7 +1786,7 @@ func _ContainerService_List_Handler(srv interface{}, ctx context.Context, dec fu if interceptor == nil { return srv.(ContainerServiceServer).List(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc3.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.container.ContainerService/List", } @@ -1796,7 +1796,7 @@ func _ContainerService_List_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } -func _ContainerService_SetExtendedACL_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_SetExtendedACL_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc3.UnaryServerInterceptor) (interface{}, error) { in := new(SetExtendedACLRequest) if err := dec(in); err != nil { return nil, err @@ -1804,7 +1804,7 @@ func _ContainerService_SetExtendedACL_Handler(srv interface{}, ctx context.Conte if interceptor == nil { return srv.(ContainerServiceServer).SetExtendedACL(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc3.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.container.ContainerService/SetExtendedACL", } @@ -1814,7 +1814,7 @@ func _ContainerService_SetExtendedACL_Handler(srv interface{}, ctx context.Conte return interceptor(ctx, in, info, handler) } -func _ContainerService_GetExtendedACL_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ContainerService_GetExtendedACL_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc3.UnaryServerInterceptor) (interface{}, error) { in := new(GetExtendedACLRequest) if err := dec(in); err != nil { return nil, err @@ -1822,7 +1822,7 @@ func _ContainerService_GetExtendedACL_Handler(srv interface{}, ctx context.Conte if interceptor == nil { return srv.(ContainerServiceServer).GetExtendedACL(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc3.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.container.ContainerService/GetExtendedACL", } @@ -1832,10 +1832,10 @@ func _ContainerService_GetExtendedACL_Handler(srv interface{}, ctx context.Conte return interceptor(ctx, in, info, handler) } -var _ContainerService_serviceDesc = grpc.ServiceDesc{ +var _ContainerService_serviceDesc = grpc3.ServiceDesc{ ServiceName: "neo.fs.v2.container.ContainerService", HandlerType: (*ContainerServiceServer)(nil), - Methods: []grpc.MethodDesc{ + Methods: []grpc3.MethodDesc{ { MethodName: "Put", Handler: _ContainerService_Put_Handler, @@ -1861,8 +1861,8 @@ var _ContainerService_serviceDesc = grpc.ServiceDesc{ Handler: _ContainerService_GetExtendedACL_Handler, }, }, - Streams: []grpc.StreamDesc{}, - Metadata: "v2/container/service.proto", + Streams: []grpc3.StreamDesc{}, + Metadata: "v2/container/grpc/service.proto", } func (m *PutRequest) Marshal() (dAtA []byte, err error) { @@ -3708,7 +3708,7 @@ func (m *PutRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -3744,7 +3744,7 @@ func (m *PutRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4028,7 +4028,7 @@ func (m *PutResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4064,7 +4064,7 @@ func (m *PutResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4154,7 +4154,7 @@ func (m *PutResponse_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ContainerId == nil { - m.ContainerId = &refs.ContainerID{} + m.ContainerId = &grpc1.ContainerID{} } if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4280,7 +4280,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4316,7 +4316,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4406,7 +4406,7 @@ func (m *DeleteRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ContainerId == nil { - m.ContainerId = &refs.ContainerID{} + m.ContainerId = &grpc1.ContainerID{} } if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4566,7 +4566,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4602,7 +4602,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4782,7 +4782,7 @@ func (m *GetRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4818,7 +4818,7 @@ func (m *GetRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -4908,7 +4908,7 @@ func (m *GetRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ContainerId == nil { - m.ContainerId = &refs.ContainerID{} + m.ContainerId = &grpc1.ContainerID{} } if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5034,7 +5034,7 @@ func (m *GetResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5070,7 +5070,7 @@ func (m *GetResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5286,7 +5286,7 @@ func (m *ListRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5322,7 +5322,7 @@ func (m *ListRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5412,7 +5412,7 @@ func (m *ListRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc1.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5538,7 +5538,7 @@ func (m *ListResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5574,7 +5574,7 @@ func (m *ListResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5663,7 +5663,7 @@ func (m *ListResponse_Body) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.ContainerIds = append(m.ContainerIds, &refs.ContainerID{}) + m.ContainerIds = append(m.ContainerIds, &grpc1.ContainerID{}) if err := m.ContainerIds[len(m.ContainerIds)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -5788,7 +5788,7 @@ func (m *SetExtendedACLRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5824,7 +5824,7 @@ func (m *SetExtendedACLRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5914,7 +5914,7 @@ func (m *SetExtendedACLRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Eacl == nil { - m.Eacl = &acl.EACLTable{} + m.Eacl = &grpc2.EACLTable{} } if err := m.Eacl.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6074,7 +6074,7 @@ func (m *SetExtendedACLResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6110,7 +6110,7 @@ func (m *SetExtendedACLResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6290,7 +6290,7 @@ func (m *GetExtendedACLRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6326,7 +6326,7 @@ func (m *GetExtendedACLRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6416,7 +6416,7 @@ func (m *GetExtendedACLRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ContainerId == nil { - m.ContainerId = &refs.ContainerID{} + m.ContainerId = &grpc1.ContainerID{} } if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6542,7 +6542,7 @@ func (m *GetExtendedACLResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6578,7 +6578,7 @@ func (m *GetExtendedACLResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6668,7 +6668,7 @@ func (m *GetExtendedACLResponse_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Eacl == nil { - m.Eacl = &acl.EACLTable{} + m.Eacl = &grpc2.EACLTable{} } if err := m.Eacl.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err 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 eb74ead..3678b56 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 175aeeb..9cd174d 100644 --- a/v2/container/types.pb.go +++ b/v2/container/grpc/types.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/container/types.proto +// source: v2/container/grpc/types.proto package container import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - netmap "github.com/nspcc-dev/neofs-api-go/v2/netmap" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" + grpc1 "github.com/nspcc-dev/neofs-api-go/v2/netmap/grpc" + grpc "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" io "io" math "math" math_bits "math/bits" @@ -30,7 +30,7 @@ const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package // SHA256 hash of stable-marshalled container message. type Container struct { // OwnerID carries identifier of the container owner. - OwnerId *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + OwnerId *grpc.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` // Nonce is a 16 byte UUID, used to avoid collisions of container id. Nonce []byte `protobuf:"bytes,2,opt,name=nonce,proto3" json:"nonce,omitempty"` // BasicACL contains access control rules for owner, system, others groups and @@ -39,17 +39,17 @@ type Container struct { // Attributes define any immutable characteristics of container. Attributes []*Container_Attribute `protobuf:"bytes,4,rep,name=attributes,proto3" json:"attributes,omitempty"` // Placement policy for the object inside the container. - PlacementPolicy *netmap.PlacementPolicy `protobuf:"bytes,5,opt,name=placement_policy,json=placementPolicy,proto3" json:"placement_policy,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + PlacementPolicy *grpc1.PlacementPolicy `protobuf:"bytes,5,opt,name=placement_policy,json=placementPolicy,proto3" json:"placement_policy,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *Container) Reset() { *m = Container{} } func (m *Container) String() string { return proto.CompactTextString(m) } func (*Container) ProtoMessage() {} func (*Container) Descriptor() ([]byte, []int) { - return fileDescriptor_ece71f25e6ae314e, []int{0} + return fileDescriptor_3bfd95a81c72c35c, []int{0} } func (m *Container) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -78,7 +78,7 @@ func (m *Container) XXX_DiscardUnknown() { var xxx_messageInfo_Container proto.InternalMessageInfo -func (m *Container) GetOwnerId() *refs.OwnerID { +func (m *Container) GetOwnerId() *grpc.OwnerID { if m != nil { return m.OwnerId } @@ -106,7 +106,7 @@ func (m *Container) GetAttributes() []*Container_Attribute { return nil } -func (m *Container) GetPlacementPolicy() *netmap.PlacementPolicy { +func (m *Container) GetPlacementPolicy() *grpc1.PlacementPolicy { if m != nil { return m.PlacementPolicy } @@ -128,7 +128,7 @@ func (m *Container_Attribute) Reset() { *m = Container_Attribute{} } func (m *Container_Attribute) String() string { return proto.CompactTextString(m) } func (*Container_Attribute) ProtoMessage() {} func (*Container_Attribute) Descriptor() ([]byte, []int) { - return fileDescriptor_ece71f25e6ae314e, []int{0, 0} + return fileDescriptor_3bfd95a81c72c35c, []int{0, 0} } func (m *Container_Attribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -176,33 +176,33 @@ func init() { proto.RegisterType((*Container_Attribute)(nil), "neo.fs.v2.container.Container.Attribute") } -func init() { proto.RegisterFile("v2/container/types.proto", fileDescriptor_ece71f25e6ae314e) } +func init() { proto.RegisterFile("v2/container/grpc/types.proto", fileDescriptor_3bfd95a81c72c35c) } -var fileDescriptor_ece71f25e6ae314e = []byte{ - // 357 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xcd, 0x4a, 0xc3, 0x40, - 0x10, 0x36, 0xad, 0xd5, 0x66, 0xab, 0x58, 0x52, 0x7f, 0x42, 0x85, 0x10, 0x3d, 0xe5, 0xd2, 0x0d, - 0xa4, 0x17, 0xc1, 0x53, 0x55, 0xc4, 0x82, 0x68, 0x89, 0x37, 0x2f, 0x65, 0xb3, 0x9d, 0xd6, 0xc5, - 0x74, 0x77, 0xc9, 0x6e, 0x23, 0x7d, 0x13, 0x9f, 0xc1, 0x97, 0xf0, 0xea, 0xd1, 0x47, 0x90, 0xfa, - 0x22, 0x92, 0x84, 0xc6, 0x08, 0xde, 0x66, 0xbe, 0xfd, 0xbe, 0x9d, 0xef, 0x9b, 0x41, 0x76, 0x1a, - 0xf8, 0x54, 0x70, 0x4d, 0x18, 0x87, 0xc4, 0xd7, 0x4b, 0x09, 0x0a, 0xcb, 0x44, 0x68, 0x61, 0x75, - 0x38, 0x08, 0x3c, 0x55, 0x38, 0x0d, 0x70, 0x49, 0xe8, 0x1e, 0xa4, 0x81, 0xcf, 0x41, 0xcf, 0x89, - 0xac, 0x72, 0xbb, 0x9d, 0x34, 0xf0, 0x13, 0x98, 0xaa, 0x2a, 0x78, 0xfa, 0x5e, 0x43, 0xe6, 0xe5, - 0x5a, 0x69, 0x05, 0xa8, 0x29, 0x5e, 0x38, 0x24, 0x63, 0x36, 0xb1, 0x0d, 0xd7, 0xf0, 0x5a, 0xc1, - 0x11, 0xfe, 0x9d, 0x90, 0x89, 0xf1, 0x7d, 0xf6, 0x3e, 0xbc, 0x0a, 0xb7, 0x73, 0xe2, 0x70, 0x62, - 0xed, 0xa3, 0x06, 0x17, 0x9c, 0x82, 0x5d, 0x73, 0x0d, 0x6f, 0x27, 0x2c, 0x1a, 0xeb, 0x18, 0x99, - 0x11, 0x51, 0x8c, 0x8e, 0x09, 0x8d, 0xed, 0xba, 0x6b, 0x78, 0xbb, 0x61, 0x33, 0x07, 0x06, 0x34, - 0xb6, 0x6e, 0x10, 0x22, 0x5a, 0x27, 0x2c, 0x5a, 0x68, 0x50, 0xf6, 0xa6, 0x5b, 0xf7, 0x5a, 0x81, - 0x87, 0xff, 0x89, 0x82, 0x4b, 0x6b, 0x78, 0xb0, 0x16, 0x84, 0x15, 0xad, 0x75, 0x8b, 0xda, 0x32, - 0x26, 0x14, 0xe6, 0xc0, 0xf5, 0x58, 0x8a, 0x98, 0xd1, 0xa5, 0xdd, 0xc8, 0x8d, 0x9f, 0x54, 0xfe, - 0x2b, 0x96, 0x81, 0x47, 0x6b, 0xe6, 0x28, 0x27, 0x86, 0x7b, 0xf2, 0x2f, 0xd0, 0xed, 0x23, 0xb3, - 0x1c, 0x63, 0xb5, 0x51, 0xfd, 0x19, 0x96, 0xf9, 0x1a, 0xcc, 0x30, 0x2b, 0xb3, 0xa4, 0x29, 0x89, - 0x17, 0x45, 0x52, 0x33, 0x2c, 0x9a, 0x0b, 0xfa, 0xb1, 0x72, 0x8c, 0xcf, 0x95, 0x63, 0x7c, 0xad, - 0x1c, 0xe3, 0xf5, 0xdb, 0xd9, 0x78, 0x3c, 0x9b, 0x31, 0xfd, 0xb4, 0x88, 0x30, 0x15, 0x73, 0x9f, - 0x2b, 0x49, 0x69, 0x6f, 0x02, 0xa9, 0xcf, 0x41, 0x4c, 0x55, 0x8f, 0x48, 0xd6, 0x9b, 0x09, 0xbf, - 0x7a, 0xd0, 0xf3, 0xb2, 0x7a, 0xab, 0x1d, 0xde, 0x81, 0xb8, 0x7e, 0xc0, 0x83, 0xd1, 0x30, 0xf3, - 0x5d, 0xa6, 0x8f, 0xb6, 0xf2, 0x6b, 0xf5, 0x7f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x38, 0xf7, 0x99, - 0x45, 0x0a, 0x02, 0x00, 0x00, +var fileDescriptor_3bfd95a81c72c35c = []byte{ + // 363 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x51, 0xc1, 0x4e, 0xea, 0x40, + 0x14, 0x7d, 0x85, 0xc7, 0x7b, 0x74, 0xd0, 0x48, 0xaa, 0xd1, 0xa6, 0xc6, 0xa6, 0xba, 0xea, 0x86, + 0x99, 0xa4, 0x2c, 0x8d, 0x0b, 0xd4, 0x18, 0x49, 0x8c, 0x92, 0xba, 0x73, 0x43, 0xa6, 0xc3, 0x05, + 0x1a, 0xcb, 0xcc, 0xa4, 0x33, 0xd4, 0xf0, 0x27, 0x7e, 0x83, 0x3f, 0xe1, 0xd6, 0xa5, 0x9f, 0x60, + 0xf0, 0x47, 0x4c, 0xdb, 0x50, 0x31, 0xb8, 0x9b, 0x3b, 0xf7, 0xdc, 0x73, 0xcf, 0x39, 0x17, 0x1d, + 0x65, 0x01, 0x61, 0x82, 0x6b, 0x1a, 0x73, 0x48, 0xc9, 0x24, 0x95, 0x8c, 0xe8, 0x85, 0x04, 0x85, + 0x65, 0x2a, 0xb4, 0xb0, 0x76, 0x39, 0x08, 0x3c, 0x56, 0x38, 0x0b, 0x70, 0x85, 0x72, 0x9c, 0x2c, + 0x20, 0x1c, 0xf4, 0x8c, 0xca, 0x8d, 0x01, 0xc7, 0xce, 0x02, 0x92, 0xc2, 0x58, 0x6d, 0x74, 0x4e, + 0x5e, 0x6b, 0xc8, 0xbc, 0x58, 0x71, 0x58, 0x01, 0x6a, 0x8a, 0x27, 0x0e, 0xe9, 0x30, 0x1e, 0xd9, + 0x86, 0x67, 0xf8, 0xad, 0xe0, 0x00, 0x7f, 0xef, 0xca, 0x19, 0xf0, 0x5d, 0xde, 0xef, 0x5f, 0x86, + 0xff, 0x0b, 0x60, 0x7f, 0x64, 0xed, 0xa1, 0x06, 0x17, 0x9c, 0x81, 0x5d, 0xf3, 0x0c, 0x7f, 0x2b, + 0x2c, 0x0b, 0xeb, 0x10, 0x99, 0x11, 0x55, 0x31, 0x1b, 0x52, 0x96, 0xd8, 0x75, 0xcf, 0xf0, 0xb7, + 0xc3, 0x66, 0xf1, 0xd1, 0x63, 0x89, 0x75, 0x8d, 0x10, 0xd5, 0x3a, 0x8d, 0xa3, 0xb9, 0x06, 0x65, + 0xff, 0xf5, 0xea, 0x7e, 0x2b, 0xf0, 0xf1, 0x2f, 0xa6, 0x70, 0x25, 0x0d, 0xf7, 0x56, 0x03, 0xe1, + 0xda, 0xac, 0x75, 0x83, 0xda, 0x32, 0xa1, 0x0c, 0x66, 0xc0, 0xf5, 0x50, 0x8a, 0x24, 0x66, 0x0b, + 0xbb, 0x51, 0x08, 0x3f, 0x5e, 0xe3, 0x2b, 0x63, 0xc1, 0x83, 0x15, 0x72, 0x50, 0x00, 0xc3, 0x1d, + 0xf9, 0xf3, 0xc3, 0xe9, 0x22, 0xb3, 0x5a, 0x63, 0xb5, 0x51, 0xfd, 0x11, 0x16, 0x45, 0x0c, 0x66, + 0x98, 0x3f, 0x73, 0xa7, 0x19, 0x4d, 0xe6, 0xa5, 0x53, 0x33, 0x2c, 0x8b, 0xf3, 0xe9, 0xdb, 0xd2, + 0x35, 0xde, 0x97, 0xae, 0xf1, 0xb1, 0x74, 0x8d, 0xe7, 0x4f, 0xf7, 0xcf, 0xc3, 0xd9, 0x24, 0xd6, + 0xd3, 0x79, 0x84, 0x99, 0x98, 0x11, 0xae, 0x24, 0x63, 0x9d, 0x11, 0x64, 0x84, 0x83, 0x18, 0xab, + 0x0e, 0x95, 0x71, 0x67, 0x22, 0xc8, 0xc6, 0x7d, 0x4f, 0xab, 0xf2, 0xa5, 0xb6, 0x7f, 0x0b, 0xe2, + 0xea, 0x1e, 0xf7, 0x06, 0xfd, 0x5c, 0x7c, 0x15, 0x41, 0xf4, 0xaf, 0x38, 0x59, 0xf7, 0x2b, 0x00, + 0x00, 0xff, 0xff, 0x83, 0x61, 0x0e, 0xc4, 0x1e, 0x02, 0x00, 0x00, } func (m *Container) Marshal() (dAtA []byte, err error) { @@ -452,7 +452,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -575,7 +575,7 @@ func (m *Container) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.PlacementPolicy == nil { - m.PlacementPolicy = &netmap.PlacementPolicy{} + m.PlacementPolicy = &grpc1.PlacementPolicy{} } if err := m.PlacementPolicy.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/v2/convert.go b/v2/convert.go index 8cc95a6..5ec3cc8 100644 --- a/v2/convert.go +++ b/v2/convert.go @@ -1,351 +1 @@ package v2 - -import ( - "github.com/nspcc-dev/neofs-api-go/v2/accounting" - "github.com/nspcc-dev/neofs-api-go/v2/refs" - "github.com/nspcc-dev/neofs-api-go/v2/service" -) - -func SignatureToGRPCMessage(s *Signature) *service.Signature { - if s == nil { - return nil - } - - m := new(service.Signature) - - m.SetKey(s.GetKey()) - m.SetSign(s.GetSign()) - - return m -} - -func SignatureFromGRPCMessage(m *service.Signature) *Signature { - if m == nil { - return nil - } - - s := new(Signature) - - s.SetKey(m.GetKey()) - s.SetSign(m.GetSign()) - - return s -} - -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 -} - -func OwnerIDToGRPCMessage(o *OwnerID) *refs.OwnerID { - if o == nil { - return nil - } - - m := new(refs.OwnerID) - - m.SetValue(o.GetValue()) - - return m -} - -func OwnerIDFromGRPCMessage(m *refs.OwnerID) *OwnerID { - if m == nil { - return nil - } - - o := new(OwnerID) - - o.SetValue(m.GetValue()) - - return o -} - -func BalanceRequestBodyToGRPCMessage(b *BalanceRequestBody) *accounting.BalanceRequest_Body { - if b == nil { - return nil - } - - m := new(accounting.BalanceRequest_Body) - - m.SetOwnerId( - OwnerIDToGRPCMessage(b.GetOwnerID()), - ) - - return m -} - -func BalanceRequestBodyFromGRPCMessage(m *accounting.BalanceRequest_Body) *BalanceRequestBody { - if m == nil { - return nil - } - - b := new(BalanceRequestBody) - - b.SetOwnerID( - OwnerIDFromGRPCMessage(m.GetOwnerId()), - ) - - return b -} - -func headersToGRPC( - src interface { - GetRequestMetaHeader() *RequestMetaHeader - GetRequestVerificationHeader() *RequestVerificationHeader - }, - dst interface { - SetMetaHeader(*service.RequestMetaHeader) - SetVerifyHeader(*service.RequestVerificationHeader) - }, -) { - dst.SetMetaHeader( - RequestMetaHeaderToGRPCMessage(src.GetRequestMetaHeader()), - ) - - dst.SetVerifyHeader( - RequestVerificationHeaderToGRPCMessage(src.GetRequestVerificationHeader()), - ) -} - -func headersFromGRPC( - src interface { - GetMetaHeader() *service.RequestMetaHeader - GetVerifyHeader() *service.RequestVerificationHeader - }, - dst interface { - SetRequestMetaHeader(*RequestMetaHeader) - SetRequestVerificationHeader(*RequestVerificationHeader) - }, -) { - dst.SetRequestMetaHeader( - RequestMetaHeaderFromGRPCMessage(src.GetMetaHeader()), - ) - - dst.SetRequestVerificationHeader( - 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/netmap/marshal.go b/v2/netmap/grpc/marshal.go similarity index 100% rename from v2/netmap/marshal.go rename to v2/netmap/grpc/marshal.go diff --git a/v2/netmap/types.go b/v2/netmap/grpc/types.go similarity index 100% rename from v2/netmap/types.go rename to v2/netmap/grpc/types.go diff --git a/v2/netmap/types.pb.go b/v2/netmap/grpc/types.pb.go similarity index 92% rename from v2/netmap/types.pb.go rename to v2/netmap/grpc/types.pb.go index bfc2e9e..2893490 100644 --- a/v2/netmap/types.pb.go +++ b/v2/netmap/grpc/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/netmap/types.proto +// source: v2/netmap/grpc/types.proto package netmap @@ -75,7 +75,7 @@ func (x PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation) String() stri } func (PlacementPolicy_FilterGroup_Filter_SimpleFilter_Operation) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 0, 0} + return fileDescriptor_91a1332b2376641a, []int{0, 0, 0, 0, 0} } // Represents the enumeration of various states of the NeoFS node. @@ -107,7 +107,7 @@ func (x NodeInfo_State) String() string { } func (NodeInfo_State) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{1, 0} + return fileDescriptor_91a1332b2376641a, []int{1, 0} } // Set of rules to select a subset of nodes able to store container's objects @@ -125,7 +125,7 @@ func (m *PlacementPolicy) Reset() { *m = PlacementPolicy{} } func (m *PlacementPolicy) String() string { return proto.CompactTextString(m) } func (*PlacementPolicy) ProtoMessage() {} func (*PlacementPolicy) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0} + return fileDescriptor_91a1332b2376641a, []int{0} } func (m *PlacementPolicy) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -185,7 +185,7 @@ func (m *PlacementPolicy_FilterGroup) Reset() { *m = PlacementPolicy_Fil func (m *PlacementPolicy_FilterGroup) String() string { return proto.CompactTextString(m) } func (*PlacementPolicy_FilterGroup) ProtoMessage() {} func (*PlacementPolicy_FilterGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0} + return fileDescriptor_91a1332b2376641a, []int{0, 0} } func (m *PlacementPolicy_FilterGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -250,7 +250,7 @@ func (m *PlacementPolicy_FilterGroup_Filter) Reset() { *m = PlacementPol func (m *PlacementPolicy_FilterGroup_Filter) String() string { return proto.CompactTextString(m) } func (*PlacementPolicy_FilterGroup_Filter) ProtoMessage() {} func (*PlacementPolicy_FilterGroup_Filter) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0} + return fileDescriptor_91a1332b2376641a, []int{0, 0, 0} } func (m *PlacementPolicy_FilterGroup_Filter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -316,7 +316,7 @@ func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) String() string { } func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter) ProtoMessage() {} func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 0} + return fileDescriptor_91a1332b2376641a, []int{0, 0, 0, 0} } func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -416,7 +416,7 @@ func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) String() } func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) ProtoMessage() {} func (*PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 0, 0, 0} + return fileDescriptor_91a1332b2376641a, []int{0, 0, 0, 0, 0} } func (m *PlacementPolicy_FilterGroup_Filter_SimpleFilter_SimpleFilters) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -467,7 +467,7 @@ func (m *PlacementPolicy_FilterGroup_Selector) Reset() { *m = PlacementP func (m *PlacementPolicy_FilterGroup_Selector) String() string { return proto.CompactTextString(m) } func (*PlacementPolicy_FilterGroup_Selector) ProtoMessage() {} func (*PlacementPolicy_FilterGroup_Selector) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{0, 0, 1} + return fileDescriptor_91a1332b2376641a, []int{0, 0, 1} } func (m *PlacementPolicy_FilterGroup_Selector) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -529,7 +529,7 @@ func (m *NodeInfo) Reset() { *m = NodeInfo{} } func (m *NodeInfo) String() string { return proto.CompactTextString(m) } func (*NodeInfo) ProtoMessage() {} func (*NodeInfo) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{1} + return fileDescriptor_91a1332b2376641a, []int{1} } func (m *NodeInfo) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -601,7 +601,7 @@ func (m *NodeInfo_Attribute) Reset() { *m = NodeInfo_Attribute{} } func (m *NodeInfo_Attribute) String() string { return proto.CompactTextString(m) } func (*NodeInfo_Attribute) ProtoMessage() {} func (*NodeInfo_Attribute) Descriptor() ([]byte, []int) { - return fileDescriptor_1207dc80bd67ddec, []int{1, 0} + return fileDescriptor_91a1332b2376641a, []int{1, 0} } func (m *NodeInfo_Attribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -657,52 +657,52 @@ func init() { proto.RegisterType((*NodeInfo_Attribute)(nil), "neo.fs.v2.netmap.NodeInfo.Attribute") } -func init() { proto.RegisterFile("v2/netmap/types.proto", fileDescriptor_1207dc80bd67ddec) } +func init() { proto.RegisterFile("v2/netmap/grpc/types.proto", fileDescriptor_91a1332b2376641a) } -var fileDescriptor_1207dc80bd67ddec = []byte{ - // 660 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xc1, 0x6e, 0xd3, 0x4c, - 0x10, 0xae, 0xed, 0xc4, 0x69, 0x26, 0xcd, 0x5f, 0x6b, 0xff, 0x16, 0x99, 0x48, 0x84, 0x28, 0xe2, - 0x90, 0x4b, 0x1c, 0xe1, 0xa2, 0x5e, 0x38, 0xa5, 0xd4, 0x29, 0x51, 0x2b, 0x3b, 0x38, 0xe1, 0xd2, - 0x1e, 0x22, 0xc7, 0x59, 0xa7, 0x16, 0x8e, 0xd7, 0xf2, 0xae, 0x23, 0xf2, 0x26, 0xbc, 0x02, 0x3c, - 0x02, 0x07, 0xae, 0x70, 0xe0, 0xc0, 0x23, 0xa0, 0xf2, 0x22, 0xc8, 0xeb, 0x38, 0x4d, 0x0b, 0x42, - 0x2a, 0xe5, 0xf4, 0xf9, 0x9b, 0xd9, 0xf9, 0xc6, 0x33, 0xfe, 0xbc, 0xb0, 0xbf, 0xd0, 0x3b, 0x21, - 0x66, 0x73, 0x27, 0xea, 0xb0, 0x65, 0x84, 0xa9, 0x16, 0xc5, 0x84, 0x11, 0xa4, 0x84, 0x98, 0x68, - 0x1e, 0xd5, 0x16, 0xba, 0x96, 0x65, 0x9b, 0x9f, 0x4b, 0xb0, 0x3b, 0x08, 0x1c, 0x17, 0xcf, 0x71, - 0xc8, 0x06, 0x24, 0xf0, 0xdd, 0x25, 0x7a, 0x0c, 0x95, 0x18, 0x47, 0xc1, 0xd8, 0x73, 0x5c, 0x46, - 0x62, 0x55, 0x68, 0x08, 0xad, 0xaa, 0x0d, 0x69, 0xa8, 0xc7, 0x23, 0xc8, 0x86, 0xaa, 0xe7, 0x07, - 0x0c, 0xc7, 0xe3, 0x59, 0x4c, 0x92, 0x88, 0xaa, 0x62, 0x43, 0x6a, 0x55, 0xf4, 0xb6, 0x76, 0x5b, - 0x5e, 0xbb, 0x25, 0xad, 0xf5, 0x78, 0xd9, 0x49, 0x5a, 0x65, 0xef, 0x78, 0xd7, 0x84, 0xd6, 0x3e, - 0xc9, 0x50, 0xd9, 0xc8, 0x22, 0x13, 0x4a, 0x59, 0x9e, 0xaa, 0x02, 0x57, 0x7f, 0x76, 0x27, 0xf5, - 0xd5, 0xb3, 0x9d, 0x8b, 0xa0, 0x11, 0x94, 0x29, 0x0e, 0x70, 0xfa, 0xfe, 0xf9, 0xfb, 0x1e, 0xde, - 0x4d, 0x71, 0xb8, 0x2a, 0xb7, 0xaf, 0x85, 0x90, 0x0a, 0x25, 0xfc, 0xd6, 0x0d, 0x92, 0x29, 0x56, - 0xa5, 0x86, 0xd4, 0xaa, 0xda, 0x39, 0xad, 0x7d, 0x2c, 0x80, 0x9c, 0x55, 0x23, 0x05, 0xa4, 0x37, - 0x78, 0xc9, 0xf7, 0x58, 0xb6, 0xd3, 0x47, 0x64, 0x81, 0xe0, 0xa9, 0x62, 0x43, 0x68, 0x55, 0xf4, - 0xee, 0xdf, 0x8c, 0xa5, 0x0d, 0xfd, 0x79, 0x14, 0xe0, 0xd5, 0x8c, 0x82, 0x57, 0xfb, 0x2a, 0xc1, - 0xce, 0x66, 0x0c, 0x5d, 0x80, 0x48, 0x22, 0xde, 0xf2, 0x3f, 0xfd, 0xf4, 0xde, 0x2d, 0x34, 0x2b, - 0xc2, 0xb1, 0xc3, 0x7c, 0x12, 0xda, 0x22, 0x89, 0xd0, 0x03, 0x28, 0x2e, 0x9c, 0x20, 0xc1, 0x7c, - 0x84, 0xf2, 0xcb, 0x2d, 0x3b, 0xa3, 0xe8, 0x12, 0x64, 0x6f, 0xec, 0xc4, 0x33, 0xaa, 0x4a, 0x7c, - 0x36, 0xeb, 0xfe, 0x8d, 0x37, 0x09, 0x4d, 0x3b, 0x79, 0xdd, 0x78, 0x46, 0x6b, 0x01, 0x54, 0x6f, - 0x64, 0xd0, 0xc5, 0x6d, 0xbb, 0xfc, 0x83, 0xbd, 0xe6, 0x8a, 0xcd, 0x19, 0x94, 0xd7, 0x0b, 0x40, - 0x0f, 0x61, 0xdf, 0x1a, 0x18, 0x76, 0x77, 0xd4, 0xb7, 0xcc, 0xf1, 0x6b, 0x73, 0x38, 0x30, 0x5e, - 0xf4, 0x7b, 0x7d, 0xe3, 0x58, 0xd9, 0x42, 0x32, 0x88, 0xc6, 0x2b, 0x45, 0x48, 0xd1, 0x34, 0x14, - 0x31, 0xc5, 0x93, 0x91, 0x22, 0x71, 0x34, 0x94, 0x42, 0x8a, 0x67, 0x23, 0xa5, 0xc8, 0xd1, 0x50, - 0xe4, 0x14, 0x2d, 0x5b, 0x29, 0xa1, 0x12, 0x48, 0x5d, 0xf3, 0x58, 0xd9, 0x3e, 0x92, 0xa1, 0x90, - 0xae, 0xaf, 0xa6, 0xc3, 0x76, 0xee, 0x36, 0xb4, 0x07, 0x45, 0x97, 0x24, 0x21, 0x5b, 0xfd, 0x87, - 0x19, 0xc9, 0x3d, 0x25, 0xae, 0x3d, 0xd5, 0x7c, 0x2f, 0xc2, 0xb6, 0x49, 0xa6, 0xb8, 0x1f, 0x7a, - 0x24, 0xf5, 0xa5, 0x33, 0x9d, 0xc6, 0x98, 0xd2, 0x95, 0xed, 0x72, 0x8a, 0x1e, 0x01, 0x44, 0xc9, - 0x24, 0xf0, 0xdd, 0x71, 0x5e, 0xbf, 0x63, 0x97, 0xb3, 0xc8, 0x29, 0x5e, 0xa2, 0x63, 0x00, 0x87, - 0xb1, 0xd8, 0x9f, 0x24, 0x0c, 0x53, 0xee, 0xe9, 0x8a, 0xfe, 0xe4, 0xd7, 0x55, 0xe6, 0x8d, 0xb4, - 0x6e, 0x7e, 0xd8, 0xde, 0xa8, 0x43, 0x87, 0x50, 0xa4, 0xcc, 0x61, 0x58, 0x2d, 0x70, 0x03, 0x36, - 0xfe, 0x20, 0x30, 0x4c, 0xcf, 0xd9, 0xd9, 0xf1, 0xda, 0x01, 0x94, 0xd7, 0x82, 0xbf, 0xf9, 0x6d, - 0xf6, 0x6e, 0xf8, 0x6e, 0xe5, 0xba, 0xe6, 0x53, 0x28, 0x72, 0x11, 0xb4, 0x0b, 0x95, 0x9b, 0xdf, - 0x03, 0x40, 0xb6, 0xcc, 0xb3, 0xbe, 0x69, 0x28, 0x02, 0xaa, 0x40, 0xc9, 0xea, 0xf5, 0x38, 0x11, - 0x8f, 0xce, 0xbf, 0x5c, 0xd5, 0x85, 0x6f, 0x57, 0x75, 0xe1, 0xfb, 0x55, 0x5d, 0x78, 0xf7, 0xa3, - 0xbe, 0x75, 0xae, 0xcf, 0x7c, 0x76, 0x99, 0x4c, 0x34, 0x97, 0xcc, 0x3b, 0x21, 0x8d, 0x5c, 0xb7, - 0x3d, 0xc5, 0x8b, 0x4e, 0x88, 0x89, 0x47, 0xdb, 0x4e, 0xe4, 0xb7, 0x67, 0xa4, 0xb3, 0xbe, 0x52, - 0x9f, 0x67, 0xf0, 0x41, 0xfc, 0xdf, 0xc4, 0xa4, 0x37, 0xd4, 0xba, 0x83, 0x7e, 0x3a, 0x99, 0xc9, - 0xa3, 0x13, 0x99, 0x5f, 0xb5, 0x07, 0x3f, 0x03, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xc4, 0x82, 0xde, - 0x83, 0x05, 0x00, 0x00, +var fileDescriptor_91a1332b2376641a = []byte{ + // 663 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xac, 0x54, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xae, 0xed, 0xc4, 0x69, 0x26, 0x0d, 0xb5, 0x96, 0x82, 0x4c, 0x24, 0x42, 0x14, 0x71, 0xc8, + 0x25, 0x8e, 0x48, 0x51, 0x39, 0x70, 0x4a, 0xa9, 0x53, 0xa2, 0x56, 0x76, 0xd8, 0x84, 0x0b, 0x3d, + 0x44, 0x8e, 0xb3, 0x4e, 0x2d, 0x1c, 0xaf, 0xe5, 0xdd, 0x44, 0xe4, 0x4d, 0x78, 0x05, 0x78, 0x04, + 0x0e, 0x5c, 0xe1, 0xc0, 0x81, 0x47, 0x40, 0xe5, 0x45, 0x90, 0xd7, 0x71, 0x9b, 0x14, 0x84, 0x54, + 0xca, 0x69, 0xf6, 0x9b, 0x9f, 0x6f, 0x3c, 0xe3, 0x6f, 0x17, 0x2a, 0x8b, 0x76, 0x2b, 0x24, 0x7c, + 0xe6, 0x44, 0xad, 0x69, 0x1c, 0xb9, 0x2d, 0xbe, 0x8c, 0x08, 0x33, 0xa2, 0x98, 0x72, 0x8a, 0xb4, + 0x90, 0x50, 0xc3, 0x63, 0xc6, 0xa2, 0x6d, 0xa4, 0x29, 0xf5, 0x2f, 0x05, 0xd8, 0xed, 0x07, 0x8e, + 0x4b, 0x66, 0x24, 0xe4, 0x7d, 0x1a, 0xf8, 0xee, 0x12, 0x3d, 0x82, 0x52, 0x4c, 0xa2, 0x60, 0xe4, + 0x39, 0x2e, 0xa7, 0xb1, 0x2e, 0xd5, 0xa4, 0x46, 0x19, 0x43, 0xe2, 0xea, 0x0a, 0x0f, 0xc2, 0x50, + 0xf6, 0xfc, 0x80, 0x93, 0x78, 0x34, 0x8d, 0xe9, 0x3c, 0x62, 0xba, 0x5c, 0x53, 0x1a, 0xa5, 0x76, + 0xd3, 0xb8, 0x4e, 0x6f, 0x5c, 0xa3, 0x36, 0xba, 0xa2, 0xec, 0x38, 0xa9, 0xc2, 0x3b, 0xde, 0x15, + 0x60, 0x95, 0xcf, 0x2a, 0x94, 0xd6, 0xa2, 0xc8, 0x82, 0x42, 0x1a, 0x67, 0xba, 0x24, 0xd8, 0x9f, + 0xde, 0x88, 0x7d, 0x75, 0xc6, 0x19, 0x09, 0x1a, 0x42, 0x91, 0x91, 0x80, 0x24, 0xdf, 0x9f, 0x7d, + 0xef, 0xc1, 0xcd, 0x18, 0x07, 0xab, 0x72, 0x7c, 0x45, 0x84, 0x74, 0x28, 0x90, 0x77, 0x6e, 0x30, + 0x9f, 0x10, 0x5d, 0xa9, 0x29, 0x8d, 0x32, 0xce, 0x60, 0xe5, 0x53, 0x0e, 0xd4, 0xb4, 0x1a, 0x69, + 0xa0, 0xbc, 0x25, 0x4b, 0xb1, 0xc7, 0x22, 0x4e, 0x8e, 0xc8, 0x06, 0xc9, 0xd3, 0xe5, 0x9a, 0xd4, + 0x28, 0xb5, 0x3b, 0xff, 0x32, 0x96, 0x31, 0xf0, 0x67, 0x51, 0x40, 0x56, 0x33, 0x4a, 0x5e, 0xe5, + 0x9b, 0x02, 0x3b, 0xeb, 0x3e, 0x74, 0x06, 0x32, 0x8d, 0x44, 0xcb, 0x3b, 0xed, 0x93, 0x5b, 0xb7, + 0x30, 0xec, 0x88, 0xc4, 0x0e, 0xf7, 0x69, 0x88, 0x65, 0x1a, 0xa1, 0xfb, 0x90, 0x5f, 0x38, 0xc1, + 0x9c, 0x88, 0x11, 0x8a, 0x2f, 0xb7, 0x70, 0x0a, 0xd1, 0x39, 0xa8, 0xde, 0xc8, 0x89, 0xa7, 0x4c, + 0x57, 0xc4, 0x6c, 0xf6, 0xed, 0x1b, 0xaf, 0x03, 0x96, 0x74, 0xf2, 0x3a, 0xf1, 0x94, 0x55, 0x02, + 0x28, 0x6f, 0x44, 0xd0, 0xd9, 0x75, 0xb9, 0xfc, 0x87, 0xbd, 0x66, 0x8c, 0xf5, 0x29, 0x14, 0x2f, + 0x17, 0x80, 0x1e, 0xc0, 0x3d, 0xbb, 0x6f, 0xe2, 0xce, 0xb0, 0x67, 0x5b, 0xa3, 0xd7, 0xd6, 0xa0, + 0x6f, 0xbe, 0xe8, 0x75, 0x7b, 0xe6, 0x91, 0xb6, 0x85, 0x54, 0x90, 0xcd, 0x57, 0x9a, 0x94, 0x58, + 0xcb, 0xd4, 0xe4, 0xc4, 0x1e, 0x0f, 0x35, 0x45, 0x58, 0x53, 0xcb, 0x25, 0xf6, 0x74, 0xa8, 0xe5, + 0x85, 0x35, 0x35, 0x35, 0xb1, 0x36, 0xd6, 0x0a, 0xa8, 0x00, 0x4a, 0xc7, 0x3a, 0xd2, 0xb6, 0x0f, + 0x55, 0xc8, 0x25, 0xeb, 0xab, 0xb4, 0x61, 0x3b, 0x53, 0x1b, 0xda, 0x83, 0xbc, 0x4b, 0xe7, 0x21, + 0x5f, 0xdd, 0xc3, 0x14, 0x64, 0x9a, 0x92, 0x2f, 0x35, 0x55, 0xff, 0x20, 0xc3, 0xb6, 0x45, 0x27, + 0xa4, 0x17, 0x7a, 0x34, 0xd1, 0xa5, 0x33, 0x99, 0xc4, 0x84, 0xb1, 0x95, 0xec, 0x32, 0x88, 0x1e, + 0x02, 0x44, 0xf3, 0x71, 0xe0, 0xbb, 0xa3, 0xac, 0x7e, 0x07, 0x17, 0x53, 0xcf, 0x09, 0x59, 0xa2, + 0x23, 0x00, 0x87, 0xf3, 0xd8, 0x1f, 0xcf, 0x39, 0x61, 0x42, 0xd3, 0xa5, 0xf6, 0xe3, 0xdf, 0x57, + 0x99, 0x35, 0x32, 0x3a, 0x59, 0x32, 0x5e, 0xab, 0x43, 0x07, 0x90, 0x67, 0xdc, 0xe1, 0x44, 0xcf, + 0x09, 0x01, 0xd6, 0xfe, 0x42, 0x30, 0x48, 0xf2, 0x70, 0x9a, 0x5e, 0xd9, 0x87, 0xe2, 0x25, 0xe1, + 0x1f, 0xae, 0xcd, 0xde, 0x86, 0xee, 0x56, 0xaa, 0xab, 0x3f, 0x81, 0xbc, 0x20, 0x41, 0xbb, 0x50, + 0xda, 0xfc, 0x1f, 0x00, 0xaa, 0x6d, 0x9d, 0xf6, 0x2c, 0x53, 0x93, 0x50, 0x09, 0x0a, 0x76, 0xb7, + 0x2b, 0x80, 0x7c, 0x38, 0xfa, 0x7a, 0x51, 0x95, 0xbe, 0x5f, 0x54, 0xa5, 0x1f, 0x17, 0x55, 0xe9, + 0xfd, 0xcf, 0xea, 0xd6, 0x9b, 0x67, 0x53, 0x9f, 0x9f, 0xcf, 0xc7, 0x86, 0x4b, 0x67, 0xad, 0x90, + 0x45, 0xae, 0xdb, 0x9c, 0x90, 0x45, 0x2b, 0x24, 0xd4, 0x63, 0x4d, 0x27, 0xf2, 0x9b, 0x53, 0xda, + 0xda, 0x7c, 0x57, 0x9f, 0xa7, 0xe7, 0x8f, 0xf2, 0x5d, 0x8b, 0xd0, 0xee, 0xc0, 0xe8, 0xf4, 0x7b, + 0xc9, 0x78, 0x96, 0xf0, 0x8e, 0x55, 0xf1, 0xde, 0xee, 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x87, + 0xfe, 0x8e, 0x55, 0x8d, 0x05, 0x00, 0x00, } func (m *PlacementPolicy) Marshal() (dAtA []byte, err error) { diff --git a/v2/object/service.go b/v2/object/grpc/service.go similarity index 99% rename from v2/object/service.go rename to v2/object/grpc/service.go index eae7ae5..0372b3d 100644 --- a/v2/object/service.go +++ b/v2/object/grpc/service.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" ) // SetAddress sets address of the requested object. diff --git a/v2/object/service.pb.go b/v2/object/grpc/service.pb.go similarity index 89% rename from v2/object/service.pb.go rename to v2/object/grpc/service.pb.go index 1865e41..a6f18df 100644 --- a/v2/object/service.pb.go +++ b/v2/object/grpc/service.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/object/service.proto +// source: v2/object/grpc/service.proto package object @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" - service "github.com/nspcc-dev/neofs-api-go/v2/service" - grpc "google.golang.org/grpc" + grpc1 "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + grpc "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" + grpc2 "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" io "io" @@ -53,7 +53,7 @@ func (x SearchRequest_Body_Filter_MatchType) String() string { } func (SearchRequest_Body_Filter_MatchType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{8, 0, 0, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{8, 0, 0, 0} } // Get object request @@ -62,20 +62,20 @@ type GetRequest struct { Body *GetRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetRequest) Reset() { *m = GetRequest{} } func (m *GetRequest) String() string { return proto.CompactTextString(m) } func (*GetRequest) ProtoMessage() {} func (*GetRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{0} + return fileDescriptor_1d7d92b1e85e5b48, []int{0} } func (m *GetRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -111,14 +111,14 @@ func (m *GetRequest) GetBody() *GetRequest_Body { return nil } -func (m *GetRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *GetRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *GetRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -128,7 +128,7 @@ func (m *GetRequest) GetVerifyHeader() *service.RequestVerificationHeader { // Request body type GetRequest_Body struct { // Address of the requested object. - Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Address *grpc1.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Carries the raw option flag of the request. // Raw request is sent to receive only the objects // that are physically stored on the server. @@ -142,7 +142,7 @@ func (m *GetRequest_Body) Reset() { *m = GetRequest_Body{} } func (m *GetRequest_Body) String() string { return proto.CompactTextString(m) } func (*GetRequest_Body) ProtoMessage() {} func (*GetRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{0, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{0, 0} } func (m *GetRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -171,7 +171,7 @@ func (m *GetRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_GetRequest_Body proto.InternalMessageInfo -func (m *GetRequest_Body) GetAddress() *refs.Address { +func (m *GetRequest_Body) GetAddress() *grpc1.Address { if m != nil { return m.Address } @@ -191,21 +191,21 @@ type GetResponse struct { Body *GetResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetResponse) Reset() { *m = GetResponse{} } func (m *GetResponse) String() string { return proto.CompactTextString(m) } func (*GetResponse) ProtoMessage() {} func (*GetResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{1} + return fileDescriptor_1d7d92b1e85e5b48, []int{1} } func (m *GetResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -241,14 +241,14 @@ func (m *GetResponse) GetBody() *GetResponse_Body { return nil } -func (m *GetResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *GetResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *GetResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -272,7 +272,7 @@ func (m *GetResponse_Body) Reset() { *m = GetResponse_Body{} } func (m *GetResponse_Body) String() string { return proto.CompactTextString(m) } func (*GetResponse_Body) ProtoMessage() {} func (*GetResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{1, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{1, 0} } func (m *GetResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -349,9 +349,9 @@ func (*GetResponse_Body) XXX_OneofWrappers() []interface{} { // Initialization parameters of the object got from NeoFS. type GetResponse_Body_Init struct { // Object ID - ObjectId *refs.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` + ObjectId *grpc1.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` // Object signature - Signature *service.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` + Signature *grpc.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` // Object header. Header *Header `protobuf:"bytes,3,opt,name=header,proto3" json:"header,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -363,7 +363,7 @@ func (m *GetResponse_Body_Init) Reset() { *m = GetResponse_Body_Init{} } func (m *GetResponse_Body_Init) String() string { return proto.CompactTextString(m) } func (*GetResponse_Body_Init) ProtoMessage() {} func (*GetResponse_Body_Init) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{1, 0, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{1, 0, 0} } func (m *GetResponse_Body_Init) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -392,14 +392,14 @@ func (m *GetResponse_Body_Init) XXX_DiscardUnknown() { var xxx_messageInfo_GetResponse_Body_Init proto.InternalMessageInfo -func (m *GetResponse_Body_Init) GetObjectId() *refs.ObjectID { +func (m *GetResponse_Body_Init) GetObjectId() *grpc1.ObjectID { if m != nil { return m.ObjectId } return nil } -func (m *GetResponse_Body_Init) GetSignature() *service.Signature { +func (m *GetResponse_Body_Init) GetSignature() *grpc.Signature { if m != nil { return m.Signature } @@ -419,20 +419,20 @@ type PutRequest struct { Body *PutRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PutRequest) Reset() { *m = PutRequest{} } func (m *PutRequest) String() string { return proto.CompactTextString(m) } func (*PutRequest) ProtoMessage() {} func (*PutRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{2} + return fileDescriptor_1d7d92b1e85e5b48, []int{2} } func (m *PutRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -468,14 +468,14 @@ func (m *PutRequest) GetBody() *PutRequest_Body { return nil } -func (m *PutRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *PutRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *PutRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *PutRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -499,7 +499,7 @@ func (m *PutRequest_Body) Reset() { *m = PutRequest_Body{} } func (m *PutRequest_Body) String() string { return proto.CompactTextString(m) } func (*PutRequest_Body) ProtoMessage() {} func (*PutRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{2, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{2, 0} } func (m *PutRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -576,9 +576,9 @@ func (*PutRequest_Body) XXX_OneofWrappers() []interface{} { // Groups initialization parameters of object placement in NeoFS. type PutRequest_Body_Init struct { // Object ID, where available - ObjectId *refs.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` + ObjectId *grpc1.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` // Object signature, were available - Signature *service.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` + Signature *grpc.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` // Header of the object to save in the system. Header *Header `protobuf:"bytes,3,opt,name=header,proto3" json:"header,omitempty"` // Number of the object copies to store within the RPC call. @@ -594,7 +594,7 @@ func (m *PutRequest_Body_Init) Reset() { *m = PutRequest_Body_Init{} } func (m *PutRequest_Body_Init) String() string { return proto.CompactTextString(m) } func (*PutRequest_Body_Init) ProtoMessage() {} func (*PutRequest_Body_Init) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{2, 0, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{2, 0, 0} } func (m *PutRequest_Body_Init) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -623,14 +623,14 @@ func (m *PutRequest_Body_Init) XXX_DiscardUnknown() { var xxx_messageInfo_PutRequest_Body_Init proto.InternalMessageInfo -func (m *PutRequest_Body_Init) GetObjectId() *refs.ObjectID { +func (m *PutRequest_Body_Init) GetObjectId() *grpc1.ObjectID { if m != nil { return m.ObjectId } return nil } -func (m *PutRequest_Body_Init) GetSignature() *service.Signature { +func (m *PutRequest_Body_Init) GetSignature() *grpc.Signature { if m != nil { return m.Signature } @@ -657,21 +657,21 @@ type PutResponse struct { Body *PutResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PutResponse) Reset() { *m = PutResponse{} } func (m *PutResponse) String() string { return proto.CompactTextString(m) } func (*PutResponse) ProtoMessage() {} func (*PutResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{3} + return fileDescriptor_1d7d92b1e85e5b48, []int{3} } func (m *PutResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -707,14 +707,14 @@ func (m *PutResponse) GetBody() *PutResponse_Body { return nil } -func (m *PutResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *PutResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *PutResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *PutResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -725,17 +725,17 @@ func (m *PutResponse) GetVerifyHeader() *service.ResponseVerificationHeader { type PutResponse_Body struct { // Carries identifier of the saved object. // It is used to access an object in the container. - ObjectId *refs.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + ObjectId *grpc1.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *PutResponse_Body) Reset() { *m = PutResponse_Body{} } func (m *PutResponse_Body) String() string { return proto.CompactTextString(m) } func (*PutResponse_Body) ProtoMessage() {} func (*PutResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{3, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{3, 0} } func (m *PutResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -764,7 +764,7 @@ func (m *PutResponse_Body) XXX_DiscardUnknown() { var xxx_messageInfo_PutResponse_Body proto.InternalMessageInfo -func (m *PutResponse_Body) GetObjectId() *refs.ObjectID { +func (m *PutResponse_Body) GetObjectId() *grpc1.ObjectID { if m != nil { return m.ObjectId } @@ -777,20 +777,20 @@ type DeleteRequest struct { Body *DeleteRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *DeleteRequest) Reset() { *m = DeleteRequest{} } func (m *DeleteRequest) String() string { return proto.CompactTextString(m) } func (*DeleteRequest) ProtoMessage() {} func (*DeleteRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{4} + return fileDescriptor_1d7d92b1e85e5b48, []int{4} } func (m *DeleteRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -826,14 +826,14 @@ func (m *DeleteRequest) GetBody() *DeleteRequest_Body { return nil } -func (m *DeleteRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *DeleteRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *DeleteRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *DeleteRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -843,19 +843,19 @@ func (m *DeleteRequest) GetVerifyHeader() *service.RequestVerificationHeader { // Request body type DeleteRequest_Body struct { // Carries the address of the object to be deleted. - Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Address *grpc1.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Carries identifier the object owner. - OwnerId *refs.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + OwnerId *grpc1.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *DeleteRequest_Body) Reset() { *m = DeleteRequest_Body{} } func (m *DeleteRequest_Body) String() string { return proto.CompactTextString(m) } func (*DeleteRequest_Body) ProtoMessage() {} func (*DeleteRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{4, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{4, 0} } func (m *DeleteRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -884,14 +884,14 @@ func (m *DeleteRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_DeleteRequest_Body proto.InternalMessageInfo -func (m *DeleteRequest_Body) GetAddress() *refs.Address { +func (m *DeleteRequest_Body) GetAddress() *grpc1.Address { if m != nil { return m.Address } return nil } -func (m *DeleteRequest_Body) GetOwnerId() *refs.OwnerID { +func (m *DeleteRequest_Body) GetOwnerId() *grpc1.OwnerID { if m != nil { return m.OwnerId } @@ -905,21 +905,21 @@ type DeleteResponse struct { Body *DeleteResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *DeleteResponse) Reset() { *m = DeleteResponse{} } func (m *DeleteResponse) String() string { return proto.CompactTextString(m) } func (*DeleteResponse) ProtoMessage() {} func (*DeleteResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{5} + return fileDescriptor_1d7d92b1e85e5b48, []int{5} } func (m *DeleteResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -955,14 +955,14 @@ func (m *DeleteResponse) GetBody() *DeleteResponse_Body { return nil } -func (m *DeleteResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *DeleteResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *DeleteResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *DeleteResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -980,7 +980,7 @@ func (m *DeleteResponse_Body) Reset() { *m = DeleteResponse_Body{} } func (m *DeleteResponse_Body) String() string { return proto.CompactTextString(m) } func (*DeleteResponse_Body) ProtoMessage() {} func (*DeleteResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{5, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{5, 0} } func (m *DeleteResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1015,20 +1015,20 @@ type HeadRequest struct { Body *HeadRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HeadRequest) Reset() { *m = HeadRequest{} } func (m *HeadRequest) String() string { return proto.CompactTextString(m) } func (*HeadRequest) ProtoMessage() {} func (*HeadRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{6} + return fileDescriptor_1d7d92b1e85e5b48, []int{6} } func (m *HeadRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1064,14 +1064,14 @@ func (m *HeadRequest) GetBody() *HeadRequest_Body { return nil } -func (m *HeadRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *HeadRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *HeadRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *HeadRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1081,7 +1081,7 @@ func (m *HeadRequest) GetVerifyHeader() *service.RequestVerificationHeader { // Request body type HeadRequest_Body struct { // Address of the object with the requested header. - Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Address *grpc1.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Return only minimal header subset MainOnly bool `protobuf:"varint,2,opt,name=main_only,json=mainOnly,proto3" json:"main_only,omitempty"` // Carries the raw option flag of the request. @@ -1097,7 +1097,7 @@ func (m *HeadRequest_Body) Reset() { *m = HeadRequest_Body{} } func (m *HeadRequest_Body) String() string { return proto.CompactTextString(m) } func (*HeadRequest_Body) ProtoMessage() {} func (*HeadRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{6, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{6, 0} } func (m *HeadRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1126,7 +1126,7 @@ func (m *HeadRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_HeadRequest_Body proto.InternalMessageInfo -func (m *HeadRequest_Body) GetAddress() *refs.Address { +func (m *HeadRequest_Body) GetAddress() *grpc1.Address { if m != nil { return m.Address } @@ -1153,21 +1153,21 @@ type HeadResponse struct { Body *HeadResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *HeadResponse) Reset() { *m = HeadResponse{} } func (m *HeadResponse) String() string { return proto.CompactTextString(m) } func (*HeadResponse) ProtoMessage() {} func (*HeadResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{7} + return fileDescriptor_1d7d92b1e85e5b48, []int{7} } func (m *HeadResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1203,14 +1203,14 @@ func (m *HeadResponse) GetBody() *HeadResponse_Body { return nil } -func (m *HeadResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *HeadResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *HeadResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *HeadResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1234,7 +1234,7 @@ func (m *HeadResponse_Body) Reset() { *m = HeadResponse_Body{} } func (m *HeadResponse_Body) String() string { return proto.CompactTextString(m) } func (*HeadResponse_Body) ProtoMessage() {} func (*HeadResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{7, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{7, 0} } func (m *HeadResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1311,11 +1311,11 @@ func (*HeadResponse_Body) XXX_OneofWrappers() []interface{} { // Short header fields type HeadResponse_Body_ShortHeader struct { // Object format version. - Version *service.Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` + Version *grpc.Version `protobuf:"bytes,1,opt,name=version,proto3" json:"version,omitempty"` // Epoch when the object was created CreationEpoch uint64 `protobuf:"varint,2,opt,name=creation_epoch,json=creationEpoch,proto3" json:"creation_epoch,omitempty"` // Object's owner - OwnerId *refs.OwnerID `protobuf:"bytes,3,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + OwnerId *grpc1.OwnerID `protobuf:"bytes,3,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` // Type of the object payload content ObjectType ObjectType `protobuf:"varint,4,opt,name=object_type,json=objectType,proto3,enum=neo.fs.v2.object.ObjectType" json:"object_type,omitempty"` // Size of payload in bytes. @@ -1330,7 +1330,7 @@ func (m *HeadResponse_Body_ShortHeader) Reset() { *m = HeadResponse_Body func (m *HeadResponse_Body_ShortHeader) String() string { return proto.CompactTextString(m) } func (*HeadResponse_Body_ShortHeader) ProtoMessage() {} func (*HeadResponse_Body_ShortHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{7, 0, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{7, 0, 0} } func (m *HeadResponse_Body_ShortHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1359,7 +1359,7 @@ func (m *HeadResponse_Body_ShortHeader) XXX_DiscardUnknown() { var xxx_messageInfo_HeadResponse_Body_ShortHeader proto.InternalMessageInfo -func (m *HeadResponse_Body_ShortHeader) GetVersion() *service.Version { +func (m *HeadResponse_Body_ShortHeader) GetVersion() *grpc.Version { if m != nil { return m.Version } @@ -1373,7 +1373,7 @@ func (m *HeadResponse_Body_ShortHeader) GetCreationEpoch() uint64 { return 0 } -func (m *HeadResponse_Body_ShortHeader) GetOwnerId() *refs.OwnerID { +func (m *HeadResponse_Body_ShortHeader) GetOwnerId() *grpc1.OwnerID { if m != nil { return m.OwnerId } @@ -1400,20 +1400,20 @@ type SearchRequest struct { Body *SearchRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SearchRequest) Reset() { *m = SearchRequest{} } func (m *SearchRequest) String() string { return proto.CompactTextString(m) } func (*SearchRequest) ProtoMessage() {} func (*SearchRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{8} + return fileDescriptor_1d7d92b1e85e5b48, []int{8} } func (m *SearchRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1449,14 +1449,14 @@ func (m *SearchRequest) GetBody() *SearchRequest_Body { return nil } -func (m *SearchRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *SearchRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *SearchRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *SearchRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1466,7 +1466,7 @@ func (m *SearchRequest) GetVerifyHeader() *service.RequestVerificationHeader { // Request body type SearchRequest_Body struct { // Carries search container identifier. - ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + ContainerId *grpc1.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` // Version of the Query Language used Version uint32 `protobuf:"varint,2,opt,name=version,proto3" json:"version,omitempty"` // List of search expressions @@ -1480,7 +1480,7 @@ func (m *SearchRequest_Body) Reset() { *m = SearchRequest_Body{} } func (m *SearchRequest_Body) String() string { return proto.CompactTextString(m) } func (*SearchRequest_Body) ProtoMessage() {} func (*SearchRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{8, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{8, 0} } func (m *SearchRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1509,7 +1509,7 @@ func (m *SearchRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_SearchRequest_Body proto.InternalMessageInfo -func (m *SearchRequest_Body) GetContainerId() *refs.ContainerID { +func (m *SearchRequest_Body) GetContainerId() *grpc1.ContainerID { if m != nil { return m.ContainerId } @@ -1547,7 +1547,7 @@ func (m *SearchRequest_Body_Filter) Reset() { *m = SearchRequest_Body_Fi func (m *SearchRequest_Body_Filter) String() string { return proto.CompactTextString(m) } func (*SearchRequest_Body_Filter) ProtoMessage() {} func (*SearchRequest_Body_Filter) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{8, 0, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{8, 0, 0} } func (m *SearchRequest_Body_Filter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1603,21 +1603,21 @@ type SearchResponse struct { Body *SearchResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SearchResponse) Reset() { *m = SearchResponse{} } func (m *SearchResponse) String() string { return proto.CompactTextString(m) } func (*SearchResponse) ProtoMessage() {} func (*SearchResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{9} + return fileDescriptor_1d7d92b1e85e5b48, []int{9} } func (m *SearchResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1653,14 +1653,14 @@ func (m *SearchResponse) GetBody() *SearchResponse_Body { return nil } -func (m *SearchResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *SearchResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *SearchResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *SearchResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1670,17 +1670,17 @@ func (m *SearchResponse) GetVerifyHeader() *service.ResponseVerificationHeader { // Response body type SearchResponse_Body struct { // Carries list of object identifiers that match the search query - IdList []*refs.ObjectID `protobuf:"bytes,1,rep,name=id_list,json=idList,proto3" json:"id_list,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + IdList []*grpc1.ObjectID `protobuf:"bytes,1,rep,name=id_list,json=idList,proto3" json:"id_list,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *SearchResponse_Body) Reset() { *m = SearchResponse_Body{} } func (m *SearchResponse_Body) String() string { return proto.CompactTextString(m) } func (*SearchResponse_Body) ProtoMessage() {} func (*SearchResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{9, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{9, 0} } func (m *SearchResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1709,7 +1709,7 @@ func (m *SearchResponse_Body) XXX_DiscardUnknown() { var xxx_messageInfo_SearchResponse_Body proto.InternalMessageInfo -func (m *SearchResponse_Body) GetIdList() []*refs.ObjectID { +func (m *SearchResponse_Body) GetIdList() []*grpc1.ObjectID { if m != nil { return m.IdList } @@ -1731,7 +1731,7 @@ func (m *Range) Reset() { *m = Range{} } func (m *Range) String() string { return proto.CompactTextString(m) } func (*Range) ProtoMessage() {} func (*Range) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{10} + return fileDescriptor_1d7d92b1e85e5b48, []int{10} } func (m *Range) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1780,20 +1780,20 @@ type GetRangeRequest struct { Body *GetRangeRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetRangeRequest) Reset() { *m = GetRangeRequest{} } func (m *GetRangeRequest) String() string { return proto.CompactTextString(m) } func (*GetRangeRequest) ProtoMessage() {} func (*GetRangeRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{11} + return fileDescriptor_1d7d92b1e85e5b48, []int{11} } func (m *GetRangeRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1829,14 +1829,14 @@ func (m *GetRangeRequest) GetBody() *GetRangeRequest_Body { return nil } -func (m *GetRangeRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *GetRangeRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetRangeRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *GetRangeRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1846,7 +1846,7 @@ func (m *GetRangeRequest) GetVerifyHeader() *service.RequestVerificationHeader { // Request Body type GetRangeRequest_Body struct { // Address carries address of the object that contains the requested payload range. - Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Address *grpc1.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Range carries the parameters of the requested payload range. Range *Range `protobuf:"bytes,2,opt,name=range,proto3" json:"range,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -1858,7 +1858,7 @@ func (m *GetRangeRequest_Body) Reset() { *m = GetRangeRequest_Body{} } func (m *GetRangeRequest_Body) String() string { return proto.CompactTextString(m) } func (*GetRangeRequest_Body) ProtoMessage() {} func (*GetRangeRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{11, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{11, 0} } func (m *GetRangeRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1887,7 +1887,7 @@ func (m *GetRangeRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_GetRangeRequest_Body proto.InternalMessageInfo -func (m *GetRangeRequest_Body) GetAddress() *refs.Address { +func (m *GetRangeRequest_Body) GetAddress() *grpc1.Address { if m != nil { return m.Address } @@ -1907,21 +1907,21 @@ type GetRangeResponse struct { Body *GetRangeResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetRangeResponse) Reset() { *m = GetRangeResponse{} } func (m *GetRangeResponse) String() string { return proto.CompactTextString(m) } func (*GetRangeResponse) ProtoMessage() {} func (*GetRangeResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{12} + return fileDescriptor_1d7d92b1e85e5b48, []int{12} } func (m *GetRangeResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1957,14 +1957,14 @@ func (m *GetRangeResponse) GetBody() *GetRangeResponse_Body { return nil } -func (m *GetRangeResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *GetRangeResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetRangeResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *GetRangeResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -1984,7 +1984,7 @@ func (m *GetRangeResponse_Body) Reset() { *m = GetRangeResponse_Body{} } func (m *GetRangeResponse_Body) String() string { return proto.CompactTextString(m) } func (*GetRangeResponse_Body) ProtoMessage() {} func (*GetRangeResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{12, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{12, 0} } func (m *GetRangeResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2026,20 +2026,20 @@ type GetRangeHashRequest struct { Body *GetRangeHashRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetRangeHashRequest) Reset() { *m = GetRangeHashRequest{} } func (m *GetRangeHashRequest) String() string { return proto.CompactTextString(m) } func (*GetRangeHashRequest) ProtoMessage() {} func (*GetRangeHashRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{13} + return fileDescriptor_1d7d92b1e85e5b48, []int{13} } func (m *GetRangeHashRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2075,14 +2075,14 @@ func (m *GetRangeHashRequest) GetBody() *GetRangeHashRequest_Body { return nil } -func (m *GetRangeHashRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *GetRangeHashRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetRangeHashRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *GetRangeHashRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -2092,7 +2092,7 @@ func (m *GetRangeHashRequest) GetVerifyHeader() *service.RequestVerificationHead // Request body type GetRangeHashRequest_Body struct { // Carries address of the object that contains the requested payload range. - Address *refs.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` + Address *grpc1.Address `protobuf:"bytes,1,opt,name=address,proto3" json:"address,omitempty"` // Carries the list of object payload range to calculate homomorphic hash. Ranges []*Range `protobuf:"bytes,2,rep,name=ranges,proto3" json:"ranges,omitempty"` // Carries binary salt to XOR object payload ranges before hash calculation. @@ -2106,7 +2106,7 @@ func (m *GetRangeHashRequest_Body) Reset() { *m = GetRangeHashRequest_Bo func (m *GetRangeHashRequest_Body) String() string { return proto.CompactTextString(m) } func (*GetRangeHashRequest_Body) ProtoMessage() {} func (*GetRangeHashRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{13, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{13, 0} } func (m *GetRangeHashRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2135,7 +2135,7 @@ func (m *GetRangeHashRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_GetRangeHashRequest_Body proto.InternalMessageInfo -func (m *GetRangeHashRequest_Body) GetAddress() *refs.Address { +func (m *GetRangeHashRequest_Body) GetAddress() *grpc1.Address { if m != nil { return m.Address } @@ -2162,21 +2162,21 @@ type GetRangeHashResponse struct { Body *GetRangeHashResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *GetRangeHashResponse) Reset() { *m = GetRangeHashResponse{} } func (m *GetRangeHashResponse) String() string { return proto.CompactTextString(m) } func (*GetRangeHashResponse) ProtoMessage() {} func (*GetRangeHashResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{14} + return fileDescriptor_1d7d92b1e85e5b48, []int{14} } func (m *GetRangeHashResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2212,14 +2212,14 @@ func (m *GetRangeHashResponse) GetBody() *GetRangeHashResponse_Body { return nil } -func (m *GetRangeHashResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *GetRangeHashResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *GetRangeHashResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *GetRangeHashResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -2239,7 +2239,7 @@ func (m *GetRangeHashResponse_Body) Reset() { *m = GetRangeHashResponse_ func (m *GetRangeHashResponse_Body) String() string { return proto.CompactTextString(m) } func (*GetRangeHashResponse_Body) ProtoMessage() {} func (*GetRangeHashResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_6233c87a2945599e, []int{14, 0} + return fileDescriptor_1d7d92b1e85e5b48, []int{14, 0} } func (m *GetRangeHashResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -2312,107 +2312,107 @@ func init() { proto.RegisterType((*GetRangeHashResponse_Body)(nil), "neo.fs.v2.object.GetRangeHashResponse.Body") } -func init() { proto.RegisterFile("v2/object/service.proto", fileDescriptor_6233c87a2945599e) } +func init() { proto.RegisterFile("v2/object/grpc/service.proto", fileDescriptor_1d7d92b1e85e5b48) } -var fileDescriptor_6233c87a2945599e = []byte{ - // 1396 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x58, 0x4f, 0x73, 0xdb, 0x44, - 0x14, 0x8f, 0x64, 0xc5, 0x89, 0x9f, 0xed, 0x90, 0xd9, 0x96, 0xd6, 0xa3, 0xb6, 0x21, 0x55, 0x9b, - 0x36, 0x43, 0x89, 0x1c, 0x0c, 0xa5, 0xb4, 0xa5, 0x65, 0x92, 0xc6, 0x69, 0x3c, 0x6d, 0xd2, 0x54, - 0x4e, 0x3b, 0x43, 0x67, 0x18, 0x8f, 0x22, 0xad, 0x63, 0x81, 0x2d, 0x19, 0xad, 0xec, 0x8e, 0x2f, - 0x9c, 0xe0, 0xc0, 0x37, 0xe8, 0x70, 0x00, 0x86, 0x63, 0xb9, 0xf1, 0x01, 0xb8, 0x70, 0x81, 0x5b, - 0x81, 0x2f, 0xc0, 0x84, 0x33, 0xd3, 0x6f, 0xc0, 0x30, 0xfb, 0x47, 0xb6, 0x95, 0xfa, 0x1f, 0xb9, - 0x89, 0x93, 0xa5, 0xa7, 0xdf, 0x7b, 0xde, 0xf7, 0xdb, 0xdf, 0xbe, 0xb7, 0xbb, 0x70, 0xba, 0x5d, - 0xc8, 0x7b, 0xfb, 0x9f, 0x60, 0x2b, 0xc8, 0x13, 0xec, 0xb7, 0x1d, 0x0b, 0xeb, 0x4d, 0xdf, 0x0b, - 0x3c, 0x34, 0xef, 0x62, 0x4f, 0xaf, 0x12, 0xbd, 0x5d, 0xd0, 0xf9, 0x77, 0xf5, 0xf5, 0x1e, 0x34, - 0xe8, 0x34, 0x31, 0xe1, 0x40, 0xf5, 0x44, 0xbb, 0x90, 0xf7, 0x71, 0x95, 0x44, 0x8c, 0x14, 0x2b, - 0xe2, 0xe5, 0x1b, 0x38, 0x30, 0x85, 0xf9, 0x74, 0x9f, 0xb9, 0x8d, 0x7d, 0xa7, 0xda, 0xe1, 0x1f, - 0xb4, 0xe7, 0x32, 0xc0, 0x5d, 0x1c, 0x18, 0xf8, 0xb3, 0x16, 0x26, 0x01, 0xba, 0x0a, 0xca, 0xbe, - 0x67, 0x77, 0x72, 0xd2, 0xa2, 0xb4, 0x9c, 0x2e, 0x9c, 0xd7, 0x8f, 0x8e, 0x45, 0xef, 0x61, 0xf5, - 0x75, 0xcf, 0xee, 0x18, 0x0c, 0x8e, 0x8a, 0x90, 0xa6, 0x7f, 0x56, 0xa9, 0x61, 0xd3, 0xc6, 0x7e, - 0x4e, 0x66, 0xde, 0x17, 0xfb, 0xbc, 0xc3, 0x14, 0x85, 0xef, 0x36, 0x0e, 0xcc, 0x2d, 0x86, 0x35, - 0xa0, 0xd1, 0x7d, 0x46, 0x0f, 0x21, 0xcb, 0x07, 0x17, 0x06, 0x4a, 0xb0, 0x40, 0x6f, 0x0d, 0x0f, - 0xf4, 0x98, 0xc2, 0x1d, 0xcb, 0x0c, 0x1c, 0xcf, 0x15, 0x01, 0x33, 0x3c, 0x04, 0x7f, 0x53, 0xef, - 0x81, 0x42, 0xc7, 0x89, 0xde, 0x86, 0x19, 0xd3, 0xb6, 0x7d, 0x4c, 0x88, 0xc8, 0xed, 0x74, 0x5f, - 0x50, 0xca, 0xa2, 0xbe, 0xc6, 0x3f, 0x1b, 0x21, 0x0e, 0xcd, 0x43, 0xc2, 0x37, 0x9f, 0xb2, 0x64, - 0x66, 0x0d, 0xfa, 0xa8, 0xfd, 0x93, 0x80, 0x34, 0x23, 0x80, 0x34, 0x3d, 0x97, 0x60, 0xf4, 0x5e, - 0x84, 0x2d, 0x6d, 0x08, 0x5b, 0x1c, 0xdc, 0x4f, 0xd7, 0xe6, 0x20, 0xba, 0x96, 0x06, 0x66, 0xc9, - 0x9d, 0x87, 0xf0, 0x65, 0x0c, 0xe6, 0x6b, 0x65, 0x44, 0xa4, 0xb1, 0x84, 0x7d, 0x2d, 0x0b, 0xc6, - 0x6e, 0x81, 0xe2, 0xb8, 0x4e, 0x20, 0x92, 0xbb, 0x3c, 0x3e, 0x39, 0xbd, 0xe4, 0x3a, 0xc1, 0xd6, - 0x94, 0xc1, 0xdc, 0xd0, 0x29, 0x98, 0xb6, 0x6a, 0x2d, 0xf7, 0x53, 0x96, 0x5d, 0x66, 0x6b, 0xca, - 0xe0, 0xaf, 0xea, 0x0f, 0x12, 0x28, 0x14, 0x88, 0xae, 0x42, 0x8a, 0x07, 0xaa, 0x38, 0xb6, 0xf8, - 0x93, 0xdc, 0xd1, 0x39, 0x79, 0xc0, 0x00, 0xa5, 0x0d, 0x63, 0x96, 0x43, 0x4b, 0x36, 0xba, 0x01, - 0x29, 0xe2, 0x1c, 0xb8, 0x66, 0xd0, 0xf2, 0xb1, 0x60, 0xee, 0xec, 0x80, 0x7c, 0xcb, 0x21, 0xc6, - 0xe8, 0xc1, 0xd1, 0x2a, 0x24, 0x23, 0x44, 0xe5, 0x5e, 0x4d, 0x4a, 0x70, 0x22, 0x70, 0xeb, 0x59, - 0x48, 0x8b, 0x41, 0x36, 0x4d, 0x3f, 0xd0, 0xbe, 0x51, 0x00, 0x76, 0x5b, 0x93, 0xaf, 0x96, 0x1e, - 0x36, 0x1e, 0xab, 0xe5, 0xa7, 0x70, 0xf2, 0x3f, 0x88, 0x4c, 0xfe, 0xa5, 0xb1, 0x99, 0x4d, 0x36, - 0xf7, 0x2f, 0xe2, 0x34, 0xf7, 0xe8, 0x02, 0x64, 0x2d, 0xaf, 0xe9, 0x60, 0x52, 0x71, 0x5b, 0x8d, - 0x7d, 0xec, 0xe7, 0x94, 0x45, 0x69, 0x39, 0x6b, 0x64, 0xb8, 0x71, 0x87, 0xd9, 0x8e, 0x0a, 0xe4, - 0x3b, 0x19, 0xd2, 0x8c, 0x9a, 0x49, 0x2b, 0x44, 0x1f, 0x38, 0x2e, 0x15, 0xe2, 0x96, 0xd0, 0xc8, - 0xf1, 0x26, 0x51, 0xfb, 0x5d, 0x86, 0xec, 0x06, 0xae, 0xe3, 0x00, 0x87, 0xcb, 0xe8, 0xfd, 0x08, - 0x49, 0x17, 0x5f, 0x25, 0x29, 0x02, 0x8f, 0xc7, 0x4a, 0x6a, 0x1c, 0xbf, 0xef, 0x14, 0x60, 0xd6, - 0x7b, 0xea, 0x62, 0x9f, 0xd2, 0x2a, 0x0f, 0xf6, 0x79, 0x40, 0xbf, 0x97, 0x36, 0x8c, 0x19, 0x06, - 0x2c, 0xd9, 0xda, 0x4b, 0x09, 0xe6, 0x42, 0x96, 0x84, 0xf4, 0xae, 0x47, 0x58, 0x5d, 0x1a, 0xce, - 0x6a, 0xbc, 0xd4, 0x97, 0xe4, 0xc4, 0x6a, 0xbf, 0xca, 0x90, 0xa6, 0xa6, 0x50, 0x44, 0x63, 0x57, - 0x5a, 0x1f, 0x38, 0x1e, 0x12, 0xaa, 0x1d, 0x5f, 0x42, 0x67, 0x20, 0xd5, 0x30, 0x1d, 0xb7, 0xe2, - 0xb9, 0xf5, 0x8e, 0xd8, 0xc0, 0xcc, 0x52, 0xc3, 0x03, 0xb7, 0xde, 0x09, 0xf7, 0x35, 0x89, 0xde, - 0xbe, 0xe6, 0xcb, 0x69, 0xc8, 0x70, 0x7a, 0x84, 0x76, 0xae, 0x45, 0xc8, 0xbc, 0x30, 0x8c, 0xcc, - 0x78, 0x29, 0xe7, 0xdb, 0x84, 0x20, 0xb4, 0xd0, 0x6d, 0x05, 0xd2, 0xe8, 0x56, 0xb0, 0x35, 0xd5, - 0x6d, 0x06, 0x7b, 0x90, 0x21, 0x35, 0xcf, 0x0f, 0xa2, 0x99, 0xe5, 0x27, 0x60, 0x46, 0x2f, 0x53, - 0xbf, 0x6e, 0xc0, 0x34, 0xe9, 0xbd, 0xaa, 0x5f, 0xc8, 0x90, 0xee, 0xfb, 0x8c, 0xde, 0x85, 0x99, - 0x36, 0xf6, 0x89, 0xe3, 0xb9, 0x62, 0x68, 0xea, 0x80, 0x84, 0x1f, 0x73, 0x84, 0x11, 0x42, 0xd1, - 0x12, 0xcc, 0x59, 0x3e, 0x66, 0x89, 0x57, 0x70, 0xd3, 0xb3, 0x6a, 0x6c, 0x74, 0x8a, 0x91, 0x0d, - 0xad, 0x45, 0x6a, 0x8c, 0xd4, 0x95, 0xc4, 0x64, 0x75, 0x05, 0xdd, 0xea, 0xb6, 0x37, 0x7a, 0xc8, - 0x60, 0x1d, 0x70, 0x2e, 0xd2, 0x73, 0x45, 0xd6, 0xbc, 0xce, 0xef, 0x75, 0x9a, 0xd8, 0x00, 0xaf, - 0xfb, 0x4c, 0x47, 0xd6, 0x34, 0x3b, 0x75, 0xcf, 0xb4, 0x2b, 0x75, 0xec, 0x1e, 0x04, 0xb5, 0xdc, - 0x34, 0x1f, 0x99, 0xb0, 0xde, 0x67, 0xc6, 0xf5, 0x24, 0x28, 0x94, 0x56, 0xed, 0x0f, 0x05, 0xb2, - 0x65, 0x6c, 0xfa, 0x56, 0x6d, 0xe2, 0xd6, 0x10, 0x81, 0xc7, 0x63, 0x5d, 0xff, 0x1d, 0x6e, 0xb2, - 0x6e, 0x43, 0xc6, 0xf2, 0xdc, 0xc0, 0x74, 0xc4, 0xa4, 0xf0, 0x24, 0xcf, 0x1c, 0x9d, 0x94, 0x3b, - 0x21, 0xa6, 0xb4, 0x61, 0xa4, 0xbb, 0x0e, 0x25, 0x1b, 0xe5, 0x7a, 0x6a, 0x91, 0xd9, 0xd6, 0xa4, - 0xab, 0x88, 0x22, 0xcc, 0x54, 0x9d, 0x7a, 0x80, 0x7d, 0x92, 0x4b, 0x2c, 0x26, 0x96, 0xd3, 0x85, - 0x2b, 0x93, 0x30, 0xa7, 0x6f, 0x32, 0x1f, 0x23, 0xf4, 0x55, 0x7f, 0x96, 0x20, 0xc9, 0x6d, 0x68, - 0x0f, 0xa0, 0x61, 0x06, 0x56, 0x8d, 0xeb, 0x40, 0x62, 0x3a, 0xb8, 0xfa, 0x1f, 0x82, 0xea, 0xdb, - 0xd4, 0x9b, 0x09, 0x24, 0xd5, 0x08, 0x1f, 0x11, 0x02, 0xc5, 0x35, 0x1b, 0x7c, 0x2f, 0x97, 0x32, - 0xd8, 0x33, 0x3a, 0x09, 0xd3, 0x6d, 0xb3, 0xde, 0xc2, 0x8c, 0xe9, 0x94, 0xc1, 0x5f, 0xb4, 0xeb, - 0x90, 0xea, 0x46, 0x40, 0x2a, 0x9c, 0xda, 0x5e, 0xdb, 0xbb, 0xb3, 0x55, 0xd9, 0xfb, 0x68, 0xb7, - 0x58, 0x79, 0xb4, 0x53, 0xde, 0x2d, 0xde, 0x29, 0x6d, 0x96, 0x8a, 0x1b, 0xf3, 0x53, 0x68, 0x1e, - 0x32, 0xe5, 0x3d, 0xa3, 0xb4, 0x73, 0xb7, 0x52, 0x7c, 0xf8, 0x68, 0xed, 0xfe, 0xbc, 0xa4, 0x7d, - 0x2f, 0xc3, 0x5c, 0x38, 0xae, 0x49, 0x7b, 0x63, 0x14, 0x1f, 0x97, 0x0a, 0x77, 0xbd, 0xd7, 0x31, - 0x1c, 0xbb, 0x52, 0x77, 0x08, 0xdd, 0xc0, 0x27, 0x46, 0xee, 0xcb, 0x92, 0x8e, 0x7d, 0xdf, 0x21, - 0x81, 0x76, 0x0d, 0xa6, 0x0d, 0xd3, 0x3d, 0xc0, 0xe8, 0x14, 0x24, 0xbd, 0x6a, 0x95, 0x60, 0xbe, - 0xf7, 0x57, 0x0c, 0xf1, 0x46, 0xed, 0x62, 0x09, 0xf3, 0xe2, 0x22, 0xde, 0xb4, 0xdf, 0x64, 0x78, - 0x8d, 0x9e, 0x04, 0xa9, 0x73, 0xb8, 0x6a, 0x6f, 0x44, 0xe8, 0xbd, 0x34, 0xf8, 0xe8, 0xd8, 0xe7, - 0xf0, 0xbf, 0xef, 0xc7, 0x2b, 0x30, 0xed, 0xd3, 0x7c, 0x07, 0xec, 0xe7, 0x04, 0x23, 0x9c, 0x0e, - 0x8e, 0xd2, 0xbe, 0x92, 0x61, 0xbe, 0x47, 0x91, 0xd0, 0xec, 0xcd, 0x08, 0xa9, 0x97, 0x47, 0x91, - 0x1a, 0x2f, 0xd5, 0x9e, 0x15, 0xbc, 0x9e, 0x0c, 0x4f, 0x8d, 0x34, 0xc3, 0x8c, 0x38, 0x33, 0x6a, - 0x2f, 0x65, 0x38, 0x11, 0x66, 0xb6, 0x65, 0x92, 0x6e, 0x67, 0xb8, 0x1d, 0xa1, 0xe3, 0xcd, 0xe1, - 0x74, 0xf4, 0x39, 0xc5, 0x43, 0x67, 0x9f, 0x1f, 0x5f, 0x67, 0x79, 0x48, 0x32, 0x05, 0x91, 0x9c, - 0xcc, 0xd6, 0xfd, 0x50, 0xa1, 0x09, 0x18, 0x2d, 0xc0, 0xc4, 0xac, 0x07, 0x6c, 0xd4, 0x19, 0x83, - 0x3d, 0x6b, 0xcf, 0x64, 0x38, 0x19, 0x25, 0x4f, 0x28, 0xf0, 0xc3, 0x08, 0xe5, 0x57, 0xc6, 0x51, - 0x1e, 0x2f, 0x15, 0x5e, 0x10, 0xac, 0x9f, 0x81, 0x54, 0xcd, 0x24, 0xb5, 0x5e, 0xf5, 0xcc, 0x18, - 0xb3, 0xd4, 0x40, 0xab, 0x64, 0xe1, 0x47, 0x05, 0xb2, 0xbc, 0x74, 0x96, 0x79, 0x7c, 0xb4, 0x01, - 0x89, 0xbb, 0x38, 0x40, 0x67, 0x47, 0xdd, 0x94, 0xaa, 0xe7, 0x46, 0x5e, 0x9e, 0xad, 0x4a, 0x34, - 0xca, 0x6e, 0x6b, 0x60, 0x94, 0xde, 0x3d, 0xcb, 0xa0, 0x28, 0x7d, 0xb7, 0x07, 0xcb, 0x12, 0xba, - 0x07, 0x49, 0x7e, 0xa6, 0x43, 0x6f, 0x8c, 0x39, 0x43, 0xab, 0x8b, 0xe3, 0x8e, 0x83, 0xa8, 0x08, - 0x0a, 0x65, 0x06, 0x9d, 0x1b, 0x79, 0x92, 0x52, 0x17, 0x46, 0xef, 0x80, 0xd1, 0x36, 0x24, 0x79, - 0x2f, 0x1d, 0x34, 0xa6, 0xc8, 0x6e, 0x61, 0xd0, 0x98, 0xa2, 0x6d, 0x78, 0x55, 0x42, 0x65, 0x98, - 0x0d, 0x45, 0x86, 0xce, 0x8f, 0xed, 0x2b, 0xaa, 0x36, 0xbe, 0x4a, 0xae, 0x4a, 0xe8, 0x63, 0xc8, - 0xf4, 0x2b, 0x17, 0x2d, 0x4d, 0x54, 0x4c, 0xd4, 0x4b, 0x93, 0x2d, 0x80, 0xf5, 0x27, 0xbf, 0x1c, - 0x2e, 0x48, 0x2f, 0x0e, 0x17, 0xa4, 0x3f, 0x0f, 0x17, 0xa4, 0x67, 0x7f, 0x2d, 0x4c, 0x3d, 0x29, - 0x1c, 0x38, 0x41, 0xad, 0xb5, 0xaf, 0x5b, 0x5e, 0x23, 0xef, 0x92, 0xa6, 0x65, 0xad, 0xd8, 0xb8, - 0x9d, 0x77, 0xb1, 0x57, 0x25, 0x2b, 0x66, 0xd3, 0x59, 0x39, 0xf0, 0xf2, 0xdd, 0x2b, 0xff, 0x9b, - 0xfc, 0xe7, 0xb9, 0x7c, 0x62, 0x07, 0x7b, 0x9b, 0x65, 0x7d, 0x6d, 0xb7, 0x44, 0xff, 0x90, 0xab, - 0x70, 0x3f, 0xc9, 0x6e, 0xf1, 0xdf, 0xf9, 0x37, 0x00, 0x00, 0xff, 0xff, 0xd6, 0xca, 0xeb, 0x7d, - 0x4e, 0x18, 0x00, 0x00, +var fileDescriptor_1d7d92b1e85e5b48 = []byte{ + // 1403 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xdc, 0x59, 0x4d, 0x73, 0xdb, 0x54, + 0x17, 0x8e, 0x64, 0xc5, 0x89, 0x8f, 0xed, 0xbc, 0x99, 0xdb, 0x4e, 0x5f, 0x8f, 0x9a, 0x86, 0x54, + 0x6d, 0xda, 0x0c, 0x25, 0x72, 0x30, 0x94, 0xd2, 0x96, 0x96, 0x49, 0x1a, 0xa7, 0xf1, 0xb4, 0x49, + 0x53, 0x39, 0xed, 0x0c, 0xcc, 0x30, 0x1e, 0x45, 0xba, 0x8e, 0x05, 0xb6, 0x64, 0x74, 0x65, 0x77, + 0xbc, 0x61, 0x05, 0x0b, 0xfe, 0x41, 0x87, 0x05, 0x30, 0x2c, 0xcb, 0x8e, 0x1f, 0xc0, 0x86, 0x0d, + 0xec, 0x0a, 0xfc, 0x01, 0xa6, 0xac, 0x99, 0xfe, 0x03, 0x86, 0xb9, 0x1f, 0xb2, 0x2d, 0xd7, 0x5f, + 0x64, 0x27, 0x76, 0xf7, 0xe3, 0x39, 0xc7, 0xf7, 0x3c, 0xf7, 0xb9, 0xe7, 0xdc, 0x2b, 0xc3, 0x52, + 0xbb, 0x90, 0xf7, 0x8e, 0x3e, 0xc6, 0x56, 0x90, 0x3f, 0xf6, 0x9b, 0x56, 0x9e, 0x60, 0xbf, 0xed, + 0x58, 0x58, 0x6f, 0xfa, 0x5e, 0xe0, 0xa1, 0x45, 0x17, 0x7b, 0x7a, 0x95, 0xe8, 0xed, 0x82, 0xce, + 0x41, 0xaa, 0x3a, 0x80, 0x0f, 0x3a, 0x4d, 0x4c, 0x38, 0x5a, 0xcd, 0xb5, 0x0b, 0x79, 0x1f, 0x57, + 0xc9, 0xab, 0x33, 0xd4, 0x4a, 0x78, 0xe6, 0x93, 0x0d, 0x1c, 0x98, 0x62, 0x6e, 0x69, 0x70, 0xae, + 0x8d, 0x7d, 0xa7, 0xda, 0xe1, 0xb3, 0xda, 0x33, 0x19, 0xe0, 0x2e, 0x0e, 0x0c, 0xfc, 0x69, 0x0b, + 0x93, 0x00, 0x5d, 0x05, 0xe5, 0xc8, 0xb3, 0x3b, 0x39, 0x69, 0x45, 0x5a, 0x4b, 0x17, 0xce, 0xeb, + 0x83, 0xeb, 0xd3, 0x7b, 0x58, 0x7d, 0xcb, 0xb3, 0x3b, 0x06, 0x83, 0xa3, 0x22, 0xa4, 0xe9, 0x2f, + 0x56, 0x6a, 0xd8, 0xb4, 0xb1, 0x9f, 0x93, 0x99, 0xf5, 0xc5, 0x3e, 0xeb, 0x30, 0x6c, 0x61, 0xbb, + 0x87, 0x03, 0x73, 0x97, 0x61, 0x0d, 0x68, 0x74, 0xdb, 0xe8, 0x21, 0x64, 0xf9, 0xe2, 0x42, 0x47, + 0x09, 0xe6, 0xe8, 0x8d, 0xd1, 0x8e, 0x1e, 0x53, 0xb8, 0x63, 0x99, 0x81, 0xe3, 0xb9, 0xc2, 0x61, + 0x86, 0xbb, 0xe0, 0x3d, 0xf5, 0x1e, 0x28, 0x74, 0x9d, 0xe8, 0x4d, 0x98, 0x33, 0x6d, 0xdb, 0xc7, + 0x84, 0x88, 0xd8, 0xfe, 0xdf, 0xe7, 0x94, 0x92, 0xaa, 0x6f, 0xf2, 0x69, 0x23, 0xc4, 0xa1, 0x45, + 0x48, 0xf8, 0xe6, 0x13, 0x16, 0xcc, 0xbc, 0x41, 0x9b, 0xda, 0xdf, 0x09, 0x48, 0x33, 0x02, 0x48, + 0xd3, 0x73, 0x09, 0x46, 0xef, 0x44, 0xd8, 0xd2, 0x46, 0xb0, 0xc5, 0xc1, 0xfd, 0x74, 0xed, 0x0c, + 0xa3, 0x6b, 0x75, 0x68, 0x94, 0xdc, 0x78, 0x04, 0x5f, 0xc6, 0x70, 0xbe, 0xd6, 0xc7, 0x78, 0x9a, + 0x48, 0xd8, 0x57, 0xb2, 0x60, 0xec, 0x16, 0x28, 0x8e, 0xeb, 0x04, 0x22, 0xb8, 0xcb, 0x93, 0x83, + 0xd3, 0x4b, 0xae, 0x13, 0xec, 0xce, 0x18, 0xcc, 0x0c, 0x9d, 0x81, 0x59, 0xab, 0xd6, 0x72, 0x3f, + 0x61, 0xd1, 0x65, 0x76, 0x67, 0x0c, 0xde, 0x55, 0xbf, 0x97, 0x40, 0xa1, 0x40, 0x74, 0x15, 0x52, + 0xdc, 0x51, 0xc5, 0xb1, 0xc5, 0x8f, 0xe4, 0x06, 0xf7, 0xe4, 0x01, 0x03, 0x94, 0xb6, 0x8d, 0x79, + 0x0e, 0x2d, 0xd9, 0xe8, 0x06, 0xa4, 0x88, 0x73, 0xec, 0x9a, 0x41, 0xcb, 0xc7, 0x82, 0xb9, 0xa5, + 0x21, 0xf1, 0x96, 0x43, 0x8c, 0xd1, 0x83, 0xa3, 0x0d, 0x48, 0x46, 0x88, 0xca, 0xbd, 0x1a, 0x94, + 0xe0, 0x44, 0xe0, 0xb6, 0xb2, 0x90, 0x16, 0x8b, 0x6c, 0x9a, 0x7e, 0xa0, 0x7d, 0xad, 0x00, 0x1c, + 0xb4, 0xa6, 0x3f, 0x2d, 0x3d, 0x6c, 0x3c, 0x4e, 0xcb, 0x8f, 0xe1, 0xe6, 0xbf, 0x17, 0xd9, 0xfc, + 0x4b, 0x13, 0x23, 0x9b, 0x6e, 0xef, 0x9f, 0xc7, 0x69, 0xef, 0xd1, 0x05, 0xc8, 0x5a, 0x5e, 0xd3, + 0xc1, 0xa4, 0xe2, 0xb6, 0x1a, 0x47, 0xd8, 0xcf, 0x29, 0x2b, 0xd2, 0x5a, 0xd6, 0xc8, 0xf0, 0xc1, + 0x7d, 0x36, 0x36, 0x28, 0x90, 0x6f, 0x65, 0x48, 0x33, 0x6a, 0xa6, 0xcd, 0x10, 0x7d, 0xe0, 0xb8, + 0x64, 0x88, 0x5b, 0x42, 0x23, 0x27, 0xdb, 0x44, 0xed, 0x37, 0x19, 0xb2, 0xdb, 0xb8, 0x8e, 0x03, + 0x1c, 0x1e, 0xa3, 0x77, 0x23, 0x24, 0x5d, 0x7c, 0x95, 0xa4, 0x08, 0x3c, 0x1e, 0x27, 0xa9, 0x71, + 0xf2, 0xba, 0x53, 0x80, 0x79, 0xef, 0x89, 0x8b, 0x7d, 0x4a, 0xab, 0x3c, 0xdc, 0xe6, 0x01, 0x9d, + 0x2f, 0x6d, 0x1b, 0x73, 0x0c, 0x58, 0xb2, 0xb5, 0x97, 0x12, 0x2c, 0x84, 0x2c, 0x09, 0xe9, 0x5d, + 0x8f, 0xb0, 0xba, 0x3a, 0x9a, 0xd5, 0x78, 0xa9, 0x2f, 0xc9, 0x89, 0xd5, 0x7e, 0x91, 0x21, 0x4d, + 0x87, 0x42, 0x11, 0x4d, 0x3c, 0x69, 0x7d, 0xe0, 0x78, 0x48, 0xa8, 0x76, 0x72, 0x09, 0x9d, 0x85, + 0x54, 0xc3, 0x74, 0xdc, 0x8a, 0xe7, 0xd6, 0x3b, 0xe2, 0x02, 0x33, 0x4f, 0x07, 0x1e, 0xb8, 0xf5, + 0x4e, 0x78, 0xaf, 0x49, 0xf4, 0xee, 0x35, 0x5f, 0xcc, 0x42, 0x86, 0xd3, 0x23, 0xb4, 0x73, 0x2d, + 0x42, 0xe6, 0x85, 0x51, 0x64, 0xc6, 0x4b, 0x39, 0xdf, 0x24, 0x04, 0xa1, 0x85, 0x6e, 0x29, 0x90, + 0xc6, 0x97, 0x82, 0xdd, 0x99, 0x6e, 0x31, 0x38, 0x84, 0x0c, 0xa9, 0x79, 0x7e, 0x10, 0x8d, 0x2c, + 0x3f, 0x05, 0x33, 0x7a, 0x99, 0xda, 0x75, 0x1d, 0xa6, 0x49, 0xaf, 0xab, 0x7e, 0x2e, 0x43, 0xba, + 0x6f, 0x1a, 0xbd, 0x0d, 0x73, 0x6d, 0xec, 0x13, 0xc7, 0x73, 0xc5, 0xd2, 0xd4, 0x21, 0x01, 0x3f, + 0xe6, 0x08, 0x23, 0x84, 0xa2, 0x55, 0x58, 0xb0, 0x7c, 0xcc, 0x02, 0xaf, 0xe0, 0xa6, 0x67, 0xd5, + 0xd8, 0xea, 0x14, 0x23, 0x1b, 0x8e, 0x16, 0xe9, 0x60, 0x24, 0xaf, 0x24, 0xa6, 0xcb, 0x2b, 0xe8, + 0x56, 0xb7, 0xbc, 0xd1, 0xe7, 0x06, 0xab, 0x80, 0x0b, 0x91, 0x9a, 0x2b, 0xa2, 0xe6, 0x79, 0xfe, + 0xb0, 0xd3, 0xc4, 0x06, 0x78, 0xdd, 0x36, 0x5d, 0x59, 0xd3, 0xec, 0xd4, 0x3d, 0xd3, 0xae, 0xd4, + 0xb1, 0x7b, 0x1c, 0xd4, 0x72, 0xb3, 0x7c, 0x65, 0x62, 0xf4, 0x3e, 0x1b, 0xdc, 0x4a, 0x82, 0x42, + 0x69, 0xd5, 0x7e, 0x57, 0x20, 0x5b, 0xc6, 0xa6, 0x6f, 0xd5, 0xa6, 0x2e, 0x0d, 0x11, 0x78, 0x3c, + 0xce, 0xf5, 0x5f, 0xe1, 0x25, 0xeb, 0x36, 0x64, 0x2c, 0xcf, 0x0d, 0x4c, 0x47, 0x6c, 0x0a, 0x0f, + 0xf2, 0xec, 0xe0, 0xa6, 0xdc, 0x09, 0x31, 0xa5, 0x6d, 0x23, 0xdd, 0x35, 0x28, 0xd9, 0x28, 0xd7, + 0x53, 0x8b, 0xcc, 0xae, 0x26, 0x5d, 0x45, 0x14, 0x61, 0xae, 0xea, 0xd4, 0x03, 0xec, 0x93, 0x5c, + 0x62, 0x25, 0xb1, 0x96, 0x2e, 0x5c, 0x99, 0x86, 0x39, 0x7d, 0x87, 0xd9, 0x18, 0xa1, 0xad, 0xfa, + 0x93, 0x04, 0x49, 0x3e, 0x86, 0x0e, 0x01, 0x1a, 0x66, 0x60, 0xd5, 0xb8, 0x0e, 0x24, 0xa6, 0x83, + 0xab, 0xff, 0xc2, 0xa9, 0xbe, 0x47, 0xad, 0x99, 0x40, 0x52, 0x8d, 0xb0, 0x89, 0x10, 0x28, 0xae, + 0xd9, 0xe0, 0x77, 0xb9, 0x94, 0xc1, 0xda, 0xe8, 0x34, 0xcc, 0xb6, 0xcd, 0x7a, 0x0b, 0x33, 0xa6, + 0x53, 0x06, 0xef, 0x68, 0xd7, 0x21, 0xd5, 0xf5, 0x80, 0x54, 0x38, 0xb3, 0xb7, 0x79, 0x78, 0x67, + 0xb7, 0x72, 0xf8, 0xc1, 0x41, 0xb1, 0xf2, 0x68, 0xbf, 0x7c, 0x50, 0xbc, 0x53, 0xda, 0x29, 0x15, + 0xb7, 0x17, 0x67, 0xd0, 0x22, 0x64, 0xca, 0x87, 0x46, 0x69, 0xff, 0x6e, 0xa5, 0xf8, 0xf0, 0xd1, + 0xe6, 0xfd, 0x45, 0x49, 0xfb, 0x4e, 0x86, 0x85, 0x70, 0x5d, 0xd3, 0xd6, 0xc6, 0x28, 0x3e, 0x2e, + 0x19, 0xee, 0x7a, 0xaf, 0x62, 0x38, 0x76, 0xa5, 0xee, 0x10, 0x7a, 0x81, 0x4f, 0x8c, 0xbd, 0x97, + 0x25, 0x1d, 0xfb, 0xbe, 0x43, 0x02, 0xed, 0x1a, 0xcc, 0x1a, 0xa6, 0x7b, 0x8c, 0xd1, 0x19, 0x48, + 0x7a, 0xd5, 0x2a, 0xc1, 0xfc, 0xee, 0xaf, 0x18, 0xa2, 0x47, 0xc7, 0xc5, 0x11, 0xe6, 0xc9, 0x45, + 0xf4, 0xb4, 0x5f, 0x65, 0xf8, 0x1f, 0x7d, 0x09, 0x52, 0xe3, 0xf0, 0xd4, 0xde, 0x88, 0xd0, 0x7b, + 0x69, 0xf8, 0xd3, 0xb1, 0xcf, 0xe0, 0x3f, 0x5f, 0x8f, 0xd7, 0x61, 0xd6, 0xa7, 0xf1, 0x0e, 0xb9, + 0xcf, 0x09, 0x46, 0x38, 0x1d, 0x1c, 0xa5, 0x7d, 0x29, 0xc3, 0x62, 0x8f, 0x22, 0xa1, 0xd9, 0x9b, + 0x11, 0x52, 0x2f, 0x8f, 0x23, 0x35, 0x5e, 0xaa, 0x5d, 0x12, 0xbc, 0x9e, 0x0e, 0x5f, 0x8d, 0x34, + 0xc2, 0x8c, 0x78, 0x33, 0x6a, 0x2f, 0x65, 0x38, 0x15, 0x46, 0xb6, 0x6b, 0x92, 0x6e, 0x65, 0xb8, + 0x1d, 0xa1, 0xe3, 0xf5, 0xd1, 0x74, 0xf4, 0x19, 0xc5, 0x43, 0x67, 0x9f, 0x9d, 0x5c, 0x67, 0x79, + 0x48, 0x32, 0x05, 0x91, 0x9c, 0xcc, 0xce, 0xfd, 0x48, 0xa1, 0x09, 0x18, 0x4d, 0xc0, 0xc4, 0xac, + 0x07, 0x6c, 0xd5, 0x19, 0x83, 0xb5, 0xb5, 0xa7, 0x32, 0x9c, 0x8e, 0x92, 0x27, 0x14, 0xf8, 0x7e, + 0x84, 0xf2, 0x2b, 0x93, 0x28, 0x8f, 0x97, 0x0a, 0x2f, 0x08, 0xd6, 0xcf, 0x42, 0xaa, 0x66, 0x92, + 0x5a, 0x2f, 0x7b, 0x66, 0x8c, 0x79, 0x3a, 0x40, 0xb3, 0x64, 0xe1, 0x07, 0x05, 0xb2, 0x3c, 0x75, + 0x96, 0xb9, 0x7f, 0xb4, 0x0d, 0x89, 0xbb, 0x38, 0x40, 0x4b, 0xe3, 0xbe, 0x94, 0xaa, 0xe7, 0xc6, + 0x7e, 0x3c, 0xdb, 0x90, 0xa8, 0x97, 0x83, 0xd6, 0x50, 0x2f, 0xbd, 0xef, 0x2c, 0xc3, 0xbc, 0xf4, + 0x7d, 0x3d, 0x58, 0x93, 0xd0, 0x3d, 0x48, 0xf2, 0x37, 0x1d, 0x7a, 0x6d, 0xc2, 0x1b, 0x5a, 0x5d, + 0x99, 0xf4, 0x1c, 0x44, 0x45, 0x50, 0x28, 0x33, 0xe8, 0xdc, 0xd8, 0x97, 0x94, 0xba, 0x3c, 0xfe, + 0x06, 0x8c, 0xf6, 0x20, 0xc9, 0x6b, 0xe9, 0xb0, 0x35, 0x45, 0x6e, 0x0b, 0xc3, 0xd6, 0x14, 0x2d, + 0xc3, 0x1b, 0x12, 0x2a, 0xc3, 0x7c, 0x28, 0x32, 0x74, 0x7e, 0x62, 0x5d, 0x51, 0xb5, 0xc9, 0x59, + 0x72, 0x43, 0x42, 0x1f, 0x41, 0xa6, 0x5f, 0xb9, 0x68, 0x75, 0xaa, 0x64, 0xa2, 0x5e, 0x9a, 0xee, + 0x00, 0x6c, 0x55, 0x7e, 0x7e, 0xb1, 0x2c, 0x3d, 0x7f, 0xb1, 0x2c, 0xfd, 0xf1, 0x62, 0x59, 0x7a, + 0xfa, 0xe7, 0xf2, 0xcc, 0x87, 0xd7, 0x8e, 0x9d, 0xa0, 0xd6, 0x3a, 0xd2, 0x2d, 0xaf, 0x91, 0x77, + 0x49, 0xd3, 0xb2, 0xd6, 0x6d, 0xdc, 0xce, 0xbb, 0xd8, 0xab, 0x92, 0x75, 0xb3, 0xe9, 0xac, 0x1f, + 0x7b, 0xf9, 0xe8, 0xdf, 0x00, 0x37, 0x79, 0xfb, 0x99, 0x7c, 0x6a, 0x1f, 0x7b, 0x3b, 0x65, 0x7d, + 0xf3, 0xa0, 0x44, 0x7f, 0x95, 0x4b, 0xf1, 0x28, 0xc9, 0x3e, 0xe5, 0xbf, 0xf5, 0x4f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x39, 0x31, 0x0a, 0x71, 0x6c, 0x18, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc2.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc2.SupportPackageIsVersion4 // ObjectServiceClient is the client API for ObjectService service. // @@ -2423,44 +2423,44 @@ type ObjectServiceClient interface { // the object's payload if it is needed. All messages except first carry // chunks. Requested object can be restored by concatenation of object // message payload and all chunks keeping receiving order. - Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (ObjectService_GetClient, error) + Get(ctx context.Context, in *GetRequest, opts ...grpc2.CallOption) (ObjectService_GetClient, error) // Put the object into container. Request uses gRPC stream. First message // SHOULD BE type of PutHeader. Container id and Owner id of object SHOULD // BE set. Session token SHOULD BE obtained before put operation (see // session package). Chunk messages considered by server as part of object // payload. All messages except first SHOULD BE chunks. Chunk messages // SHOULD BE sent in direct order of fragmentation. - Put(ctx context.Context, opts ...grpc.CallOption) (ObjectService_PutClient, error) + Put(ctx context.Context, opts ...grpc2.CallOption) (ObjectService_PutClient, error) // Delete the object from a container - Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) + Delete(ctx context.Context, in *DeleteRequest, opts ...grpc2.CallOption) (*DeleteResponse, error) // Head returns the object without data payload. Object in the // response has system header only. If full headers flag is set, extended // headers are also present. - Head(ctx context.Context, in *HeadRequest, opts ...grpc.CallOption) (*HeadResponse, error) + Head(ctx context.Context, in *HeadRequest, opts ...grpc2.CallOption) (*HeadResponse, error) // Search objects in container. Version of query language format SHOULD BE // set to 1. Search query represented in serialized format (see query // package). - Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (ObjectService_SearchClient, error) + Search(ctx context.Context, in *SearchRequest, opts ...grpc2.CallOption) (ObjectService_SearchClient, error) // GetRange of data payload. Range is a pair (offset, length). // Requested range can be restored by concatenation of all chunks // keeping receiving order. - GetRange(ctx context.Context, in *GetRangeRequest, opts ...grpc.CallOption) (ObjectService_GetRangeClient, error) + GetRange(ctx context.Context, in *GetRangeRequest, opts ...grpc2.CallOption) (ObjectService_GetRangeClient, error) // GetRangeHash returns homomorphic hash of object payload range after XOR // operation. Ranges are set of pairs (offset, length). Hashes order in // response corresponds to ranges order in request. Homomorphic hash is // calculated for XORed data. - GetRangeHash(ctx context.Context, in *GetRangeHashRequest, opts ...grpc.CallOption) (*GetRangeHashResponse, error) + GetRangeHash(ctx context.Context, in *GetRangeHashRequest, opts ...grpc2.CallOption) (*GetRangeHashResponse, error) } type objectServiceClient struct { - cc *grpc.ClientConn + cc *grpc2.ClientConn } -func NewObjectServiceClient(cc *grpc.ClientConn) ObjectServiceClient { +func NewObjectServiceClient(cc *grpc2.ClientConn) ObjectServiceClient { return &objectServiceClient{cc} } -func (c *objectServiceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc.CallOption) (ObjectService_GetClient, error) { +func (c *objectServiceClient) Get(ctx context.Context, in *GetRequest, opts ...grpc2.CallOption) (ObjectService_GetClient, error) { stream, err := c.cc.NewStream(ctx, &_ObjectService_serviceDesc.Streams[0], "/neo.fs.v2.object.ObjectService/Get", opts...) if err != nil { return nil, err @@ -2477,11 +2477,11 @@ func (c *objectServiceClient) Get(ctx context.Context, in *GetRequest, opts ...g type ObjectService_GetClient interface { Recv() (*GetResponse, error) - grpc.ClientStream + grpc2.ClientStream } type objectServiceGetClient struct { - grpc.ClientStream + grpc2.ClientStream } func (x *objectServiceGetClient) Recv() (*GetResponse, error) { @@ -2492,7 +2492,7 @@ func (x *objectServiceGetClient) Recv() (*GetResponse, error) { return m, nil } -func (c *objectServiceClient) Put(ctx context.Context, opts ...grpc.CallOption) (ObjectService_PutClient, error) { +func (c *objectServiceClient) Put(ctx context.Context, opts ...grpc2.CallOption) (ObjectService_PutClient, error) { stream, err := c.cc.NewStream(ctx, &_ObjectService_serviceDesc.Streams[1], "/neo.fs.v2.object.ObjectService/Put", opts...) if err != nil { return nil, err @@ -2504,11 +2504,11 @@ func (c *objectServiceClient) Put(ctx context.Context, opts ...grpc.CallOption) type ObjectService_PutClient interface { Send(*PutRequest) error CloseAndRecv() (*PutResponse, error) - grpc.ClientStream + grpc2.ClientStream } type objectServicePutClient struct { - grpc.ClientStream + grpc2.ClientStream } func (x *objectServicePutClient) Send(m *PutRequest) error { @@ -2526,7 +2526,7 @@ func (x *objectServicePutClient) CloseAndRecv() (*PutResponse, error) { return m, nil } -func (c *objectServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc.CallOption) (*DeleteResponse, error) { +func (c *objectServiceClient) Delete(ctx context.Context, in *DeleteRequest, opts ...grpc2.CallOption) (*DeleteResponse, error) { out := new(DeleteResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.object.ObjectService/Delete", in, out, opts...) if err != nil { @@ -2535,7 +2535,7 @@ func (c *objectServiceClient) Delete(ctx context.Context, in *DeleteRequest, opt return out, nil } -func (c *objectServiceClient) Head(ctx context.Context, in *HeadRequest, opts ...grpc.CallOption) (*HeadResponse, error) { +func (c *objectServiceClient) Head(ctx context.Context, in *HeadRequest, opts ...grpc2.CallOption) (*HeadResponse, error) { out := new(HeadResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.object.ObjectService/Head", in, out, opts...) if err != nil { @@ -2544,7 +2544,7 @@ func (c *objectServiceClient) Head(ctx context.Context, in *HeadRequest, opts .. return out, nil } -func (c *objectServiceClient) Search(ctx context.Context, in *SearchRequest, opts ...grpc.CallOption) (ObjectService_SearchClient, error) { +func (c *objectServiceClient) Search(ctx context.Context, in *SearchRequest, opts ...grpc2.CallOption) (ObjectService_SearchClient, error) { stream, err := c.cc.NewStream(ctx, &_ObjectService_serviceDesc.Streams[2], "/neo.fs.v2.object.ObjectService/Search", opts...) if err != nil { return nil, err @@ -2561,11 +2561,11 @@ func (c *objectServiceClient) Search(ctx context.Context, in *SearchRequest, opt type ObjectService_SearchClient interface { Recv() (*SearchResponse, error) - grpc.ClientStream + grpc2.ClientStream } type objectServiceSearchClient struct { - grpc.ClientStream + grpc2.ClientStream } func (x *objectServiceSearchClient) Recv() (*SearchResponse, error) { @@ -2576,7 +2576,7 @@ func (x *objectServiceSearchClient) Recv() (*SearchResponse, error) { return m, nil } -func (c *objectServiceClient) GetRange(ctx context.Context, in *GetRangeRequest, opts ...grpc.CallOption) (ObjectService_GetRangeClient, error) { +func (c *objectServiceClient) GetRange(ctx context.Context, in *GetRangeRequest, opts ...grpc2.CallOption) (ObjectService_GetRangeClient, error) { stream, err := c.cc.NewStream(ctx, &_ObjectService_serviceDesc.Streams[3], "/neo.fs.v2.object.ObjectService/GetRange", opts...) if err != nil { return nil, err @@ -2593,11 +2593,11 @@ func (c *objectServiceClient) GetRange(ctx context.Context, in *GetRangeRequest, type ObjectService_GetRangeClient interface { Recv() (*GetRangeResponse, error) - grpc.ClientStream + grpc2.ClientStream } type objectServiceGetRangeClient struct { - grpc.ClientStream + grpc2.ClientStream } func (x *objectServiceGetRangeClient) Recv() (*GetRangeResponse, error) { @@ -2608,7 +2608,7 @@ func (x *objectServiceGetRangeClient) Recv() (*GetRangeResponse, error) { return m, nil } -func (c *objectServiceClient) GetRangeHash(ctx context.Context, in *GetRangeHashRequest, opts ...grpc.CallOption) (*GetRangeHashResponse, error) { +func (c *objectServiceClient) GetRangeHash(ctx context.Context, in *GetRangeHashRequest, opts ...grpc2.CallOption) (*GetRangeHashResponse, error) { out := new(GetRangeHashResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.object.ObjectService/GetRangeHash", in, out, opts...) if err != nil { @@ -2679,11 +2679,11 @@ func (*UnimplementedObjectServiceServer) GetRangeHash(ctx context.Context, req * return nil, status.Errorf(codes.Unimplemented, "method GetRangeHash not implemented") } -func RegisterObjectServiceServer(s *grpc.Server, srv ObjectServiceServer) { +func RegisterObjectServiceServer(s *grpc2.Server, srv ObjectServiceServer) { s.RegisterService(&_ObjectService_serviceDesc, srv) } -func _ObjectService_Get_Handler(srv interface{}, stream grpc.ServerStream) error { +func _ObjectService_Get_Handler(srv interface{}, stream grpc2.ServerStream) error { m := new(GetRequest) if err := stream.RecvMsg(m); err != nil { return err @@ -2693,29 +2693,29 @@ func _ObjectService_Get_Handler(srv interface{}, stream grpc.ServerStream) error type ObjectService_GetServer interface { Send(*GetResponse) error - grpc.ServerStream + grpc2.ServerStream } type objectServiceGetServer struct { - grpc.ServerStream + grpc2.ServerStream } func (x *objectServiceGetServer) Send(m *GetResponse) error { return x.ServerStream.SendMsg(m) } -func _ObjectService_Put_Handler(srv interface{}, stream grpc.ServerStream) error { +func _ObjectService_Put_Handler(srv interface{}, stream grpc2.ServerStream) error { return srv.(ObjectServiceServer).Put(&objectServicePutServer{stream}) } type ObjectService_PutServer interface { SendAndClose(*PutResponse) error Recv() (*PutRequest, error) - grpc.ServerStream + grpc2.ServerStream } type objectServicePutServer struct { - grpc.ServerStream + grpc2.ServerStream } func (x *objectServicePutServer) SendAndClose(m *PutResponse) error { @@ -2730,7 +2730,7 @@ func (x *objectServicePutServer) Recv() (*PutRequest, error) { return m, nil } -func _ObjectService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ObjectService_Delete_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc2.UnaryServerInterceptor) (interface{}, error) { in := new(DeleteRequest) if err := dec(in); err != nil { return nil, err @@ -2738,7 +2738,7 @@ func _ObjectService_Delete_Handler(srv interface{}, ctx context.Context, dec fun if interceptor == nil { return srv.(ObjectServiceServer).Delete(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc2.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.object.ObjectService/Delete", } @@ -2748,7 +2748,7 @@ func _ObjectService_Delete_Handler(srv interface{}, ctx context.Context, dec fun return interceptor(ctx, in, info, handler) } -func _ObjectService_Head_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ObjectService_Head_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc2.UnaryServerInterceptor) (interface{}, error) { in := new(HeadRequest) if err := dec(in); err != nil { return nil, err @@ -2756,7 +2756,7 @@ func _ObjectService_Head_Handler(srv interface{}, ctx context.Context, dec func( if interceptor == nil { return srv.(ObjectServiceServer).Head(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc2.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.object.ObjectService/Head", } @@ -2766,7 +2766,7 @@ func _ObjectService_Head_Handler(srv interface{}, ctx context.Context, dec func( return interceptor(ctx, in, info, handler) } -func _ObjectService_Search_Handler(srv interface{}, stream grpc.ServerStream) error { +func _ObjectService_Search_Handler(srv interface{}, stream grpc2.ServerStream) error { m := new(SearchRequest) if err := stream.RecvMsg(m); err != nil { return err @@ -2776,18 +2776,18 @@ func _ObjectService_Search_Handler(srv interface{}, stream grpc.ServerStream) er type ObjectService_SearchServer interface { Send(*SearchResponse) error - grpc.ServerStream + grpc2.ServerStream } type objectServiceSearchServer struct { - grpc.ServerStream + grpc2.ServerStream } func (x *objectServiceSearchServer) Send(m *SearchResponse) error { return x.ServerStream.SendMsg(m) } -func _ObjectService_GetRange_Handler(srv interface{}, stream grpc.ServerStream) error { +func _ObjectService_GetRange_Handler(srv interface{}, stream grpc2.ServerStream) error { m := new(GetRangeRequest) if err := stream.RecvMsg(m); err != nil { return err @@ -2797,18 +2797,18 @@ func _ObjectService_GetRange_Handler(srv interface{}, stream grpc.ServerStream) type ObjectService_GetRangeServer interface { Send(*GetRangeResponse) error - grpc.ServerStream + grpc2.ServerStream } type objectServiceGetRangeServer struct { - grpc.ServerStream + grpc2.ServerStream } func (x *objectServiceGetRangeServer) Send(m *GetRangeResponse) error { return x.ServerStream.SendMsg(m) } -func _ObjectService_GetRangeHash_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _ObjectService_GetRangeHash_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc2.UnaryServerInterceptor) (interface{}, error) { in := new(GetRangeHashRequest) if err := dec(in); err != nil { return nil, err @@ -2816,7 +2816,7 @@ func _ObjectService_GetRangeHash_Handler(srv interface{}, ctx context.Context, d if interceptor == nil { return srv.(ObjectServiceServer).GetRangeHash(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc2.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.object.ObjectService/GetRangeHash", } @@ -2826,10 +2826,10 @@ func _ObjectService_GetRangeHash_Handler(srv interface{}, ctx context.Context, d return interceptor(ctx, in, info, handler) } -var _ObjectService_serviceDesc = grpc.ServiceDesc{ +var _ObjectService_serviceDesc = grpc2.ServiceDesc{ ServiceName: "neo.fs.v2.object.ObjectService", HandlerType: (*ObjectServiceServer)(nil), - Methods: []grpc.MethodDesc{ + Methods: []grpc2.MethodDesc{ { MethodName: "Delete", Handler: _ObjectService_Delete_Handler, @@ -2843,7 +2843,7 @@ var _ObjectService_serviceDesc = grpc.ServiceDesc{ Handler: _ObjectService_GetRangeHash_Handler, }, }, - Streams: []grpc.StreamDesc{ + Streams: []grpc2.StreamDesc{ { StreamName: "Get", Handler: _ObjectService_Get_Handler, @@ -2865,7 +2865,7 @@ var _ObjectService_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: "v2/object/service.proto", + Metadata: "v2/object/grpc/service.proto", } func (m *GetRequest) Marshal() (dAtA []byte, err error) { @@ -5657,7 +5657,7 @@ func (m *GetRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5693,7 +5693,7 @@ func (m *GetRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5783,7 +5783,7 @@ func (m *GetRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Address == nil { - m.Address = &refs.Address{} + m.Address = &grpc1.Address{} } if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5929,7 +5929,7 @@ func (m *GetResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -5965,7 +5965,7 @@ func (m *GetResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6177,7 +6177,7 @@ func (m *GetResponse_Body_Init) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ObjectId == nil { - m.ObjectId = &refs.ObjectID{} + m.ObjectId = &grpc1.ObjectID{} } if err := m.ObjectId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6213,7 +6213,7 @@ func (m *GetResponse_Body_Init) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Signature == nil { - m.Signature = &service.Signature{} + m.Signature = &grpc.Signature{} } if err := m.Signature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6375,7 +6375,7 @@ func (m *PutRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6411,7 +6411,7 @@ func (m *PutRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6623,7 +6623,7 @@ func (m *PutRequest_Body_Init) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ObjectId == nil { - m.ObjectId = &refs.ObjectID{} + m.ObjectId = &grpc1.ObjectID{} } if err := m.ObjectId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6659,7 +6659,7 @@ func (m *PutRequest_Body_Init) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Signature == nil { - m.Signature = &service.Signature{} + m.Signature = &grpc.Signature{} } if err := m.Signature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6840,7 +6840,7 @@ func (m *PutResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6876,7 +6876,7 @@ func (m *PutResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -6966,7 +6966,7 @@ func (m *PutResponse_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ObjectId == nil { - m.ObjectId = &refs.ObjectID{} + m.ObjectId = &grpc1.ObjectID{} } if err := m.ObjectId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7092,7 +7092,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7128,7 +7128,7 @@ func (m *DeleteRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7218,7 +7218,7 @@ func (m *DeleteRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Address == nil { - m.Address = &refs.Address{} + m.Address = &grpc1.Address{} } if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7254,7 +7254,7 @@ func (m *DeleteRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc1.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7380,7 +7380,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7416,7 +7416,7 @@ func (m *DeleteResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7596,7 +7596,7 @@ func (m *HeadRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7632,7 +7632,7 @@ func (m *HeadRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7722,7 +7722,7 @@ func (m *HeadRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Address == nil { - m.Address = &refs.Address{} + m.Address = &grpc1.Address{} } if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7888,7 +7888,7 @@ func (m *HeadResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -7924,7 +7924,7 @@ func (m *HeadResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8138,7 +8138,7 @@ func (m *HeadResponse_Body_ShortHeader) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Version == nil { - m.Version = &service.Version{} + m.Version = &grpc.Version{} } if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8193,7 +8193,7 @@ func (m *HeadResponse_Body_ShortHeader) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc1.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8357,7 +8357,7 @@ func (m *SearchRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8393,7 +8393,7 @@ func (m *SearchRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8483,7 +8483,7 @@ func (m *SearchRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ContainerId == nil { - m.ContainerId = &refs.ContainerID{} + m.ContainerId = &grpc1.ContainerID{} } if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8799,7 +8799,7 @@ func (m *SearchResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8835,7 +8835,7 @@ func (m *SearchResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -8924,7 +8924,7 @@ func (m *SearchResponse_Body) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.IdList = append(m.IdList, &refs.ObjectID{}) + m.IdList = append(m.IdList, &grpc1.ObjectID{}) if err := m.IdList[len(m.IdList)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -9141,7 +9141,7 @@ func (m *GetRangeRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -9177,7 +9177,7 @@ func (m *GetRangeRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -9267,7 +9267,7 @@ func (m *GetRangeRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Address == nil { - m.Address = &refs.Address{} + m.Address = &grpc1.Address{} } if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -9429,7 +9429,7 @@ func (m *GetRangeResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -9465,7 +9465,7 @@ func (m *GetRangeResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -9679,7 +9679,7 @@ func (m *GetRangeHashRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -9715,7 +9715,7 @@ func (m *GetRangeHashRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -9805,7 +9805,7 @@ func (m *GetRangeHashRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Address == nil { - m.Address = &refs.Address{} + m.Address = &grpc1.Address{} } if err := m.Address.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -9999,7 +9999,7 @@ func (m *GetRangeHashResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -10035,7 +10035,7 @@ func (m *GetRangeHashResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err 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 7a97531..c857b8a 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 a3712b5..f4617b0 100644 --- a/v2/object/types.pb.go +++ b/v2/object/grpc/types.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/object/types.proto +// source: v2/object/grpc/types.proto package object import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" - service "github.com/nspcc-dev/neofs-api-go/v2/service" + grpc "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + grpc1 "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" io "io" math "math" math_bits "math/bits" @@ -53,20 +53,20 @@ func (x ObjectType) String() string { } func (ObjectType) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_fcb9e8df342f43c6, []int{0} + return fileDescriptor_545319325da7b9b1, []int{0} } // Object Headers type Header struct { // Object's container - ContainerId *refs.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` + ContainerId *grpc.ContainerID `protobuf:"bytes,1,opt,name=container_id,json=containerId,proto3" json:"container_id,omitempty"` // Object's owner - OwnerId *refs.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + OwnerId *grpc.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` // Epoch when the object was created CreationEpoch uint64 `protobuf:"varint,3,opt,name=creation_epoch,json=creationEpoch,proto3" json:"creation_epoch,omitempty"` // Object format version. // Effectively the version of API library used to create particular object - Version *service.Version `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"` + Version *grpc1.Version `protobuf:"bytes,4,opt,name=version,proto3" json:"version,omitempty"` // Size of payload in bytes. // 0xFFFFFFFFFFFFFFFF means `payload_length` is unknown PayloadLength uint64 `protobuf:"varint,5,opt,name=payload_length,json=payloadLength,proto3" json:"payload_length,omitempty"` @@ -78,7 +78,7 @@ type Header struct { HomomorphicHash []byte `protobuf:"bytes,8,opt,name=homomorphic_hash,json=homomorphicHash,proto3" json:"homomorphic_hash,omitempty"` // Session token, if it was used during Object creation. // Need it to verify integrity and authenticity out of Request scope. - SessionToken *service.SessionToken `protobuf:"bytes,9,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"` + SessionToken *grpc1.SessionToken `protobuf:"bytes,9,opt,name=session_token,json=sessionToken,proto3" json:"session_token,omitempty"` // User-defined object attributes Attributes []*Header_Attribute `protobuf:"bytes,10,rep,name=attributes,proto3" json:"attributes,omitempty"` // Position of the object in the split hierarchy. @@ -92,7 +92,7 @@ func (m *Header) Reset() { *m = Header{} } func (m *Header) String() string { return proto.CompactTextString(m) } func (*Header) ProtoMessage() {} func (*Header) Descriptor() ([]byte, []int) { - return fileDescriptor_fcb9e8df342f43c6, []int{0} + return fileDescriptor_545319325da7b9b1, []int{0} } func (m *Header) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -121,14 +121,14 @@ func (m *Header) XXX_DiscardUnknown() { var xxx_messageInfo_Header proto.InternalMessageInfo -func (m *Header) GetContainerId() *refs.ContainerID { +func (m *Header) GetContainerId() *grpc.ContainerID { if m != nil { return m.ContainerId } return nil } -func (m *Header) GetOwnerId() *refs.OwnerID { +func (m *Header) GetOwnerId() *grpc.OwnerID { if m != nil { return m.OwnerId } @@ -142,7 +142,7 @@ func (m *Header) GetCreationEpoch() uint64 { return 0 } -func (m *Header) GetVersion() *service.Version { +func (m *Header) GetVersion() *grpc1.Version { if m != nil { return m.Version } @@ -177,7 +177,7 @@ func (m *Header) GetHomomorphicHash() []byte { return nil } -func (m *Header) GetSessionToken() *service.SessionToken { +func (m *Header) GetSessionToken() *grpc1.SessionToken { if m != nil { return m.SessionToken } @@ -213,7 +213,7 @@ func (m *Header_Attribute) Reset() { *m = Header_Attribute{} } func (m *Header_Attribute) String() string { return proto.CompactTextString(m) } func (*Header_Attribute) ProtoMessage() {} func (*Header_Attribute) Descriptor() ([]byte, []int) { - return fileDescriptor_fcb9e8df342f43c6, []int{0, 0} + return fileDescriptor_545319325da7b9b1, []int{0, 0} } func (m *Header_Attribute) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -261,15 +261,15 @@ type Header_Split struct { // 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. - Parent *refs.ObjectID `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` + Parent *grpc.ObjectID `protobuf:"bytes,1,opt,name=parent,proto3" json:"parent,omitempty"` // Previous carries identifier of the left split neighbor. - Previous *refs.ObjectID `protobuf:"bytes,2,opt,name=previous,proto3" json:"previous,omitempty"` + Previous *grpc.ObjectID `protobuf:"bytes,2,opt,name=previous,proto3" json:"previous,omitempty"` // `signature` field of the parent object. Used to reconstruct parent. - ParentSignature *service.Signature `protobuf:"bytes,3,opt,name=parent_signature,json=parentSignature,proto3" json:"parent_signature,omitempty"` + ParentSignature *grpc1.Signature `protobuf:"bytes,3,opt,name=parent_signature,json=parentSignature,proto3" json:"parent_signature,omitempty"` // `header` field of the parent object. Used to reconstruct parent. ParentHeader *Header `protobuf:"bytes,4,opt,name=parent_header,json=parentHeader,proto3" json:"parent_header,omitempty"` // Children carries list of identifiers of the objects generated by splitting the current. - Children []*refs.ObjectID `protobuf:"bytes,5,rep,name=children,proto3" json:"children,omitempty"` + Children []*grpc.ObjectID `protobuf:"bytes,5,rep,name=children,proto3" json:"children,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -279,7 +279,7 @@ func (m *Header_Split) Reset() { *m = Header_Split{} } func (m *Header_Split) String() string { return proto.CompactTextString(m) } func (*Header_Split) ProtoMessage() {} func (*Header_Split) Descriptor() ([]byte, []int) { - return fileDescriptor_fcb9e8df342f43c6, []int{0, 1} + return fileDescriptor_545319325da7b9b1, []int{0, 1} } func (m *Header_Split) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -308,21 +308,21 @@ func (m *Header_Split) XXX_DiscardUnknown() { var xxx_messageInfo_Header_Split proto.InternalMessageInfo -func (m *Header_Split) GetParent() *refs.ObjectID { +func (m *Header_Split) GetParent() *grpc.ObjectID { if m != nil { return m.Parent } return nil } -func (m *Header_Split) GetPrevious() *refs.ObjectID { +func (m *Header_Split) GetPrevious() *grpc.ObjectID { if m != nil { return m.Previous } return nil } -func (m *Header_Split) GetParentSignature() *service.Signature { +func (m *Header_Split) GetParentSignature() *grpc1.Signature { if m != nil { return m.ParentSignature } @@ -336,7 +336,7 @@ func (m *Header_Split) GetParentHeader() *Header { return nil } -func (m *Header_Split) GetChildren() []*refs.ObjectID { +func (m *Header_Split) GetChildren() []*grpc.ObjectID { if m != nil { return m.Children } @@ -349,9 +349,9 @@ type Object struct { // 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 - ObjectId *refs.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` + ObjectId *grpc.ObjectID `protobuf:"bytes,1,opt,name=object_id,json=objectId,proto3" json:"object_id,omitempty"` // Signed object_id - Signature *service.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` + Signature *grpc1.Signature `protobuf:"bytes,2,opt,name=signature,proto3" json:"signature,omitempty"` // Object metadata headers Header *Header `protobuf:"bytes,3,opt,name=header,proto3" json:"header,omitempty"` // Payload bytes. @@ -365,7 +365,7 @@ func (m *Object) Reset() { *m = Object{} } func (m *Object) String() string { return proto.CompactTextString(m) } func (*Object) ProtoMessage() {} func (*Object) Descriptor() ([]byte, []int) { - return fileDescriptor_fcb9e8df342f43c6, []int{1} + return fileDescriptor_545319325da7b9b1, []int{1} } func (m *Object) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -394,14 +394,14 @@ func (m *Object) XXX_DiscardUnknown() { var xxx_messageInfo_Object proto.InternalMessageInfo -func (m *Object) GetObjectId() *refs.ObjectID { +func (m *Object) GetObjectId() *grpc.ObjectID { if m != nil { return m.ObjectId } return nil } -func (m *Object) GetSignature() *service.Signature { +func (m *Object) GetSignature() *grpc1.Signature { if m != nil { return m.Signature } @@ -430,55 +430,56 @@ func init() { proto.RegisterType((*Object)(nil), "neo.fs.v2.object.Object") } -func init() { proto.RegisterFile("v2/object/types.proto", fileDescriptor_fcb9e8df342f43c6) } +func init() { proto.RegisterFile("v2/object/grpc/types.proto", fileDescriptor_545319325da7b9b1) } -var fileDescriptor_fcb9e8df342f43c6 = []byte{ - // 720 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xcf, 0x6e, 0xd3, 0x4e, - 0x10, 0xc7, 0xeb, 0xa4, 0xf9, 0x37, 0x4e, 0xda, 0xfc, 0xb6, 0x3f, 0x54, 0x2b, 0xa0, 0x10, 0x2a, - 0x21, 0x05, 0xa4, 0x3a, 0xc8, 0x0d, 0x17, 0xaa, 0x22, 0xa5, 0x34, 0xa4, 0x91, 0x4a, 0x53, 0x6d, - 0x52, 0x0e, 0xbd, 0x44, 0x8e, 0xbd, 0x89, 0x4d, 0x13, 0xaf, 0xe5, 0x75, 0x5c, 0xe5, 0x4d, 0x78, - 0x06, 0x24, 0x2e, 0xbc, 0x04, 0x1c, 0x79, 0x04, 0x54, 0x5e, 0x04, 0x79, 0xd7, 0x76, 0x42, 0x4b, - 0x0b, 0x27, 0x7b, 0xbf, 0xfe, 0x7c, 0x67, 0x76, 0x66, 0x67, 0x0d, 0x0f, 0x02, 0xad, 0x41, 0x47, - 0x1f, 0x88, 0xe1, 0x37, 0xfc, 0x85, 0x4b, 0x98, 0xea, 0x7a, 0xd4, 0xa7, 0xa8, 0xec, 0x10, 0xaa, - 0x8e, 0x99, 0x1a, 0x68, 0xaa, 0xf8, 0x5a, 0xd9, 0x0a, 0xb4, 0x86, 0x47, 0xc6, 0x6c, 0x15, 0xab, - 0x84, 0x6e, 0x46, 0xbc, 0xc0, 0x36, 0x48, 0x63, 0x46, 0x7c, 0x3d, 0x92, 0xb7, 0x57, 0xe4, 0x80, - 0x78, 0xf6, 0x78, 0x21, 0x3e, 0xec, 0x7c, 0xc9, 0x41, 0xf6, 0x98, 0xe8, 0x26, 0xf1, 0xd0, 0x6b, - 0x28, 0x1a, 0xd4, 0xf1, 0x75, 0xdb, 0x21, 0xde, 0xd0, 0x36, 0x15, 0xa9, 0x26, 0xd5, 0x65, 0xed, - 0xa1, 0xba, 0x4c, 0x1c, 0x66, 0x53, 0xdf, 0xc4, 0x4c, 0xf7, 0x08, 0xcb, 0x89, 0xa1, 0x6b, 0x22, - 0x0d, 0xf2, 0xf4, 0x2a, 0xf2, 0xa6, 0xb8, 0x77, 0xfb, 0xa6, 0xb7, 0x77, 0x25, 0x7c, 0x39, 0x0e, - 0x76, 0x4d, 0xf4, 0x14, 0x36, 0x0c, 0x8f, 0xe8, 0xbe, 0x4d, 0x9d, 0x21, 0x71, 0xa9, 0x61, 0x29, - 0xe9, 0x9a, 0x54, 0x5f, 0xc7, 0xa5, 0x58, 0x6d, 0x87, 0x22, 0x6a, 0x42, 0x2e, 0x20, 0x1e, 0xb3, - 0xa9, 0xa3, 0xac, 0xf3, 0xc8, 0x95, 0x95, 0xc8, 0x51, 0x5d, 0xea, 0x7b, 0x41, 0xe0, 0x18, 0x0d, - 0x83, 0xbb, 0xfa, 0x62, 0x4a, 0x75, 0x73, 0x38, 0x25, 0xce, 0xc4, 0xb7, 0x94, 0x8c, 0x08, 0x1e, - 0xa9, 0x27, 0x5c, 0x44, 0x4f, 0xa0, 0x18, 0x63, 0x96, 0xce, 0x2c, 0x25, 0x5b, 0x93, 0xea, 0x45, - 0x2c, 0x47, 0xda, 0xb1, 0xce, 0x2c, 0x74, 0x00, 0xb2, 0x68, 0xfa, 0x30, 0xec, 0xb5, 0x92, 0xab, - 0x49, 0xf5, 0x0d, 0xed, 0x91, 0x7a, 0xf3, 0x48, 0xd4, 0x1e, 0x7f, 0x0c, 0x16, 0x2e, 0xc1, 0x40, - 0x93, 0x77, 0xf4, 0x0c, 0xca, 0x16, 0x9d, 0xd1, 0x19, 0xf5, 0x5c, 0xcb, 0x36, 0x44, 0x96, 0x3c, - 0xcf, 0xb2, 0xb9, 0xa2, 0xf3, 0x4c, 0x47, 0x50, 0x62, 0x84, 0x85, 0xdb, 0x1f, 0xfa, 0xf4, 0x92, - 0x38, 0x4a, 0x81, 0xd7, 0xfb, 0xf8, 0x0f, 0xf5, 0xf6, 0x05, 0x37, 0x08, 0x31, 0x5c, 0x64, 0x2b, - 0x2b, 0x74, 0x08, 0xa0, 0xfb, 0xbe, 0x67, 0x8f, 0xe6, 0x3e, 0x61, 0x0a, 0xd4, 0xd2, 0x75, 0x59, - 0xdb, 0xb9, 0xbd, 0x5d, 0x71, 0xf0, 0x6a, 0x2b, 0x46, 0xf1, 0x8a, 0x0b, 0x35, 0x21, 0xc3, 0xdc, - 0xa9, 0xed, 0x2b, 0x32, 0xdf, 0x41, 0xf5, 0x4e, 0x7b, 0x3f, 0xa4, 0xb0, 0x80, 0x2b, 0x7b, 0x50, - 0x48, 0xc2, 0xa1, 0x32, 0xa4, 0x2f, 0xc9, 0x82, 0x0f, 0x52, 0x01, 0x87, 0xaf, 0xe8, 0x7f, 0xc8, - 0x04, 0xfa, 0x74, 0x4e, 0xf8, 0x80, 0x14, 0xb0, 0x58, 0x54, 0x3e, 0xa7, 0x20, 0xc3, 0xa3, 0xa0, - 0x17, 0x90, 0x75, 0x75, 0x8f, 0x38, 0x7e, 0x34, 0x7d, 0xca, 0xad, 0x09, 0xe2, 0xa9, 0xbb, 0x47, - 0x38, 0xe2, 0x50, 0x13, 0xf2, 0xae, 0x47, 0x02, 0x9b, 0xce, 0x59, 0x34, 0x75, 0x77, 0x7b, 0x12, - 0x12, 0x75, 0xa0, 0x2c, 0xfc, 0x43, 0x66, 0x4f, 0x1c, 0xdd, 0x9f, 0x7b, 0x84, 0x4f, 0x9e, 0xfc, - 0xdb, 0xa9, 0x26, 0x9d, 0x8e, 0x19, 0xbc, 0x29, 0x5c, 0x89, 0x80, 0x0e, 0xa0, 0x14, 0x05, 0xb2, - 0x78, 0x37, 0xa2, 0xf9, 0x54, 0xee, 0xea, 0x16, 0x2e, 0x0a, 0x3c, 0xba, 0x73, 0x4d, 0xc8, 0x1b, - 0x96, 0x3d, 0x35, 0x3d, 0xe2, 0x28, 0x19, 0x7e, 0x4c, 0xf7, 0xec, 0x3e, 0x26, 0x77, 0xbe, 0x4a, - 0x90, 0x15, 0x32, 0x7a, 0x09, 0x85, 0x68, 0x32, 0x93, 0x1b, 0x7b, 0x4f, 0x04, 0x81, 0x76, 0x4d, - 0xf4, 0x0a, 0x0a, 0xcb, 0xc2, 0x53, 0xff, 0x50, 0xf8, 0x12, 0x0f, 0xcf, 0x28, 0xaa, 0x35, 0xfd, - 0x97, 0x5a, 0x23, 0x0e, 0x29, 0x90, 0x8b, 0x6e, 0x13, 0x6f, 0x4f, 0x11, 0xc7, 0xcb, 0xe7, 0xfb, - 0x00, 0xcb, 0x3b, 0x83, 0x64, 0xc8, 0xe1, 0x76, 0xe7, 0xfc, 0xa4, 0x85, 0xcb, 0x6b, 0xa8, 0x04, - 0x85, 0x41, 0xef, 0xdd, 0x61, 0x7f, 0xd0, 0x3b, 0x6d, 0x97, 0x25, 0xf4, 0x1f, 0x94, 0xfa, 0x83, - 0x1e, 0x6e, 0x75, 0xda, 0xc3, 0x0e, 0xee, 0x9d, 0x9f, 0x95, 0x53, 0x87, 0x17, 0xdf, 0xae, 0xab, - 0xd2, 0xf7, 0xeb, 0xaa, 0xf4, 0xe3, 0xba, 0x2a, 0x7d, 0xfc, 0x59, 0x5d, 0xbb, 0xd0, 0x26, 0xb6, - 0x6f, 0xcd, 0x47, 0xaa, 0x41, 0x67, 0x0d, 0x87, 0xb9, 0x86, 0xb1, 0x6b, 0x92, 0xa0, 0xe1, 0x10, - 0x3a, 0x66, 0xbb, 0xba, 0x6b, 0xef, 0x4e, 0x68, 0x23, 0xf9, 0xbb, 0xee, 0x8b, 0xc7, 0xa7, 0xd4, - 0xd6, 0x29, 0xa1, 0x6f, 0xfb, 0x6a, 0xeb, 0xac, 0x1b, 0x56, 0x20, 0xb6, 0x33, 0xca, 0xf2, 0xdf, - 0xe3, 0xde, 0xaf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd6, 0x66, 0x06, 0xbc, 0x8e, 0x05, 0x00, 0x00, +var fileDescriptor_545319325da7b9b1 = []byte{ + // 726 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x94, 0xdd, 0x6e, 0xda, 0x48, + 0x14, 0xc7, 0x63, 0x08, 0x5f, 0xc7, 0x90, 0xb0, 0xb3, 0x2b, 0xad, 0xc5, 0x46, 0x2c, 0x1b, 0x69, + 0x25, 0x5a, 0x29, 0xa6, 0x22, 0x54, 0x95, 0x1a, 0xa5, 0x12, 0x69, 0x28, 0x41, 0x4a, 0x43, 0x34, + 0x90, 0x5e, 0xf4, 0xc6, 0x32, 0xf6, 0x80, 0xdd, 0x80, 0xc7, 0xf2, 0x18, 0x47, 0xbc, 0x49, 0x9f, + 0xa1, 0x52, 0x6f, 0xfa, 0x12, 0xed, 0x65, 0x1f, 0xa1, 0x4a, 0x5f, 0xa4, 0xf2, 0xcc, 0x18, 0x48, + 0xd2, 0xa4, 0xbd, 0xf2, 0xcc, 0x99, 0xdf, 0xff, 0xcc, 0xf9, 0x1a, 0x43, 0x25, 0x6a, 0x36, 0xe8, + 0xe8, 0x1d, 0xb1, 0xc2, 0xc6, 0x24, 0xf0, 0xad, 0x46, 0xb8, 0xf0, 0x09, 0xd3, 0xfd, 0x80, 0x86, + 0x14, 0x95, 0x3d, 0x42, 0xf5, 0x31, 0xd3, 0xa3, 0xa6, 0x2e, 0x90, 0x8a, 0x16, 0x35, 0x1b, 0x01, + 0x19, 0xb3, 0x3b, 0x6c, 0x25, 0xf6, 0xc3, 0x48, 0x10, 0xb9, 0x16, 0x11, 0x87, 0x33, 0x12, 0x9a, + 0xf2, 0x6c, 0xe7, 0xf6, 0x59, 0x44, 0x02, 0x77, 0xbc, 0x10, 0xa7, 0xbb, 0x9f, 0x72, 0x90, 0x3d, + 0x21, 0xa6, 0x4d, 0x02, 0xf4, 0x02, 0x8a, 0x16, 0xf5, 0x42, 0xd3, 0xf5, 0x48, 0x60, 0xb8, 0xb6, + 0xa6, 0xd4, 0x94, 0xba, 0xda, 0xfc, 0x47, 0x5f, 0xc5, 0x11, 0x5f, 0xae, 0xbf, 0x4c, 0x98, 0xde, + 0x31, 0x56, 0x97, 0x82, 0x9e, 0x8d, 0x9a, 0x90, 0xa7, 0x57, 0x52, 0x9b, 0xe2, 0xda, 0xbf, 0x6f, + 0x6b, 0xfb, 0x57, 0x42, 0x97, 0xe3, 0x60, 0xcf, 0x46, 0xff, 0xc3, 0x96, 0x15, 0x10, 0x33, 0x74, + 0xa9, 0x67, 0x10, 0x9f, 0x5a, 0x8e, 0x96, 0xae, 0x29, 0xf5, 0x4d, 0x5c, 0x4a, 0xac, 0x9d, 0xd8, + 0x88, 0x5a, 0x90, 0x8b, 0x48, 0xc0, 0x5c, 0xea, 0x69, 0x9b, 0xdc, 0x73, 0x65, 0xcd, 0xb3, 0x4c, + 0x4e, 0x7f, 0x23, 0x08, 0x9c, 0xa0, 0xb1, 0x73, 0xdf, 0x5c, 0x4c, 0xa9, 0x69, 0x1b, 0x53, 0xe2, + 0x4d, 0x42, 0x47, 0xcb, 0x08, 0xe7, 0xd2, 0x7a, 0xca, 0x8d, 0xe8, 0x3f, 0x28, 0x26, 0x98, 0x63, + 0x32, 0x47, 0xcb, 0xd6, 0x94, 0x7a, 0x11, 0xab, 0xd2, 0x76, 0x62, 0x32, 0x07, 0x1d, 0x82, 0x2a, + 0x7a, 0x60, 0xc4, 0x55, 0xd7, 0x72, 0x35, 0xa5, 0xbe, 0xd5, 0xdc, 0xd1, 0x6f, 0x77, 0x48, 0xef, + 0xf3, 0xcf, 0x70, 0xe1, 0x13, 0x0c, 0x74, 0xb9, 0x46, 0x8f, 0xa0, 0xec, 0xd0, 0x19, 0x9d, 0xd1, + 0xc0, 0x77, 0x5c, 0x4b, 0xdc, 0x92, 0xe7, 0xb7, 0x6c, 0xaf, 0xd9, 0xf9, 0x4d, 0xc7, 0x50, 0x62, + 0x84, 0xc5, 0xe1, 0x1b, 0x21, 0xbd, 0x24, 0x9e, 0x56, 0xe0, 0xf9, 0xfe, 0xfb, 0x93, 0x7c, 0x07, + 0x82, 0x1b, 0xc6, 0x18, 0x2e, 0xb2, 0xb5, 0x1d, 0x3a, 0x02, 0x30, 0xc3, 0x30, 0x70, 0x47, 0xf3, + 0x90, 0x30, 0x0d, 0x6a, 0xe9, 0xba, 0xda, 0xdc, 0xbd, 0x1b, 0xae, 0x68, 0xbc, 0xde, 0x4e, 0x50, + 0xbc, 0xa6, 0x42, 0x2d, 0xc8, 0x30, 0x7f, 0xea, 0x86, 0x9a, 0xca, 0x23, 0xa8, 0xde, 0x2b, 0x1f, + 0xc4, 0x14, 0x16, 0x70, 0x65, 0x1f, 0x0a, 0x4b, 0x77, 0xa8, 0x0c, 0xe9, 0x4b, 0xb2, 0xe0, 0x83, + 0x54, 0xc0, 0xf1, 0x12, 0xfd, 0x05, 0x99, 0xc8, 0x9c, 0xce, 0x09, 0x1f, 0x90, 0x02, 0x16, 0x9b, + 0xca, 0xc7, 0x14, 0x64, 0xb8, 0x17, 0xf4, 0x04, 0xb2, 0xbe, 0x19, 0x10, 0x2f, 0x94, 0xd3, 0xa7, + 0xdd, 0x99, 0x20, 0x7e, 0x75, 0xef, 0x18, 0x4b, 0x0e, 0xb5, 0x20, 0xef, 0x07, 0x24, 0x72, 0xe9, + 0x9c, 0xc9, 0xa9, 0xbb, 0x5f, 0xb3, 0x24, 0x51, 0x17, 0xca, 0x42, 0x6f, 0x30, 0x77, 0xe2, 0x99, + 0xe1, 0x3c, 0x20, 0x7c, 0xf2, 0xd4, 0x1b, 0x5d, 0x5d, 0x56, 0x3a, 0x61, 0xf0, 0xb6, 0x50, 0x2d, + 0x0d, 0xe8, 0x10, 0x4a, 0xd2, 0x91, 0xc3, 0xab, 0x21, 0xe7, 0x53, 0xbb, 0xaf, 0x5a, 0xb8, 0x28, + 0x70, 0xf9, 0xe6, 0x5a, 0x90, 0xb7, 0x1c, 0x77, 0x6a, 0x07, 0xc4, 0xd3, 0x32, 0xbc, 0x4d, 0x0f, + 0x44, 0x9f, 0x90, 0xbb, 0x9f, 0x15, 0xc8, 0x0a, 0x33, 0x7a, 0x0a, 0x05, 0x39, 0x99, 0xcb, 0x17, + 0xfb, 0x80, 0x07, 0x81, 0xf6, 0x6c, 0xf4, 0x1c, 0x0a, 0xab, 0xc4, 0x53, 0xbf, 0x91, 0xf8, 0x0a, + 0x8f, 0x7b, 0x24, 0x73, 0x4d, 0xff, 0x22, 0x57, 0xc9, 0x21, 0x0d, 0x72, 0xf2, 0x35, 0xf1, 0xf2, + 0x14, 0x71, 0xb2, 0x7d, 0x7c, 0x00, 0xb0, 0x7a, 0x33, 0x48, 0x85, 0x1c, 0xee, 0x74, 0x2f, 0x4e, + 0xdb, 0xb8, 0xbc, 0x81, 0x4a, 0x50, 0x18, 0xf6, 0x5f, 0x1f, 0x0d, 0x86, 0xfd, 0xb3, 0x4e, 0x59, + 0x41, 0x7f, 0x40, 0x69, 0x30, 0xec, 0xe3, 0x76, 0xb7, 0x63, 0x74, 0x71, 0xff, 0xe2, 0xbc, 0x9c, + 0x3a, 0x32, 0xbe, 0x5c, 0x57, 0x95, 0xaf, 0xd7, 0x55, 0xe5, 0xdb, 0x75, 0x55, 0x79, 0xff, 0xbd, + 0xba, 0xf1, 0xf6, 0xd9, 0xc4, 0x0d, 0x9d, 0xf9, 0x48, 0xb7, 0xe8, 0xac, 0xe1, 0x31, 0xdf, 0xb2, + 0xf6, 0x6c, 0x12, 0x35, 0x3c, 0x42, 0xc7, 0x6c, 0xcf, 0xf4, 0xdd, 0xbd, 0x09, 0x6d, 0xdc, 0xfc, + 0xe3, 0x1e, 0x88, 0xf5, 0x87, 0xd4, 0x9f, 0x67, 0x84, 0xbe, 0x1a, 0xe8, 0xed, 0xf3, 0x5e, 0x9c, + 0x86, 0x88, 0x69, 0x94, 0xe5, 0xff, 0xc8, 0xfd, 0x1f, 0x01, 0x00, 0x00, 0xff, 0xff, 0x65, 0x74, + 0xce, 0xc4, 0xa7, 0x05, 0x00, 0x00, } func (m *Header) Marshal() (dAtA []byte, err error) { @@ -1024,7 +1025,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ContainerId == nil { - m.ContainerId = &refs.ContainerID{} + m.ContainerId = &grpc.ContainerID{} } if err := m.ContainerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1060,7 +1061,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1115,7 +1116,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Version == nil { - m.Version = &service.Version{} + m.Version = &grpc1.Version{} } if err := m.Version.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1257,7 +1258,7 @@ func (m *Header) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.SessionToken == nil { - m.SessionToken = &service.SessionToken{} + m.SessionToken = &grpc1.SessionToken{} } if err := m.SessionToken.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1535,7 +1536,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Parent == nil { - m.Parent = &refs.ObjectID{} + m.Parent = &grpc.ObjectID{} } if err := m.Parent.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1571,7 +1572,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Previous == nil { - m.Previous = &refs.ObjectID{} + m.Previous = &grpc.ObjectID{} } if err := m.Previous.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1607,7 +1608,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ParentSignature == nil { - m.ParentSignature = &service.Signature{} + m.ParentSignature = &grpc1.Signature{} } if err := m.ParentSignature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1678,7 +1679,7 @@ func (m *Header_Split) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Children = append(m.Children, &refs.ObjectID{}) + m.Children = append(m.Children, &grpc.ObjectID{}) if err := m.Children[len(m.Children)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -1767,7 +1768,7 @@ func (m *Object) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.ObjectId == nil { - m.ObjectId = &refs.ObjectID{} + m.ObjectId = &grpc.ObjectID{} } if err := m.ObjectId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1803,7 +1804,7 @@ func (m *Object) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Signature == nil { - m.Signature = &service.Signature{} + m.Signature = &grpc1.Signature{} } if err := m.Signature.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/v2/refs/convert.go b/v2/refs/convert.go new file mode 100644 index 0000000..869a0e6 --- /dev/null +++ b/v2/refs/convert.go @@ -0,0 +1,29 @@ +package refs + +import ( + refs "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" +) + +func OwnerIDToGRPCMessage(o *OwnerID) *refs.OwnerID { + if o == nil { + return nil + } + + m := new(refs.OwnerID) + + m.SetValue(o.GetValue()) + + return m +} + +func OwnerIDFromGRPCMessage(m *refs.OwnerID) *OwnerID { + if m == nil { + return nil + } + + o := new(OwnerID) + + o.SetValue(m.GetValue()) + + return o +} diff --git a/v2/refs/marshal.go b/v2/refs/grpc/marshal.go similarity index 100% rename from v2/refs/marshal.go rename to v2/refs/grpc/marshal.go diff --git a/v2/refs/marshal_test.go b/v2/refs/grpc/marshal_test.go similarity index 100% rename from v2/refs/marshal_test.go rename to v2/refs/grpc/marshal_test.go diff --git a/v2/refs/types.go b/v2/refs/grpc/types.go similarity index 100% rename from v2/refs/types.go rename to v2/refs/grpc/types.go diff --git a/v2/refs/types.pb.go b/v2/refs/grpc/types.pb.go similarity index 91% rename from v2/refs/types.pb.go rename to v2/refs/grpc/types.pb.go index 5e57a4b..7634600 100644 --- a/v2/refs/types.pb.go +++ b/v2/refs/grpc/types.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/refs/types.proto +// source: v2/refs/grpc/types.proto package refs @@ -37,7 +37,7 @@ func (m *Address) Reset() { *m = Address{} } func (m *Address) String() string { return proto.CompactTextString(m) } func (*Address) ProtoMessage() {} func (*Address) Descriptor() ([]byte, []int) { - return fileDescriptor_8ea16029b13f1cfa, []int{0} + return fileDescriptor_08f084e5f91ec87c, []int{0} } func (m *Address) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -93,7 +93,7 @@ func (m *ObjectID) Reset() { *m = ObjectID{} } func (m *ObjectID) String() string { return proto.CompactTextString(m) } func (*ObjectID) ProtoMessage() {} func (*ObjectID) Descriptor() ([]byte, []int) { - return fileDescriptor_8ea16029b13f1cfa, []int{1} + return fileDescriptor_08f084e5f91ec87c, []int{1} } func (m *ObjectID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -142,7 +142,7 @@ func (m *ContainerID) Reset() { *m = ContainerID{} } func (m *ContainerID) String() string { return proto.CompactTextString(m) } func (*ContainerID) ProtoMessage() {} func (*ContainerID) Descriptor() ([]byte, []int) { - return fileDescriptor_8ea16029b13f1cfa, []int{2} + return fileDescriptor_08f084e5f91ec87c, []int{2} } func (m *ContainerID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -191,7 +191,7 @@ func (m *OwnerID) Reset() { *m = OwnerID{} } func (m *OwnerID) String() string { return proto.CompactTextString(m) } func (*OwnerID) ProtoMessage() {} func (*OwnerID) Descriptor() ([]byte, []int) { - return fileDescriptor_8ea16029b13f1cfa, []int{3} + return fileDescriptor_08f084e5f91ec87c, []int{3} } func (m *OwnerID) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -234,27 +234,27 @@ func init() { proto.RegisterType((*OwnerID)(nil), "neo.fs.v2.refs.OwnerID") } -func init() { proto.RegisterFile("v2/refs/types.proto", fileDescriptor_8ea16029b13f1cfa) } +func init() { proto.RegisterFile("v2/refs/grpc/types.proto", fileDescriptor_08f084e5f91ec87c) } -var fileDescriptor_8ea16029b13f1cfa = []byte{ - // 259 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x12, 0x2e, 0x33, 0xd2, 0x2f, - 0x4a, 0x4d, 0x2b, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, - 0xe2, 0xcb, 0x4b, 0xcd, 0xd7, 0x4b, 0x2b, 0xd6, 0x2b, 0x33, 0xd2, 0x03, 0xc9, 0x29, 0x35, 0x30, - 0x72, 0xb1, 0x3b, 0xa6, 0xa4, 0x14, 0xa5, 0x16, 0x17, 0x0b, 0xd9, 0x71, 0xf1, 0x24, 0xe7, 0xe7, - 0x95, 0x24, 0x66, 0xe6, 0xa5, 0x16, 0xc5, 0x67, 0xa6, 0x48, 0x30, 0x2a, 0x30, 0x6a, 0x70, 0x1b, - 0x49, 0xeb, 0xa1, 0x6a, 0xd1, 0x73, 0x86, 0xa9, 0xf1, 0x74, 0x09, 0xe2, 0x86, 0x6b, 0xf0, 0x4c, - 0x11, 0x32, 0xe5, 0xe2, 0xcc, 0x4f, 0xca, 0x4a, 0x4d, 0x2e, 0x01, 0x69, 0x66, 0x02, 0x6b, 0x96, - 0x40, 0xd7, 0xec, 0x0f, 0x56, 0xe0, 0xe9, 0x12, 0xc4, 0x01, 0x51, 0xea, 0x99, 0xa2, 0xa4, 0xc0, - 0xc5, 0x01, 0x13, 0x15, 0x12, 0xe1, 0x62, 0x2d, 0x4b, 0xcc, 0x29, 0x4d, 0x05, 0xdb, 0xcd, 0x13, - 0x04, 0xe1, 0x28, 0x29, 0x73, 0x71, 0x23, 0x59, 0x8a, 0x43, 0x91, 0x3c, 0x17, 0xbb, 0x7f, 0x39, - 0x1e, 0x05, 0x4e, 0x21, 0x27, 0x1e, 0xc9, 0x31, 0x5e, 0x78, 0x24, 0xc7, 0xf8, 0xe0, 0x91, 0x1c, - 0xe3, 0x8c, 0xc7, 0x72, 0x0c, 0x51, 0x7a, 0xe9, 0x99, 0x25, 0x19, 0xa5, 0x49, 0x7a, 0xc9, 0xf9, - 0xb9, 0xfa, 0x79, 0xc5, 0x05, 0xc9, 0xc9, 0xba, 0x29, 0xa9, 0x65, 0xfa, 0x79, 0xa9, 0xf9, 0x69, - 0xc5, 0xba, 0x89, 0x05, 0x99, 0xba, 0xe9, 0xf9, 0xfa, 0xd0, 0x30, 0xb4, 0x06, 0x11, 0xab, 0x98, - 0x04, 0xfd, 0x52, 0xf3, 0xdd, 0x82, 0xf5, 0x1c, 0x03, 0x3c, 0x41, 0x1e, 0x0a, 0x4a, 0x4d, 0x2b, - 0x4e, 0x62, 0x03, 0x87, 0xab, 0x31, 0x20, 0x00, 0x00, 0xff, 0xff, 0xd0, 0xa5, 0x8b, 0x04, 0x6e, - 0x01, 0x00, 0x00, +var fileDescriptor_08f084e5f91ec87c = []byte{ + // 265 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x28, 0x33, 0xd2, 0x2f, + 0x4a, 0x4d, 0x2b, 0xd6, 0x4f, 0x2f, 0x2a, 0x48, 0xd6, 0x2f, 0xa9, 0x2c, 0x48, 0x2d, 0xd6, 0x2b, + 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0xcb, 0x4b, 0xcd, 0xd7, 0x4b, 0x2b, 0xd6, 0x2b, 0x33, 0xd2, + 0x03, 0x29, 0x50, 0x6a, 0x60, 0xe4, 0x62, 0x77, 0x4c, 0x49, 0x29, 0x4a, 0x2d, 0x2e, 0x16, 0xb2, + 0xe3, 0xe2, 0x49, 0xce, 0xcf, 0x2b, 0x49, 0xcc, 0xcc, 0x4b, 0x2d, 0x8a, 0xcf, 0x4c, 0x91, 0x60, + 0x54, 0x60, 0xd4, 0xe0, 0x36, 0x92, 0xd6, 0x43, 0xd5, 0xa2, 0xe7, 0x0c, 0x53, 0xe3, 0xe9, 0x12, + 0xc4, 0x0d, 0xd7, 0xe0, 0x99, 0x22, 0x64, 0xca, 0xc5, 0x99, 0x9f, 0x94, 0x95, 0x9a, 0x5c, 0x02, + 0xd2, 0xcc, 0x04, 0xd6, 0x2c, 0x81, 0xae, 0xd9, 0x1f, 0xac, 0xc0, 0xd3, 0x25, 0x88, 0x03, 0xa2, + 0xd4, 0x33, 0x45, 0x49, 0x81, 0x8b, 0x03, 0x26, 0x2a, 0x24, 0xc2, 0xc5, 0x5a, 0x96, 0x98, 0x53, + 0x9a, 0x0a, 0xb6, 0x9b, 0x27, 0x08, 0xc2, 0x51, 0x52, 0xe6, 0xe2, 0x46, 0xb2, 0x14, 0x87, 0x22, + 0x79, 0x2e, 0x76, 0xff, 0x72, 0x3c, 0x0a, 0x9c, 0x22, 0x4f, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, + 0x8e, 0xf1, 0xc1, 0x23, 0x39, 0xc6, 0x19, 0x8f, 0xe5, 0x18, 0xa2, 0x8c, 0xd3, 0x33, 0x4b, 0x32, + 0x4a, 0x93, 0xf4, 0x92, 0xf3, 0x73, 0xf5, 0xf3, 0x8a, 0x0b, 0x92, 0x93, 0x75, 0x53, 0x52, 0xcb, + 0xf4, 0xf3, 0x52, 0xf3, 0xd3, 0x8a, 0x75, 0x13, 0x0b, 0x32, 0x75, 0xd3, 0xf3, 0xf5, 0x91, 0x03, + 0xd2, 0x1a, 0xc4, 0x5a, 0xc5, 0x24, 0xe8, 0x97, 0x9a, 0xef, 0x16, 0xac, 0xe7, 0x18, 0xe0, 0x09, + 0xf2, 0x55, 0x50, 0x6a, 0x5a, 0x71, 0x12, 0x1b, 0x38, 0x70, 0x8d, 0x01, 0x01, 0x00, 0x00, 0xff, + 0xff, 0x64, 0x50, 0x7b, 0x92, 0x78, 0x01, 0x00, 0x00, } func (m *Address) Marshal() (dAtA []byte, err error) { diff --git a/v2/refs/owner.go b/v2/refs/owner.go new file mode 100644 index 0000000..acaa692 --- /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 0000000..bf2c3a2 --- /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 a44e464..c5e9c78 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 648f7f0..397dc3a 100644 --- a/v2/service/meta.pb.go +++ b/v2/service/grpc/meta.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/service/meta.proto +// source: v2/service/grpc/meta.proto package service import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - acl "github.com/nspcc-dev/neofs-api-go/v2/acl" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" + grpc1 "github.com/nspcc-dev/neofs-api-go/v2/acl/grpc" + grpc "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" io "io" math "math" math_bits "math/bits" @@ -73,7 +73,7 @@ func (x SessionToken_Body_Verb) String() string { } func (SessionToken_Body_Verb) EnumDescriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{3, 0, 0} + return fileDescriptor_174eb6ef9ee2b356, []int{3, 0, 0} } // Extended headers for Request/Response @@ -91,7 +91,7 @@ func (m *XHeader) Reset() { *m = XHeader{} } func (m *XHeader) String() string { return proto.CompactTextString(m) } func (*XHeader) ProtoMessage() {} func (*XHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{0} + return fileDescriptor_174eb6ef9ee2b356, []int{0} } func (m *XHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -149,7 +149,7 @@ func (m *Version) Reset() { *m = Version{} } func (m *Version) String() string { return proto.CompactTextString(m) } func (*Version) ProtoMessage() {} func (*Version) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{1} + return fileDescriptor_174eb6ef9ee2b356, []int{1} } func (m *Version) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -209,7 +209,7 @@ func (m *TokenLifetime) Reset() { *m = TokenLifetime{} } func (m *TokenLifetime) String() string { return proto.CompactTextString(m) } func (*TokenLifetime) ProtoMessage() {} func (*TokenLifetime) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{2} + return fileDescriptor_174eb6ef9ee2b356, []int{2} } func (m *TokenLifetime) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -274,7 +274,7 @@ func (m *SessionToken) Reset() { *m = SessionToken{} } func (m *SessionToken) String() string { return proto.CompactTextString(m) } func (*SessionToken) ProtoMessage() {} func (*SessionToken) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{3} + return fileDescriptor_174eb6ef9ee2b356, []int{3} } func (m *SessionToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -322,7 +322,7 @@ type SessionToken_Body struct { // ID is a token identifier. valid UUIDv4 represented in bytes Id []byte `protobuf:"bytes,1,opt,name=id,proto3" json:"id,omitempty"` // OwnerID carries identifier of the session initiator. - OwnerId *refs.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + OwnerId *grpc.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` // Verb is a type of request for which the token is issued Verb SessionToken_Body_Verb `protobuf:"varint,3,opt,name=verb,proto3,enum=neo.fs.v2.service.SessionToken_Body_Verb" json:"verb,omitempty"` // Lifetime is a lifetime of the session @@ -343,7 +343,7 @@ func (m *SessionToken_Body) Reset() { *m = SessionToken_Body{} } func (m *SessionToken_Body) String() string { return proto.CompactTextString(m) } func (*SessionToken_Body) ProtoMessage() {} func (*SessionToken_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{3, 0} + return fileDescriptor_174eb6ef9ee2b356, []int{3, 0} } func (m *SessionToken_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -379,7 +379,7 @@ type isSessionToken_Body_Context interface { } type SessionToken_Body_ObjectAddress struct { - ObjectAddress *refs.Address `protobuf:"bytes,6,opt,name=object_address,json=objectAddress,proto3,oneof" json:"object_address,omitempty"` + ObjectAddress *grpc.Address `protobuf:"bytes,6,opt,name=object_address,json=objectAddress,proto3,oneof" json:"object_address,omitempty"` } func (*SessionToken_Body_ObjectAddress) isSessionToken_Body_Context() {} @@ -398,7 +398,7 @@ func (m *SessionToken_Body) GetId() []byte { return nil } -func (m *SessionToken_Body) GetOwnerId() *refs.OwnerID { +func (m *SessionToken_Body) GetOwnerId() *grpc.OwnerID { if m != nil { return m.OwnerId } @@ -426,7 +426,7 @@ func (m *SessionToken_Body) GetSessionKey() []byte { return nil } -func (m *SessionToken_Body) GetObjectAddress() *refs.Address { +func (m *SessionToken_Body) GetObjectAddress() *grpc.Address { if x, ok := m.GetContext().(*SessionToken_Body_ObjectAddress); ok { return x.ObjectAddress } @@ -455,7 +455,7 @@ func (m *BearerToken) Reset() { *m = BearerToken{} } func (m *BearerToken) String() string { return proto.CompactTextString(m) } func (*BearerToken) ProtoMessage() {} func (*BearerToken) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{4} + return fileDescriptor_174eb6ef9ee2b356, []int{4} } func (m *BearerToken) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -501,9 +501,9 @@ func (m *BearerToken) GetSignature() *Signature { // Bearer Token body type BearerToken_Body struct { // EACLTable carries table of extended ACL rules - EaclTable *acl.EACLTable `protobuf:"bytes,1,opt,name=eacl_table,json=eaclTable,proto3" json:"eacl_table,omitempty"` + EaclTable *grpc1.EACLTable `protobuf:"bytes,1,opt,name=eacl_table,json=eaclTable,proto3" json:"eacl_table,omitempty"` // OwnerID carries identifier of the token owner - OwnerId *refs.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + OwnerId *grpc.OwnerID `protobuf:"bytes,2,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` // Token expiration and valid time period parameters Lifetime *TokenLifetime `protobuf:"bytes,3,opt,name=lifetime,proto3" json:"lifetime,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` @@ -515,7 +515,7 @@ func (m *BearerToken_Body) Reset() { *m = BearerToken_Body{} } func (m *BearerToken_Body) String() string { return proto.CompactTextString(m) } func (*BearerToken_Body) ProtoMessage() {} func (*BearerToken_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{4, 0} + return fileDescriptor_174eb6ef9ee2b356, []int{4, 0} } func (m *BearerToken_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -544,14 +544,14 @@ func (m *BearerToken_Body) XXX_DiscardUnknown() { var xxx_messageInfo_BearerToken_Body proto.InternalMessageInfo -func (m *BearerToken_Body) GetEaclTable() *acl.EACLTable { +func (m *BearerToken_Body) GetEaclTable() *grpc1.EACLTable { if m != nil { return m.EaclTable } return nil } -func (m *BearerToken_Body) GetOwnerId() *refs.OwnerID { +func (m *BearerToken_Body) GetOwnerId() *grpc.OwnerID { if m != nil { return m.OwnerId } @@ -590,7 +590,7 @@ func (m *RequestMetaHeader) Reset() { *m = RequestMetaHeader{} } func (m *RequestMetaHeader) String() string { return proto.CompactTextString(m) } func (*RequestMetaHeader) ProtoMessage() {} func (*RequestMetaHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{5} + return fileDescriptor_174eb6ef9ee2b356, []int{5} } func (m *RequestMetaHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -689,7 +689,7 @@ func (m *ResponseMetaHeader) Reset() { *m = ResponseMetaHeader{} } func (m *ResponseMetaHeader) String() string { return proto.CompactTextString(m) } func (*ResponseMetaHeader) ProtoMessage() {} func (*ResponseMetaHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_932e020d69aee3f0, []int{6} + return fileDescriptor_174eb6ef9ee2b356, []int{6} } func (m *ResponseMetaHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -766,63 +766,63 @@ func init() { proto.RegisterType((*ResponseMetaHeader)(nil), "neo.fs.v2.service.ResponseMetaHeader") } -func init() { proto.RegisterFile("v2/service/meta.proto", fileDescriptor_932e020d69aee3f0) } +func init() { proto.RegisterFile("v2/service/grpc/meta.proto", fileDescriptor_174eb6ef9ee2b356) } -var fileDescriptor_932e020d69aee3f0 = []byte{ - // 834 bytes of a gzipped FileDescriptorProto +var fileDescriptor_174eb6ef9ee2b356 = []byte{ + // 838 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x55, 0xcd, 0x6e, 0x23, 0x45, - 0x10, 0xce, 0xd8, 0x93, 0x38, 0x2e, 0xdb, 0x61, 0xd2, 0x04, 0xad, 0x15, 0x21, 0x6f, 0x64, 0x40, - 0x82, 0x43, 0xc6, 0x62, 0x58, 0x14, 0x04, 0xbb, 0x12, 0x76, 0x3c, 0xbb, 0x36, 0x84, 0x6c, 0xd4, - 0xf6, 0x46, 0x08, 0x09, 0x59, 0xf3, 0x53, 0x4e, 0x66, 0xd7, 0x99, 0x36, 0xd3, 0x9d, 0x21, 0x7e, + 0x10, 0xce, 0xd8, 0x93, 0x38, 0x2e, 0xdb, 0x61, 0xd2, 0x8a, 0xb4, 0x23, 0x6b, 0xe5, 0x8d, 0x0c, + 0x48, 0x70, 0xc8, 0x58, 0x0c, 0xa0, 0xf0, 0xb3, 0x2b, 0x61, 0xc7, 0xb3, 0x6b, 0x43, 0xc8, 0x46, + 0x6d, 0x6f, 0x84, 0xb8, 0x58, 0xf3, 0x53, 0x76, 0x66, 0xd7, 0x99, 0x36, 0xd3, 0x93, 0x21, 0x7e, 0x13, 0x24, 0xde, 0x80, 0x1b, 0x17, 0x9e, 0x81, 0x23, 0x12, 0x37, 0x4e, 0x28, 0xdc, 0xb8, 0xf1, - 0x06, 0xa8, 0x7f, 0xbc, 0x3b, 0x61, 0xbd, 0xfc, 0x89, 0x03, 0x27, 0x57, 0x7d, 0x5d, 0xf5, 0x55, - 0x57, 0xf5, 0xe7, 0x1a, 0x78, 0x25, 0xf7, 0x3a, 0x1c, 0xb3, 0x3c, 0x89, 0xb0, 0x73, 0x81, 0x22, - 0x70, 0xe7, 0x19, 0x13, 0x8c, 0x6c, 0xa7, 0xc8, 0xdc, 0x29, 0x77, 0x73, 0xcf, 0x35, 0xa7, 0xbb, - 0x24, 0xf7, 0x3a, 0x41, 0x34, 0xeb, 0x88, 0xc5, 0x1c, 0xb9, 0x0e, 0xdb, 0x7d, 0x39, 0xf7, 0x3a, - 0x19, 0x4e, 0xf9, 0x0d, 0xf0, 0x56, 0x81, 0x32, 0xc7, 0x2c, 0x99, 0x2e, 0xf4, 0x41, 0xfb, 0x6d, - 0xa8, 0x7c, 0x3a, 0xc0, 0x20, 0xc6, 0x8c, 0x38, 0x50, 0x7e, 0x82, 0x8b, 0xa6, 0xb5, 0x67, 0xbd, - 0x59, 0xa5, 0xd2, 0x24, 0x3b, 0xb0, 0x9e, 0x07, 0xb3, 0x4b, 0x6c, 0x96, 0x14, 0xa6, 0x9d, 0xf6, - 0xbb, 0x50, 0x39, 0xc5, 0x8c, 0x27, 0x2c, 0x95, 0x01, 0x17, 0xc1, 0x63, 0x96, 0xa9, 0xa4, 0x06, - 0xd5, 0x8e, 0x42, 0x93, 0x94, 0x65, 0x2a, 0x4d, 0xa2, 0xd2, 0x69, 0xfb, 0xd0, 0x18, 0xb3, 0x27, - 0x98, 0x1e, 0x25, 0x53, 0x14, 0xc9, 0x05, 0xca, 0x7a, 0x78, 0x35, 0x57, 0xa9, 0x36, 0x95, 0xa6, - 0x44, 0xd2, 0x70, 0xaa, 0xd2, 0x6c, 0x2a, 0x4d, 0x89, 0x24, 0x81, 0x68, 0x96, 0x35, 0x92, 0x04, - 0xa2, 0xfd, 0x93, 0x0d, 0xf5, 0x11, 0x72, 0x59, 0x5e, 0xd1, 0x91, 0xf7, 0xc0, 0x0e, 0x59, 0xac, - 0xef, 0x5d, 0xf3, 0x5e, 0x77, 0x9f, 0x9b, 0x92, 0x5b, 0x0c, 0x77, 0x7b, 0x2c, 0x5e, 0x50, 0x95, - 0x41, 0xde, 0x87, 0x2a, 0x4f, 0xce, 0xd2, 0x40, 0x5c, 0x66, 0xba, 0xc5, 0x9a, 0xf7, 0xea, 0xaa, - 0xf4, 0x65, 0x0c, 0x7d, 0x16, 0xbe, 0xfb, 0x63, 0x19, 0x6c, 0x49, 0x45, 0xb6, 0xa0, 0x94, 0xc4, - 0xaa, 0x78, 0x9d, 0x96, 0x92, 0x98, 0x78, 0xb0, 0xc9, 0xbe, 0x4c, 0x31, 0x9b, 0x24, 0xb1, 0xe1, - 0xbc, 0x55, 0xe0, 0x94, 0x0f, 0xe3, 0x3e, 0x94, 0xe7, 0xc3, 0x3e, 0xad, 0xa8, 0xc0, 0x61, 0x4c, - 0xee, 0x81, 0x9d, 0x63, 0x16, 0xaa, 0x36, 0xb7, 0xbc, 0xb7, 0xfe, 0x4e, 0x0b, 0xee, 0x29, 0x66, - 0x21, 0x55, 0x69, 0xe4, 0x2e, 0x6c, 0xce, 0xcc, 0x50, 0x9b, 0xb6, 0x2a, 0xb9, 0xb7, 0x82, 0xe2, - 0xc6, 0xf0, 0xe9, 0xd3, 0x0c, 0x72, 0x1b, 0x6a, 0x5c, 0xb3, 0x4f, 0xe4, 0xf3, 0xaf, 0xab, 0x4e, - 0xc0, 0x40, 0x1f, 0xe3, 0x82, 0x7c, 0x08, 0x5b, 0x2c, 0x7c, 0x8c, 0x91, 0x98, 0x04, 0x71, 0x9c, - 0x21, 0xe7, 0xcd, 0x8d, 0xd5, 0x7d, 0x75, 0xf5, 0xf1, 0x60, 0x8d, 0x36, 0x74, 0x82, 0x01, 0xda, - 0x5f, 0x5b, 0x60, 0xcb, 0xfb, 0x92, 0x1d, 0x70, 0x4e, 0x7d, 0xda, 0x9b, 0x3c, 0x3a, 0x1e, 0x9d, - 0xf8, 0x87, 0xc3, 0xfb, 0x43, 0xbf, 0xef, 0xac, 0x91, 0x2d, 0x80, 0x87, 0xbd, 0x8f, 0xfc, 0xc3, - 0xf1, 0xe4, 0xe4, 0xd1, 0xd8, 0xb1, 0x0a, 0xfe, 0x03, 0x7f, 0xec, 0x94, 0xc8, 0x4b, 0x50, 0x33, - 0xfe, 0xc0, 0xef, 0xf6, 0x9d, 0x32, 0xd9, 0x86, 0x86, 0x01, 0x46, 0x7e, 0x97, 0x1e, 0x0e, 0x1c, - 0xbb, 0x00, 0xf5, 0xfd, 0x23, 0x7f, 0xec, 0x3b, 0xeb, 0xc4, 0x81, 0xba, 0x81, 0x68, 0xf7, 0xf8, - 0x81, 0xef, 0x6c, 0xc8, 0xf2, 0x45, 0x64, 0xd0, 0x1d, 0x0d, 0x9c, 0x4a, 0xaf, 0x0a, 0x95, 0x88, - 0xa5, 0x02, 0xaf, 0x44, 0xfb, 0xbb, 0x12, 0xd4, 0x7a, 0x18, 0x64, 0x98, 0x69, 0x6d, 0x1d, 0xdc, - 0xd0, 0xd6, 0x6b, 0x2b, 0xa6, 0x5a, 0x88, 0xfe, 0xaf, 0xa4, 0xf5, 0xad, 0x65, 0xa4, 0x75, 0x00, - 0x80, 0x41, 0x34, 0x9b, 0x88, 0x20, 0x9c, 0xa1, 0xb9, 0x43, 0xb3, 0xc0, 0x12, 0x44, 0x33, 0xd7, - 0xef, 0x1e, 0x1e, 0x8d, 0xe5, 0x39, 0xad, 0xca, 0x58, 0x65, 0xfe, 0x2b, 0x0d, 0x16, 0x45, 0x54, - 0xfe, 0xa7, 0x22, 0x6a, 0xff, 0x56, 0x82, 0x6d, 0x8a, 0x5f, 0x5c, 0x22, 0x17, 0x9f, 0xa0, 0x08, - 0xcc, 0x46, 0xb9, 0x03, 0x95, 0x5c, 0x6f, 0x0a, 0x73, 0xfb, 0xdd, 0x15, 0x94, 0x66, 0x97, 0xd0, - 0x65, 0xa8, 0x5c, 0x1f, 0x38, 0x67, 0xd1, 0xb9, 0xd9, 0x03, 0xda, 0x91, 0x9b, 0x40, 0x88, 0x99, - 0xba, 0x5a, 0x83, 0x4a, 0x93, 0x1c, 0x40, 0xf5, 0x6a, 0x72, 0xae, 0x2a, 0xf1, 0xa6, 0xbd, 0x57, - 0x7e, 0x01, 0xbf, 0x59, 0x6f, 0x74, 0xf3, 0x4a, 0x1b, 0x9c, 0xf4, 0xa1, 0xb1, 0x54, 0xbc, 0x90, - 0xfd, 0x28, 0xcd, 0xd7, 0xbc, 0xdb, 0x7f, 0xf1, 0xbf, 0xa3, 0x75, 0x5e, 0xdc, 0x3b, 0x5d, 0xa8, - 0x87, 0xea, 0xf1, 0x0d, 0x89, 0xfe, 0x53, 0xb4, 0xfe, 0x5c, 0x23, 0xb4, 0x16, 0x16, 0xe4, 0x75, - 0x17, 0x36, 0x58, 0x96, 0x9c, 0x25, 0x69, 0xb3, 0xf2, 0xc2, 0xe5, 0xf5, 0xdc, 0x54, 0xa9, 0xc9, - 0x69, 0xff, 0x6a, 0x01, 0xa1, 0xc8, 0xe7, 0x2c, 0xe5, 0xf8, 0xff, 0x1f, 0xfa, 0xbd, 0xa7, 0xbd, - 0xea, 0x69, 0xbf, 0xb1, 0xb2, 0xd7, 0x3f, 0x76, 0xb3, 0x6c, 0xb6, 0xf7, 0xf9, 0xf7, 0xd7, 0x2d, - 0xeb, 0x87, 0xeb, 0x96, 0xf5, 0xf3, 0x75, 0xcb, 0xfa, 0xea, 0x97, 0xd6, 0xda, 0x67, 0x77, 0xce, - 0x12, 0x71, 0x7e, 0x19, 0xba, 0x11, 0xbb, 0xe8, 0xa4, 0x7c, 0x1e, 0x45, 0xfb, 0x31, 0xe6, 0x9d, - 0x14, 0xd9, 0x94, 0xef, 0x07, 0xf3, 0x64, 0xff, 0x8c, 0x75, 0x9e, 0x7d, 0xf4, 0x3e, 0x30, 0xbf, - 0xdf, 0x94, 0x76, 0x8e, 0x91, 0xdd, 0x1f, 0xb9, 0xdd, 0x93, 0xa1, 0xac, 0x3c, 0xd2, 0x70, 0xb8, - 0xa1, 0xbe, 0x86, 0xef, 0xfc, 0x1e, 0x00, 0x00, 0xff, 0xff, 0xf6, 0xba, 0x8b, 0x7f, 0x7b, 0x07, - 0x00, 0x00, + 0x06, 0xa8, 0x7f, 0xbc, 0xcc, 0x26, 0x5e, 0xfe, 0xc4, 0x81, 0x5b, 0xd5, 0xd7, 0x5f, 0x55, 0x75, + 0x55, 0x7f, 0x53, 0x03, 0xcd, 0xdc, 0xed, 0x70, 0x4c, 0xf3, 0x38, 0xc4, 0xce, 0x2c, 0x5d, 0x84, + 0x9d, 0x0b, 0xcc, 0x7c, 0x67, 0x91, 0xb2, 0x8c, 0x91, 0xdd, 0x04, 0x99, 0x33, 0xe5, 0x4e, 0xee, + 0x3a, 0x9a, 0xd2, 0xbc, 0x93, 0xbb, 0x1d, 0x3f, 0x9c, 0x2b, 0x6a, 0xb6, 0x5c, 0x20, 0x57, 0xdc, + 0xa6, 0x9d, 0xbb, 0x9d, 0x14, 0xa7, 0xfc, 0xf6, 0xc9, 0xdd, 0x9b, 0x15, 0x72, 0x4c, 0xe3, 0xe9, + 0x52, 0x9d, 0xb6, 0xdf, 0x82, 0xca, 0x67, 0x03, 0xf4, 0x23, 0x4c, 0x89, 0x05, 0xe5, 0x67, 0xb8, + 0xb4, 0x8d, 0x7d, 0xe3, 0x8d, 0x2a, 0x15, 0x26, 0xd9, 0x83, 0xcd, 0xdc, 0x9f, 0x5f, 0xa2, 0x5d, + 0x92, 0x98, 0x72, 0xda, 0xef, 0x42, 0xe5, 0x0c, 0x53, 0x1e, 0xb3, 0x44, 0x10, 0x2e, 0xfc, 0xa7, + 0x2c, 0x95, 0x41, 0x0d, 0xaa, 0x1c, 0x89, 0xc6, 0x09, 0x4b, 0x65, 0x98, 0x40, 0x85, 0xd3, 0xf6, + 0xa0, 0x31, 0x66, 0xcf, 0x30, 0x39, 0x8e, 0xa7, 0x98, 0xc5, 0x17, 0x28, 0xea, 0xe1, 0xd5, 0x42, + 0x86, 0x9a, 0x54, 0x98, 0x02, 0x49, 0x82, 0xa9, 0x0c, 0x33, 0xa9, 0x30, 0x05, 0x12, 0xfb, 0x99, + 0x5d, 0x56, 0x48, 0xec, 0x67, 0xed, 0x9f, 0x4c, 0xa8, 0x8f, 0x90, 0x8b, 0xf2, 0x32, 0x1d, 0x79, + 0x0f, 0xcc, 0x80, 0x45, 0xea, 0xde, 0x35, 0xf7, 0x35, 0xe7, 0xd6, 0xd0, 0x9c, 0x22, 0xdd, 0xe9, + 0xb1, 0x68, 0x49, 0x65, 0x04, 0xf9, 0x00, 0xaa, 0x3c, 0x9e, 0x25, 0x7e, 0x76, 0x99, 0xaa, 0x16, + 0x6b, 0xee, 0xdd, 0x75, 0xe1, 0x2b, 0x0e, 0xfd, 0x83, 0xde, 0xfc, 0xb1, 0x0c, 0xa6, 0x48, 0x45, + 0x76, 0xa0, 0x14, 0x47, 0xb2, 0x78, 0x9d, 0x96, 0xe2, 0x88, 0xb8, 0xb0, 0xcd, 0xbe, 0x4c, 0x30, + 0x9d, 0xc4, 0x91, 0xce, 0x79, 0xa7, 0x90, 0x53, 0x3c, 0x91, 0xf3, 0x58, 0x9c, 0x0f, 0xfb, 0xb4, + 0x22, 0x89, 0xc3, 0x88, 0x3c, 0x00, 0x33, 0xc7, 0x34, 0x90, 0x6d, 0xee, 0xb8, 0x6f, 0xfe, 0x9d, + 0x16, 0x9c, 0x33, 0x4c, 0x03, 0x2a, 0xc3, 0xc8, 0x7d, 0xd8, 0x9e, 0xeb, 0xa1, 0xda, 0xa6, 0x2c, + 0xb9, 0xbf, 0x26, 0xc5, 0x0b, 0xc3, 0xa7, 0xcf, 0x23, 0xc8, 0x3d, 0xa8, 0x71, 0x95, 0x7d, 0x22, + 0x9e, 0x7f, 0x53, 0x76, 0x02, 0x1a, 0xfa, 0x04, 0x97, 0xe4, 0x23, 0xd8, 0x61, 0xc1, 0x53, 0x0c, + 0xb3, 0x89, 0x1f, 0x45, 0x29, 0x72, 0x6e, 0x6f, 0xad, 0xef, 0xab, 0xab, 0x8e, 0x07, 0x1b, 0xb4, + 0xa1, 0x02, 0x34, 0xd0, 0xfe, 0xda, 0x00, 0x53, 0xdc, 0x97, 0xec, 0x81, 0x75, 0xe6, 0xd1, 0xde, + 0xe4, 0xc9, 0xc9, 0xe8, 0xd4, 0x3b, 0x1a, 0x3e, 0x1c, 0x7a, 0x7d, 0x6b, 0x83, 0xec, 0x00, 0x3c, + 0xee, 0x7d, 0xec, 0x1d, 0x8d, 0x27, 0xa7, 0x4f, 0xc6, 0x96, 0x51, 0xf0, 0x1f, 0x79, 0x63, 0xab, + 0x44, 0x5e, 0x81, 0x9a, 0xf6, 0x07, 0x5e, 0xb7, 0x6f, 0x95, 0xc9, 0x2e, 0x34, 0x34, 0x30, 0xf2, + 0xba, 0xf4, 0x68, 0x60, 0x99, 0x05, 0xa8, 0xef, 0x1d, 0x7b, 0x63, 0xcf, 0xda, 0x24, 0x16, 0xd4, + 0x35, 0x44, 0xbb, 0x27, 0x8f, 0x3c, 0x6b, 0x4b, 0x94, 0x2f, 0x22, 0x83, 0xee, 0x68, 0x60, 0x55, + 0x7a, 0x55, 0xa8, 0x84, 0x2c, 0xc9, 0xf0, 0x2a, 0x6b, 0x7f, 0x57, 0x82, 0x5a, 0x0f, 0xfd, 0x14, + 0x53, 0xa5, 0xad, 0xc3, 0x17, 0xb4, 0xf5, 0xea, 0x9a, 0xa9, 0x16, 0xd8, 0xff, 0x95, 0xb4, 0xbe, + 0x35, 0xb4, 0xb4, 0x0e, 0x01, 0xd0, 0x0f, 0xe7, 0x93, 0xcc, 0x0f, 0xe6, 0xa8, 0xef, 0x60, 0x17, + 0xb2, 0xf8, 0xe1, 0xdc, 0xf1, 0xba, 0x47, 0xc7, 0x63, 0x71, 0x4e, 0xab, 0x82, 0x2b, 0xcd, 0x7f, + 0xa5, 0xc1, 0xa2, 0x88, 0xca, 0xff, 0x54, 0x44, 0xed, 0xdf, 0x4a, 0xb0, 0x4b, 0xf1, 0x8b, 0x4b, + 0xe4, 0xd9, 0xa7, 0x98, 0xf9, 0x7a, 0xa3, 0xbc, 0x03, 0x95, 0x5c, 0x6d, 0x0a, 0x7d, 0xfb, 0xe6, + 0x9a, 0x94, 0x7a, 0x97, 0xd0, 0x15, 0x55, 0xac, 0x0f, 0x5c, 0xb0, 0xf0, 0x5c, 0xef, 0x01, 0xe5, + 0x88, 0x4d, 0x90, 0x65, 0x73, 0x79, 0xb5, 0x06, 0x15, 0x26, 0x39, 0x84, 0xea, 0xd5, 0xe4, 0x5c, + 0x56, 0xe2, 0xb6, 0xb9, 0x5f, 0x7e, 0x49, 0x7e, 0xbd, 0xde, 0xe8, 0xf6, 0x95, 0x32, 0x38, 0xe9, + 0x43, 0x63, 0xa5, 0xf8, 0x4c, 0xf4, 0x23, 0x35, 0x5f, 0x73, 0xef, 0xfd, 0xc5, 0x77, 0x47, 0xeb, + 0xbc, 0xb8, 0x77, 0xba, 0x50, 0x0f, 0xe4, 0xe3, 0xeb, 0x24, 0xea, 0xa3, 0x68, 0xfd, 0xb9, 0x46, + 0x68, 0x2d, 0x28, 0xc8, 0xeb, 0x3e, 0x6c, 0xb1, 0x34, 0x9e, 0xc5, 0x89, 0x5d, 0x79, 0xe9, 0xf2, + 0xba, 0x35, 0x55, 0xaa, 0x63, 0xda, 0xbf, 0x1a, 0x40, 0x28, 0xf2, 0x05, 0x4b, 0x38, 0xfe, 0xff, + 0x87, 0xfe, 0xe0, 0x79, 0xaf, 0x6a, 0xda, 0xaf, 0xaf, 0xed, 0xf5, 0x66, 0x37, 0xab, 0x66, 0x7b, + 0xc1, 0xf7, 0xd7, 0x2d, 0xe3, 0x87, 0xeb, 0x96, 0xf1, 0xf3, 0x75, 0xcb, 0xf8, 0xea, 0x97, 0xd6, + 0xc6, 0xe7, 0xef, 0xcf, 0xe2, 0xec, 0xfc, 0x32, 0x70, 0x42, 0x76, 0xd1, 0x49, 0xf8, 0x22, 0x0c, + 0x0f, 0x22, 0xcc, 0x3b, 0x09, 0xb2, 0x29, 0x3f, 0xf0, 0x17, 0xf1, 0xc1, 0x8c, 0x75, 0x6e, 0xfc, + 0xf9, 0x3e, 0xd4, 0xce, 0x37, 0xa5, 0xbd, 0x13, 0x64, 0x0f, 0x47, 0x4e, 0xf7, 0x74, 0x28, 0xca, + 0x8f, 0x14, 0x1c, 0x6c, 0xc9, 0x5f, 0xe2, 0xdb, 0xbf, 0x07, 0x00, 0x00, 0xff, 0xff, 0xb8, 0xaf, + 0x1e, 0xa2, 0x94, 0x07, 0x00, 0x00, } func (m *XHeader) Marshal() (dAtA []byte, err error) { @@ -2182,7 +2182,7 @@ func (m *SessionToken_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2306,7 +2306,7 @@ func (m *SessionToken_Body) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - v := &refs.Address{} + v := &grpc.Address{} if err := v.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } @@ -2522,7 +2522,7 @@ func (m *BearerToken_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.EaclTable == nil { - m.EaclTable = &acl.EACLTable{} + m.EaclTable = &grpc1.EACLTable{} } if err := m.EaclTable.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -2558,7 +2558,7 @@ func (m *BearerToken_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err 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 39a512b..3f270b6 100644 --- a/v2/service/verify.pb.go +++ b/v2/service/grpc/verify.pb.go @@ -1,13 +1,13 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/service/verify.proto +// source: v2/service/grpc/verify.proto package service import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - _ "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/acl/grpc" + _ "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" io "io" math "math" math_bits "math/bits" @@ -39,7 +39,7 @@ func (m *Signature) Reset() { *m = Signature{} } func (m *Signature) String() string { return proto.CompactTextString(m) } func (*Signature) ProtoMessage() {} func (*Signature) Descriptor() ([]byte, []int) { - return fileDescriptor_848d62e0ecc8b6b6, []int{0} + return fileDescriptor_333853833d6163d3, []int{0} } func (m *Signature) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -101,7 +101,7 @@ func (m *RequestVerificationHeader) Reset() { *m = RequestVerificationHe func (m *RequestVerificationHeader) String() string { return proto.CompactTextString(m) } func (*RequestVerificationHeader) ProtoMessage() {} func (*RequestVerificationHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_848d62e0ecc8b6b6, []int{1} + return fileDescriptor_333853833d6163d3, []int{1} } func (m *RequestVerificationHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -177,7 +177,7 @@ func (m *ResponseVerificationHeader) Reset() { *m = ResponseVerification func (m *ResponseVerificationHeader) String() string { return proto.CompactTextString(m) } func (*ResponseVerificationHeader) ProtoMessage() {} func (*ResponseVerificationHeader) Descriptor() ([]byte, []int) { - return fileDescriptor_848d62e0ecc8b6b6, []int{2} + return fileDescriptor_333853833d6163d3, []int{2} } func (m *ResponseVerificationHeader) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -240,33 +240,33 @@ func init() { proto.RegisterType((*ResponseVerificationHeader)(nil), "neo.fs.v2.service.ResponseVerificationHeader") } -func init() { proto.RegisterFile("v2/service/verify.proto", fileDescriptor_848d62e0ecc8b6b6) } +func init() { proto.RegisterFile("v2/service/grpc/verify.proto", fileDescriptor_333853833d6163d3) } -var fileDescriptor_848d62e0ecc8b6b6 = []byte{ - // 353 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x93, 0x4f, 0x4b, 0xc3, 0x30, - 0x18, 0xc6, 0x6d, 0x37, 0x06, 0x46, 0x9d, 0xb3, 0x0a, 0xce, 0x21, 0x45, 0x76, 0xf2, 0x60, 0x13, - 0xac, 0xde, 0x3c, 0xe9, 0xfc, 0x7b, 0x11, 0xe9, 0xc0, 0x83, 0x20, 0xd2, 0x75, 0x6f, 0x6b, 0xd0, - 0x25, 0x35, 0xc9, 0x02, 0xfd, 0x26, 0x7e, 0x06, 0xcf, 0xe2, 0x67, 0xf0, 0xe8, 0x47, 0x90, 0xf9, - 0x45, 0xa4, 0xed, 0x66, 0x87, 0x6e, 0xb0, 0xbb, 0xa7, 0xbc, 0x3c, 0xc9, 0xf3, 0xcb, 0xc3, 0x03, - 0x2f, 0x5a, 0xd7, 0x2e, 0x91, 0x20, 0x34, 0x0d, 0x80, 0x68, 0x10, 0x34, 0x4c, 0x70, 0x2c, 0xb8, - 0xe2, 0xd6, 0x0a, 0x03, 0x8e, 0x43, 0x89, 0xb5, 0x8b, 0x87, 0xf7, 0x0d, 0x4b, 0xbb, 0xc4, 0x0f, - 0x1e, 0x89, 0x4a, 0x62, 0x90, 0xf9, 0xb3, 0xc6, 0xaa, 0x76, 0x89, 0x80, 0x50, 0x8e, 0x8b, 0xcd, - 0x5d, 0x34, 0xdf, 0xa6, 0x11, 0xf3, 0x55, 0x5f, 0x80, 0x55, 0x43, 0xa5, 0x07, 0x48, 0xea, 0xc6, - 0x96, 0xb1, 0xbd, 0xe8, 0xa5, 0xa3, 0x65, 0xa1, 0xb2, 0xa4, 0x11, 0xab, 0x9b, 0x99, 0x94, 0xcd, - 0xcd, 0x57, 0x13, 0x6d, 0x78, 0xf0, 0xd4, 0x07, 0xa9, 0xae, 0xd3, 0x18, 0x34, 0xf0, 0x15, 0xe5, - 0xec, 0x1c, 0xfc, 0x2e, 0x08, 0xab, 0x85, 0xaa, 0x1d, 0xde, 0x4d, 0xee, 0xe4, 0x88, 0x9a, 0xe1, - 0x16, 0xdc, 0x4d, 0xfc, 0x27, 0x25, 0xfe, 0xf9, 0xd9, 0x5b, 0x4a, 0x3d, 0x45, 0x90, 0x16, 0xaa, - 0xf6, 0x40, 0xf9, 0x63, 0x10, 0x73, 0x16, 0x48, 0xea, 0x29, 0x20, 0x67, 0xa8, 0xc6, 0x05, 0x8d, - 0x28, 0x1b, 0xc3, 0x94, 0x66, 0xc0, 0x2c, 0xe7, 0xae, 0x02, 0x74, 0x8c, 0x2a, 0xb9, 0x54, 0x2f, - 0x67, 0xf6, 0x9d, 0x09, 0xf6, 0xa9, 0x85, 0x78, 0x43, 0x6f, 0xf3, 0xcd, 0x44, 0x0d, 0x0f, 0x64, - 0xcc, 0x99, 0x84, 0xff, 0xd1, 0xdb, 0xc9, 0xaf, 0xde, 0x9c, 0x89, 0xbd, 0x4d, 0x6b, 0x64, 0x54, - 0xdc, 0xd1, 0xed, 0xfb, 0xc0, 0x36, 0x3e, 0x06, 0xb6, 0xf1, 0x39, 0xb0, 0x8d, 0xe7, 0x2f, 0x7b, - 0xee, 0x66, 0x3f, 0xa2, 0xea, 0xbe, 0xdf, 0xc1, 0x01, 0xef, 0x11, 0x26, 0xe3, 0x20, 0x70, 0xba, - 0xa0, 0x09, 0x03, 0x1e, 0x4a, 0xc7, 0x8f, 0xa9, 0x13, 0x71, 0x52, 0xec, 0xca, 0xc1, 0xf0, 0x7c, - 0x31, 0xd7, 0x2e, 0x81, 0x9f, 0xb6, 0xf1, 0xe1, 0xd5, 0x45, 0x9a, 0xa0, 0x9d, 0xcb, 0x9d, 0x4a, - 0xb6, 0x08, 0x7b, 0xdf, 0x01, 0x00, 0x00, 0xff, 0xff, 0x8d, 0x87, 0x6a, 0x4d, 0x5f, 0x03, 0x00, - 0x00, +var fileDescriptor_333853833d6163d3 = []byte{ + // 361 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe4, 0x93, 0xcf, 0x4a, 0xeb, 0x40, + 0x14, 0xc6, 0x6f, 0xd2, 0x52, 0xb8, 0x73, 0xef, 0xed, 0xad, 0x41, 0x30, 0x96, 0x12, 0xa4, 0x2b, + 0x17, 0x66, 0x06, 0xe3, 0x4a, 0x5c, 0x69, 0xfd, 0xbb, 0x11, 0x49, 0xc1, 0x85, 0x1b, 0x49, 0xd2, + 0x93, 0x38, 0x68, 0x67, 0xe2, 0xcc, 0x74, 0x20, 0x6f, 0xe2, 0x33, 0xb8, 0x16, 0x9f, 0xc1, 0xa5, + 0x8f, 0x20, 0xf5, 0x45, 0x24, 0x49, 0x6b, 0x4b, 0xff, 0x40, 0xf7, 0xee, 0x4e, 0x4e, 0xbe, 0xef, + 0x37, 0x1f, 0x1f, 0x1c, 0xd4, 0xd2, 0x1e, 0x91, 0x20, 0x34, 0x8d, 0x80, 0x24, 0x22, 0x8d, 0x88, + 0x06, 0x41, 0xe3, 0x0c, 0xa7, 0x82, 0x2b, 0x6e, 0xad, 0x31, 0xe0, 0x38, 0x96, 0x58, 0x7b, 0x78, + 0x24, 0x6a, 0x6e, 0x68, 0x8f, 0x04, 0xd1, 0x43, 0x29, 0x56, 0x59, 0x0a, 0xb2, 0xd4, 0x36, 0x6d, + 0xed, 0x11, 0x01, 0xb1, 0x9c, 0xfb, 0xd3, 0xde, 0x45, 0xbf, 0xbb, 0x34, 0x61, 0x81, 0x1a, 0x08, + 0xb0, 0x1a, 0xa8, 0x72, 0x0f, 0x99, 0x6d, 0x6c, 0x19, 0xdb, 0x7f, 0xfd, 0x7c, 0xb4, 0x2c, 0x54, + 0x95, 0x34, 0x61, 0xb6, 0x59, 0xac, 0x8a, 0xb9, 0xfd, 0x62, 0xa2, 0x4d, 0x1f, 0x1e, 0x07, 0x20, + 0xd5, 0x75, 0x1e, 0x88, 0x46, 0x81, 0xa2, 0x9c, 0x9d, 0x43, 0xd0, 0x03, 0x61, 0x75, 0x50, 0x3d, + 0xe4, 0xbd, 0xec, 0x56, 0x8e, 0xa9, 0x05, 0xee, 0x8f, 0xd7, 0xc2, 0x73, 0x79, 0xf1, 0xf7, 0xcb, + 0xfe, 0xbf, 0xdc, 0x33, 0x09, 0xd2, 0x41, 0xf5, 0x3e, 0xa8, 0x60, 0x0a, 0x62, 0xae, 0x02, 0xc9, + 0x3d, 0x13, 0xc8, 0x19, 0x6a, 0x70, 0x41, 0x13, 0xca, 0xa6, 0x30, 0x95, 0x15, 0x30, 0xff, 0x4b, + 0xd7, 0x04, 0x74, 0x8c, 0x6a, 0xe5, 0xca, 0xae, 0x16, 0xf6, 0x9d, 0x05, 0xf6, 0xa5, 0x85, 0xf8, + 0x23, 0x6f, 0xfb, 0xd5, 0x44, 0x4d, 0x1f, 0x64, 0xca, 0x99, 0x84, 0x9f, 0xd1, 0xdb, 0xc9, 0x4c, + 0x6f, 0xee, 0xc2, 0xde, 0x96, 0x35, 0x32, 0x2e, 0xee, 0x28, 0x7c, 0x1b, 0x3a, 0xc6, 0xfb, 0xd0, + 0x31, 0x3e, 0x86, 0x8e, 0xf1, 0xf4, 0xe9, 0xfc, 0xba, 0xd9, 0x4f, 0xa8, 0xba, 0x1b, 0x84, 0x38, + 0xe2, 0x7d, 0xc2, 0x64, 0x1a, 0x45, 0x6e, 0x0f, 0x34, 0x61, 0xc0, 0x63, 0xe9, 0x06, 0x29, 0x75, + 0x13, 0x4e, 0x66, 0x4e, 0xe7, 0x60, 0xf4, 0xf1, 0x6c, 0xae, 0x5f, 0x02, 0x3f, 0xed, 0xe2, 0xc3, + 0xab, 0x8b, 0x3c, 0x46, 0xb7, 0x5c, 0x87, 0xb5, 0xe2, 0x1a, 0xf6, 0xbe, 0x02, 0x00, 0x00, 0xff, + 0xff, 0x66, 0xc2, 0xc4, 0xb8, 0x73, 0x03, 0x00, 0x00, } func (m *Signature) Marshal() (dAtA []byte, err error) { 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 55a3947..39557ee 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 41a050d..8c78648 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 13b8ad5..7dd61a3 100644 --- a/v2/session/service.pb.go +++ b/v2/session/grpc/service.pb.go @@ -1,5 +1,5 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/session/service.proto +// source: v2/session/grpc/service.proto package session @@ -7,9 +7,9 @@ import ( context "context" fmt "fmt" proto "github.com/golang/protobuf/proto" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" - service "github.com/nspcc-dev/neofs-api-go/v2/service" - grpc "google.golang.org/grpc" + grpc1 "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" + grpc "github.com/nspcc-dev/neofs-api-go/v2/service/grpc" + grpc2 "google.golang.org/grpc" codes "google.golang.org/grpc/codes" status "google.golang.org/grpc/status" io "io" @@ -34,20 +34,20 @@ type CreateRequest struct { Body *CreateRequest_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries request meta information. Header data is used only to regulate message // transport and does not affect request execution. - MetaHeader *service.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.RequestMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries request verification information. This header is used to authenticate // the nodes of the message route and check the correctness of transmission. - VerifyHeader *service.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.RequestVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateRequest) Reset() { *m = CreateRequest{} } func (m *CreateRequest) String() string { return proto.CompactTextString(m) } func (*CreateRequest) ProtoMessage() {} func (*CreateRequest) Descriptor() ([]byte, []int) { - return fileDescriptor_ab0074a16885b32c, []int{0} + return fileDescriptor_4ed1365cc8e16cd4, []int{0} } func (m *CreateRequest) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -83,14 +83,14 @@ func (m *CreateRequest) GetBody() *CreateRequest_Body { return nil } -func (m *CreateRequest) GetMetaHeader() *service.RequestMetaHeader { +func (m *CreateRequest) GetMetaHeader() *grpc.RequestMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *CreateRequest) GetVerifyHeader() *service.RequestVerificationHeader { +func (m *CreateRequest) GetVerifyHeader() *grpc.RequestVerificationHeader { if m != nil { return m.VerifyHeader } @@ -100,19 +100,19 @@ func (m *CreateRequest) GetVerifyHeader() *service.RequestVerificationHeader { // Request body type CreateRequest_Body struct { // Carries an identifier of a session initiator. - OwnerId *refs.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` + OwnerId *grpc1.OwnerID `protobuf:"bytes,1,opt,name=owner_id,json=ownerId,proto3" json:"owner_id,omitempty"` // Carries a lifetime of the session. - Lifetime *service.TokenLifetime `protobuf:"bytes,2,opt,name=lifetime,proto3" json:"lifetime,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + Lifetime *grpc.TokenLifetime `protobuf:"bytes,2,opt,name=lifetime,proto3" json:"lifetime,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateRequest_Body) Reset() { *m = CreateRequest_Body{} } func (m *CreateRequest_Body) String() string { return proto.CompactTextString(m) } func (*CreateRequest_Body) ProtoMessage() {} func (*CreateRequest_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_ab0074a16885b32c, []int{0, 0} + return fileDescriptor_4ed1365cc8e16cd4, []int{0, 0} } func (m *CreateRequest_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -141,14 +141,14 @@ func (m *CreateRequest_Body) XXX_DiscardUnknown() { var xxx_messageInfo_CreateRequest_Body proto.InternalMessageInfo -func (m *CreateRequest_Body) GetOwnerId() *refs.OwnerID { +func (m *CreateRequest_Body) GetOwnerId() *grpc1.OwnerID { if m != nil { return m.OwnerId } return nil } -func (m *CreateRequest_Body) GetLifetime() *service.TokenLifetime { +func (m *CreateRequest_Body) GetLifetime() *grpc.TokenLifetime { if m != nil { return m.Lifetime } @@ -161,21 +161,21 @@ type CreateResponse struct { Body *CreateResponse_Body `protobuf:"bytes,1,opt,name=body,proto3" json:"body,omitempty"` // Carries response meta information. Header data is used only to regulate // message transport and does not affect request execution. - MetaHeader *service.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` + MetaHeader *grpc.ResponseMetaHeader `protobuf:"bytes,2,opt,name=meta_header,json=metaHeader,proto3" json:"meta_header,omitempty"` // Carries response verification information. This header is used to // authenticate the nodes of the message route and check the correctness // of transmission. - VerifyHeader *service.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` - XXX_NoUnkeyedLiteral struct{} `json:"-"` - XXX_unrecognized []byte `json:"-"` - XXX_sizecache int32 `json:"-"` + VerifyHeader *grpc.ResponseVerificationHeader `protobuf:"bytes,3,opt,name=verify_header,json=verifyHeader,proto3" json:"verify_header,omitempty"` + XXX_NoUnkeyedLiteral struct{} `json:"-"` + XXX_unrecognized []byte `json:"-"` + XXX_sizecache int32 `json:"-"` } func (m *CreateResponse) Reset() { *m = CreateResponse{} } func (m *CreateResponse) String() string { return proto.CompactTextString(m) } func (*CreateResponse) ProtoMessage() {} func (*CreateResponse) Descriptor() ([]byte, []int) { - return fileDescriptor_ab0074a16885b32c, []int{1} + return fileDescriptor_4ed1365cc8e16cd4, []int{1} } func (m *CreateResponse) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -211,14 +211,14 @@ func (m *CreateResponse) GetBody() *CreateResponse_Body { return nil } -func (m *CreateResponse) GetMetaHeader() *service.ResponseMetaHeader { +func (m *CreateResponse) GetMetaHeader() *grpc.ResponseMetaHeader { if m != nil { return m.MetaHeader } return nil } -func (m *CreateResponse) GetVerifyHeader() *service.ResponseVerificationHeader { +func (m *CreateResponse) GetVerifyHeader() *grpc.ResponseVerificationHeader { if m != nil { return m.VerifyHeader } @@ -240,7 +240,7 @@ func (m *CreateResponse_Body) Reset() { *m = CreateResponse_Body{} } func (m *CreateResponse_Body) String() string { return proto.CompactTextString(m) } func (*CreateResponse_Body) ProtoMessage() {} func (*CreateResponse_Body) Descriptor() ([]byte, []int) { - return fileDescriptor_ab0074a16885b32c, []int{1, 0} + return fileDescriptor_4ed1365cc8e16cd4, []int{1, 0} } func (m *CreateResponse_Body) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -290,66 +290,67 @@ func init() { proto.RegisterType((*CreateResponse_Body)(nil), "neo.fs.v2.session.CreateResponse.Body") } -func init() { proto.RegisterFile("v2/session/service.proto", fileDescriptor_ab0074a16885b32c) } +func init() { proto.RegisterFile("v2/session/grpc/service.proto", fileDescriptor_4ed1365cc8e16cd4) } -var fileDescriptor_ab0074a16885b32c = []byte{ - // 463 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0xdf, 0x6e, 0xd3, 0x30, - 0x14, 0xc6, 0x49, 0x98, 0xc6, 0xe4, 0x76, 0x95, 0x30, 0xa0, 0x55, 0xbd, 0x28, 0x65, 0x62, 0x88, - 0x0b, 0x62, 0x4b, 0x01, 0x09, 0xf1, 0xe7, 0x86, 0x01, 0x13, 0x15, 0x8c, 0x3f, 0x2e, 0xe2, 0x02, - 0x09, 0x45, 0x69, 0x72, 0xb2, 0x59, 0x23, 0x76, 0x88, 0xbd, 0x40, 0xde, 0x84, 0x5b, 0x6e, 0x79, - 0x12, 0x2e, 0x79, 0x02, 0x84, 0xca, 0x8b, 0xa0, 0xd8, 0xde, 0x68, 0x45, 0xd6, 0x5e, 0xb5, 0x3e, - 0xfe, 0xbe, 0xef, 0x9c, 0xf3, 0x53, 0x8c, 0xfa, 0x55, 0x48, 0x15, 0x28, 0xc5, 0xa5, 0xa0, 0x0a, - 0xca, 0x8a, 0x27, 0x40, 0x8a, 0x52, 0x6a, 0x89, 0x2f, 0x0a, 0x90, 0x24, 0x53, 0xa4, 0x0a, 0x89, - 0x13, 0x0c, 0x2e, 0x55, 0x21, 0x2d, 0x21, 0x53, 0x54, 0xd7, 0x05, 0x28, 0xab, 0x1b, 0x5c, 0x31, - 0x09, 0xc6, 0x49, 0x73, 0xd0, 0xb1, 0x2b, 0x6f, 0xcd, 0x95, 0x2b, 0x28, 0x79, 0x56, 0xdb, 0x8b, - 0xed, 0x5f, 0x3e, 0xda, 0x7c, 0x5c, 0x42, 0xac, 0x81, 0xc1, 0xa7, 0x63, 0x50, 0x1a, 0xdf, 0x43, - 0x6b, 0x53, 0x99, 0xd6, 0x7d, 0x6f, 0xe4, 0xdd, 0xec, 0x84, 0x3b, 0xe4, 0xbf, 0xc6, 0x64, 0x41, - 0x4f, 0x76, 0x65, 0x5a, 0x33, 0x63, 0xc1, 0x4f, 0x51, 0xa7, 0xe9, 0x19, 0x1d, 0x42, 0x9c, 0x42, - 0xd9, 0xf7, 0x4d, 0xc2, 0xf5, 0x85, 0x04, 0xbb, 0x93, 0xf3, 0xee, 0x83, 0x8e, 0x9f, 0x19, 0x2d, - 0x43, 0xf9, 0xe9, 0x7f, 0xfc, 0x06, 0x6d, 0xda, 0x19, 0x4f, 0x82, 0xce, 0x9b, 0xa0, 0x5b, 0x67, - 0x07, 0xbd, 0x6b, 0xe4, 0x3c, 0x89, 0x35, 0x97, 0xc2, 0x05, 0x76, 0x6d, 0x84, 0x3d, 0x0d, 0xbe, - 0xa0, 0xb5, 0x66, 0x4e, 0x1c, 0xa2, 0x0d, 0xf9, 0x59, 0x40, 0x19, 0xf1, 0xd4, 0x2d, 0xb8, 0x35, - 0x97, 0xda, 0xd0, 0x24, 0xaf, 0x9a, 0xfb, 0xf1, 0x13, 0x76, 0xc1, 0x08, 0xc7, 0x29, 0x7e, 0x88, - 0x36, 0x3e, 0xf2, 0x0c, 0x34, 0xcf, 0xc1, 0xad, 0x34, 0x6a, 0x99, 0xe4, 0xad, 0x3c, 0x02, 0xf1, - 0xc2, 0xe9, 0xd8, 0xa9, 0x63, 0xfb, 0x9b, 0x8f, 0x7a, 0x27, 0xc0, 0x54, 0x21, 0x85, 0x02, 0x7c, - 0x7f, 0x81, 0xf0, 0x8d, 0x25, 0x84, 0xad, 0x61, 0x1e, 0xf1, 0x5e, 0x1b, 0xe2, 0x9d, 0x56, 0x32, - 0xd6, 0x7c, 0x06, 0x63, 0xd6, 0xce, 0x38, 0x58, 0x92, 0xb4, 0x12, 0xf2, 0x5d, 0x07, 0xb9, 0x87, - 0x7c, 0x87, 0xb7, 0xcb, 0x7c, 0x9e, 0xe2, 0xab, 0xa8, 0xe3, 0x16, 0x8b, 0x8e, 0xa0, 0x36, 0x33, - 0x77, 0x19, 0x72, 0xa5, 0xe7, 0x50, 0x87, 0x11, 0xea, 0x4d, 0xec, 0x69, 0x62, 0x7b, 0xe2, 0x7d, - 0xb4, 0x6e, 0x19, 0xe0, 0xd1, 0xaa, 0x0f, 0x70, 0x70, 0x6d, 0x25, 0xc0, 0xdd, 0x0f, 0x3f, 0x66, - 0x43, 0xef, 0xe7, 0x6c, 0xe8, 0xfd, 0x9e, 0x0d, 0xbd, 0xaf, 0x7f, 0x86, 0xe7, 0xde, 0xdf, 0x39, - 0xe0, 0xfa, 0xf0, 0x78, 0x4a, 0x12, 0x99, 0x53, 0xa1, 0x8a, 0x24, 0x09, 0x52, 0xa8, 0xa8, 0x00, - 0x99, 0xa9, 0x20, 0x2e, 0x78, 0x70, 0x20, 0xe9, 0xbf, 0xb7, 0xf8, 0xc0, 0xfd, 0x7e, 0xf7, 0x2f, - 0xbf, 0x04, 0xb9, 0x37, 0x21, 0x8f, 0x5e, 0x8f, 0x9b, 0x6e, 0x6e, 0xe8, 0xe9, 0xba, 0x79, 0x4b, - 0xb7, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x38, 0xb7, 0xac, 0xe1, 0xbf, 0x03, 0x00, 0x00, +var fileDescriptor_4ed1365cc8e16cd4 = []byte{ + // 466 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x4f, 0x6f, 0xd3, 0x30, + 0x18, 0xc6, 0x49, 0x98, 0xc6, 0xe4, 0x76, 0x95, 0xb0, 0x90, 0xa8, 0x22, 0x28, 0x65, 0x62, 0x88, + 0x03, 0x75, 0xa4, 0x70, 0x40, 0x03, 0x2e, 0x0c, 0x98, 0xa8, 0x60, 0xfc, 0x71, 0x11, 0x07, 0x2e, + 0x55, 0xfe, 0xbc, 0xe9, 0xac, 0x11, 0x3b, 0xd8, 0x5e, 0x20, 0xdf, 0x84, 0x2b, 0x57, 0x3e, 0x09, + 0x47, 0x3e, 0x01, 0x42, 0xe5, 0x8b, 0xa0, 0xd8, 0xde, 0xb4, 0x6e, 0x59, 0x7b, 0xab, 0xfb, 0x3e, + 0xcf, 0xe3, 0xe7, 0xfd, 0x29, 0x46, 0x37, 0xab, 0x28, 0x54, 0xa0, 0x14, 0x13, 0x3c, 0x9c, 0xc9, + 0x32, 0x0d, 0x15, 0xc8, 0x8a, 0xa5, 0x40, 0x4a, 0x29, 0xb4, 0xc0, 0x57, 0x39, 0x08, 0x92, 0x2b, + 0x52, 0x45, 0xc4, 0xa9, 0x82, 0x7e, 0x15, 0x85, 0x12, 0x72, 0x65, 0xe5, 0xba, 0x2e, 0x41, 0x59, + 0x71, 0x10, 0x98, 0x2c, 0x63, 0xb7, 0xc3, 0x02, 0x74, 0xec, 0x66, 0x37, 0xce, 0xce, 0x2a, 0x90, + 0x2c, 0xaf, 0xed, 0x74, 0xeb, 0x8f, 0x8f, 0x36, 0x9f, 0x49, 0x88, 0x35, 0x50, 0xf8, 0x72, 0x04, + 0x4a, 0xe3, 0x1d, 0xb4, 0x96, 0x88, 0xac, 0xee, 0x7b, 0x43, 0xef, 0x5e, 0x27, 0xda, 0x26, 0xe7, + 0x7a, 0x90, 0x05, 0x3d, 0xd9, 0x15, 0x59, 0x4d, 0x8d, 0x05, 0xbf, 0x40, 0x9d, 0xe6, 0xe2, 0xe9, + 0x01, 0xc4, 0x19, 0xc8, 0xbe, 0x6f, 0x12, 0xee, 0x2c, 0x24, 0xd8, 0x15, 0x9d, 0x77, 0x1f, 0x74, + 0xfc, 0xd2, 0x68, 0x29, 0x2a, 0x4e, 0x7e, 0xe3, 0xf7, 0x68, 0xd3, 0x76, 0x3c, 0x0e, 0xba, 0x6c, + 0x82, 0xee, 0x5f, 0x1c, 0xf4, 0xb1, 0x91, 0xb3, 0x34, 0xd6, 0x4c, 0x70, 0x17, 0xd8, 0xb5, 0x11, + 0xf6, 0x14, 0x7c, 0x43, 0x6b, 0x4d, 0x4f, 0x1c, 0xa1, 0x0d, 0xf1, 0x95, 0x83, 0x9c, 0xb2, 0xcc, + 0x2d, 0x78, 0xfd, 0x54, 0x6a, 0x03, 0x97, 0xbc, 0x6d, 0xe6, 0xe3, 0xe7, 0xf4, 0x8a, 0x11, 0x8e, + 0x33, 0xfc, 0x04, 0x6d, 0x7c, 0x66, 0x39, 0x68, 0x56, 0x80, 0x5b, 0x69, 0xd8, 0xd2, 0xe4, 0x83, + 0x38, 0x04, 0xfe, 0xda, 0xe9, 0xe8, 0x89, 0x63, 0xeb, 0x87, 0x8f, 0x7a, 0xc7, 0xc0, 0x54, 0x29, + 0xb8, 0x02, 0xfc, 0x68, 0x81, 0xf0, 0xdd, 0x25, 0x84, 0xad, 0xe1, 0x34, 0xe2, 0xbd, 0x36, 0xc4, + 0xdb, 0xad, 0x64, 0xac, 0xf9, 0x02, 0xc6, 0xb4, 0x9d, 0xf1, 0x68, 0x49, 0xd2, 0x4a, 0xc8, 0x0f, + 0x1d, 0xe4, 0x1e, 0xf2, 0x1d, 0xde, 0x2e, 0xf5, 0x59, 0x86, 0x6f, 0xa1, 0x8e, 0x5b, 0x6c, 0x7a, + 0x08, 0xb5, 0xe9, 0xdc, 0xa5, 0xc8, 0xfd, 0xf5, 0x0a, 0xea, 0x68, 0x8a, 0x7a, 0x13, 0x7b, 0x9a, + 0xd8, 0x3b, 0xf1, 0x3e, 0x5a, 0xb7, 0x0c, 0xf0, 0x70, 0xd5, 0x07, 0x18, 0xdc, 0x5e, 0x09, 0x70, + 0x37, 0xf9, 0x35, 0x1f, 0x78, 0xbf, 0xe7, 0x03, 0xef, 0xef, 0x7c, 0xe0, 0x7d, 0xff, 0x37, 0xb8, + 0xf4, 0x69, 0x67, 0xc6, 0xf4, 0xc1, 0x51, 0x42, 0x52, 0x51, 0x84, 0x5c, 0x95, 0x69, 0x3a, 0xca, + 0xa0, 0x0a, 0x39, 0x88, 0x5c, 0x8d, 0xe2, 0x92, 0x8d, 0x66, 0x22, 0x3c, 0xf3, 0x3e, 0x1f, 0xbb, + 0xc3, 0x4f, 0xff, 0xda, 0x1b, 0x10, 0x7b, 0x13, 0xf2, 0xf4, 0xdd, 0xb8, 0xb9, 0xd2, 0x35, 0x4f, + 0xd6, 0xcd, 0x83, 0x7a, 0xf0, 0x3f, 0x00, 0x00, 0xff, 0xff, 0xc2, 0x58, 0x7b, 0xc5, 0xd8, 0x03, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc2.ClientConn // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc2.SupportPackageIsVersion4 // SessionServiceClient is the client API for SessionService service. // // For semantics around ctx use and closing/ending streaming RPCs, please refer to https://godoc.org/google.golang.org/grpc#ClientConn.NewStream. type SessionServiceClient interface { // Create opens new session between the client and the server. - Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) + Create(ctx context.Context, in *CreateRequest, opts ...grpc2.CallOption) (*CreateResponse, error) } type sessionServiceClient struct { - cc *grpc.ClientConn + cc *grpc2.ClientConn } -func NewSessionServiceClient(cc *grpc.ClientConn) SessionServiceClient { +func NewSessionServiceClient(cc *grpc2.ClientConn) SessionServiceClient { return &sessionServiceClient{cc} } -func (c *sessionServiceClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc.CallOption) (*CreateResponse, error) { +func (c *sessionServiceClient) Create(ctx context.Context, in *CreateRequest, opts ...grpc2.CallOption) (*CreateResponse, error) { out := new(CreateResponse) err := c.cc.Invoke(ctx, "/neo.fs.v2.session.SessionService/Create", in, out, opts...) if err != nil { @@ -372,11 +373,11 @@ func (*UnimplementedSessionServiceServer) Create(ctx context.Context, req *Creat return nil, status.Errorf(codes.Unimplemented, "method Create not implemented") } -func RegisterSessionServiceServer(s *grpc.Server, srv SessionServiceServer) { +func RegisterSessionServiceServer(s *grpc2.Server, srv SessionServiceServer) { s.RegisterService(&_SessionService_serviceDesc, srv) } -func _SessionService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { +func _SessionService_Create_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc2.UnaryServerInterceptor) (interface{}, error) { in := new(CreateRequest) if err := dec(in); err != nil { return nil, err @@ -384,7 +385,7 @@ func _SessionService_Create_Handler(srv interface{}, ctx context.Context, dec fu if interceptor == nil { return srv.(SessionServiceServer).Create(ctx, in) } - info := &grpc.UnaryServerInfo{ + info := &grpc2.UnaryServerInfo{ Server: srv, FullMethod: "/neo.fs.v2.session.SessionService/Create", } @@ -394,17 +395,17 @@ func _SessionService_Create_Handler(srv interface{}, ctx context.Context, dec fu return interceptor(ctx, in, info, handler) } -var _SessionService_serviceDesc = grpc.ServiceDesc{ +var _SessionService_serviceDesc = grpc2.ServiceDesc{ ServiceName: "neo.fs.v2.session.SessionService", HandlerType: (*SessionServiceServer)(nil), - Methods: []grpc.MethodDesc{ + Methods: []grpc2.MethodDesc{ { MethodName: "Create", Handler: _SessionService_Create_Handler, }, }, - Streams: []grpc.StreamDesc{}, - Metadata: "v2/session/service.proto", + Streams: []grpc2.StreamDesc{}, + Metadata: "v2/session/grpc/service.proto", } func (m *CreateRequest) Marshal() (dAtA []byte, err error) { @@ -825,7 +826,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.RequestMetaHeader{} + m.MetaHeader = &grpc.RequestMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -861,7 +862,7 @@ func (m *CreateRequest) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.RequestVerificationHeader{} + m.VerifyHeader = &grpc.RequestVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -951,7 +952,7 @@ func (m *CreateRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.OwnerId == nil { - m.OwnerId = &refs.OwnerID{} + m.OwnerId = &grpc1.OwnerID{} } if err := m.OwnerId.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -987,7 +988,7 @@ func (m *CreateRequest_Body) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.Lifetime == nil { - m.Lifetime = &service.TokenLifetime{} + m.Lifetime = &grpc.TokenLifetime{} } if err := m.Lifetime.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1113,7 +1114,7 @@ func (m *CreateResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.MetaHeader == nil { - m.MetaHeader = &service.ResponseMetaHeader{} + m.MetaHeader = &grpc.ResponseMetaHeader{} } if err := m.MetaHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err @@ -1149,7 +1150,7 @@ func (m *CreateResponse) Unmarshal(dAtA []byte) error { return io.ErrUnexpectedEOF } if m.VerifyHeader == nil { - m.VerifyHeader = &service.ResponseVerificationHeader{} + m.VerifyHeader = &grpc.ResponseVerificationHeader{} } if err := m.VerifyHeader.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err diff --git a/v2/signature/sign.go b/v2/signature/sign.go index 79fef30..d2fd149 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 5f4bd37..b1159c4 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 2622367..91dae60 100644 --- a/v2/storagegroup/types.pb.go +++ b/v2/storagegroup/grpc/types.pb.go @@ -1,12 +1,12 @@ // Code generated by protoc-gen-gogo. DO NOT EDIT. -// source: v2/storagegroup/types.proto +// source: v2/storagegroup/grpc/types.proto package storagegroup import ( fmt "fmt" proto "github.com/golang/protobuf/proto" - refs "github.com/nspcc-dev/neofs-api-go/v2/refs" + grpc "github.com/nspcc-dev/neofs-api-go/v2/refs/grpc" io "io" math "math" math_bits "math/bits" @@ -39,7 +39,7 @@ type StorageGroup struct { ExpirationEpoch uint64 `protobuf:"varint,3,opt,name=expiration_epoch,json=expirationEpoch,proto3" json:"expiration_epoch,omitempty"` // Members carries the list of identifiers of the object storage group members. // The list is strictly ordered. - Members []*refs.ObjectID `protobuf:"bytes,4,rep,name=members,proto3" json:"members,omitempty"` + Members []*grpc.ObjectID `protobuf:"bytes,4,rep,name=members,proto3" json:"members,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -49,7 +49,7 @@ func (m *StorageGroup) Reset() { *m = StorageGroup{} } func (m *StorageGroup) String() string { return proto.CompactTextString(m) } func (*StorageGroup) ProtoMessage() {} func (*StorageGroup) Descriptor() ([]byte, []int) { - return fileDescriptor_593772eae6c18cdf, []int{0} + return fileDescriptor_f1685cc94b670845, []int{0} } func (m *StorageGroup) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -99,7 +99,7 @@ func (m *StorageGroup) GetExpirationEpoch() uint64 { return 0 } -func (m *StorageGroup) GetMembers() []*refs.ObjectID { +func (m *StorageGroup) GetMembers() []*grpc.ObjectID { if m != nil { return m.Members } @@ -110,29 +110,29 @@ func init() { proto.RegisterType((*StorageGroup)(nil), "neo.fs.v2.storagegroup.StorageGroup") } -func init() { proto.RegisterFile("v2/storagegroup/types.proto", fileDescriptor_593772eae6c18cdf) } +func init() { proto.RegisterFile("v2/storagegroup/grpc/types.proto", fileDescriptor_f1685cc94b670845) } -var fileDescriptor_593772eae6c18cdf = []byte{ - // 297 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x90, 0xdf, 0x4a, 0xc3, 0x30, - 0x14, 0xc6, 0xcd, 0x36, 0x14, 0xe2, 0x70, 0x12, 0x45, 0xaa, 0x42, 0x19, 0xde, 0x38, 0x2f, 0x96, - 0x48, 0xbd, 0x14, 0x04, 0x65, 0xfe, 0xd9, 0x8d, 0xca, 0x7a, 0xe7, 0xcd, 0x48, 0xdb, 0xd3, 0x36, - 0xb2, 0x36, 0x21, 0xc9, 0x8a, 0xee, 0x49, 0x7c, 0x06, 0x9f, 0x64, 0x97, 0x3e, 0x82, 0xd4, 0x17, - 0x91, 0x6e, 0x48, 0x8b, 0x97, 0xf9, 0xf2, 0x3b, 0xe7, 0xf0, 0xfd, 0xf0, 0x71, 0xe1, 0x31, 0x63, - 0xa5, 0xe6, 0x09, 0x24, 0x5a, 0xce, 0x15, 0xb3, 0xef, 0x0a, 0x0c, 0x55, 0x5a, 0x5a, 0x49, 0x0e, - 0x72, 0x90, 0x34, 0x36, 0xb4, 0xf0, 0x68, 0x93, 0x39, 0xda, 0x2b, 0x3c, 0xa6, 0x21, 0x36, 0x4d, - 0xf8, 0x64, 0x89, 0x70, 0xd7, 0x5f, 0x53, 0xf7, 0x15, 0x45, 0xce, 0xf1, 0x7e, 0xc1, 0x67, 0x22, - 0xe2, 0x56, 0xc8, 0x7c, 0x1a, 0x71, 0xcb, 0xa7, 0x46, 0x2c, 0xc0, 0x41, 0x7d, 0x34, 0xe8, 0x4c, - 0x48, 0xfd, 0x37, 0xe2, 0x96, 0xfb, 0x62, 0x01, 0xe4, 0x14, 0xf7, 0x1a, 0x13, 0x29, 0x37, 0xa9, - 0xd3, 0xea, 0xa3, 0x41, 0x77, 0xb2, 0x53, 0xc7, 0x0f, 0xdc, 0xa4, 0xe4, 0x0c, 0xef, 0xc2, 0x9b, - 0x12, 0x7a, 0x0d, 0x82, 0x92, 0x61, 0xea, 0xb4, 0x57, 0x6b, 0x7b, 0x75, 0x7e, 0x5b, 0xc5, 0xc4, - 0xc3, 0x5b, 0x19, 0x64, 0x01, 0x68, 0xe3, 0x74, 0xfa, 0xed, 0xc1, 0xb6, 0xe7, 0xd0, 0xba, 0x55, - 0x55, 0x82, 0x3e, 0x05, 0xaf, 0x10, 0xda, 0xf1, 0x68, 0xf2, 0x07, 0xde, 0xcc, 0x96, 0xa5, 0x8b, - 0xbe, 0x4a, 0x17, 0x7d, 0x97, 0x2e, 0xfa, 0xf8, 0x71, 0x37, 0x5e, 0xae, 0x12, 0x61, 0xd3, 0x79, - 0x40, 0x43, 0x99, 0xb1, 0xdc, 0xa8, 0x30, 0x1c, 0x46, 0x50, 0xb0, 0x1c, 0x64, 0x6c, 0x86, 0x5c, - 0x89, 0x61, 0x22, 0xd9, 0x3f, 0x91, 0x97, 0xcd, 0xc7, 0x67, 0xeb, 0xf0, 0x11, 0xe4, 0x9d, 0x4f, - 0xaf, 0x9f, 0xc7, 0xd5, 0xdd, 0xa6, 0xa7, 0x60, 0x73, 0xe5, 0xef, 0xe2, 0x37, 0x00, 0x00, 0xff, - 0xff, 0xec, 0x24, 0x17, 0x69, 0x8b, 0x01, 0x00, 0x00, +var fileDescriptor_f1685cc94b670845 = []byte{ + // 301 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x6c, 0x90, 0xcd, 0x4a, 0x33, 0x31, + 0x18, 0x85, 0xbf, 0xb4, 0xe5, 0x13, 0x62, 0xb1, 0x12, 0x44, 0xa2, 0x8b, 0x61, 0x70, 0x63, 0x5d, + 0x34, 0x91, 0x71, 0xe9, 0x4a, 0xad, 0x3f, 0xdd, 0xa8, 0xb4, 0x3b, 0x37, 0x25, 0x93, 0xbe, 0x9d, + 0x89, 0xd8, 0x49, 0x4c, 0xd2, 0x41, 0x7b, 0x25, 0x5e, 0x83, 0x57, 0xd2, 0xa5, 0x97, 0x20, 0xe3, + 0x8d, 0xc8, 0xb4, 0xc8, 0x0c, 0xe8, 0xf6, 0xc9, 0x73, 0xf2, 0x72, 0x0e, 0x0e, 0xf3, 0x88, 0x3b, + 0xaf, 0xad, 0x48, 0x20, 0xb1, 0x7a, 0x6e, 0x78, 0x62, 0x8d, 0xe4, 0xfe, 0xd5, 0x80, 0x63, 0xc6, + 0x6a, 0xaf, 0xc9, 0x6e, 0x06, 0x9a, 0x4d, 0x1d, 0xcb, 0x23, 0x56, 0x17, 0xf7, 0x69, 0x1e, 0x71, + 0x0b, 0x53, 0xf7, 0x2b, 0x71, 0xb0, 0x44, 0xb8, 0x3d, 0x5a, 0xab, 0xd7, 0xa5, 0x4a, 0x8e, 0xf1, + 0x4e, 0x2e, 0x9e, 0xd4, 0x44, 0x78, 0xa5, 0xb3, 0xf1, 0x44, 0x78, 0x31, 0x76, 0x6a, 0x01, 0x14, + 0x85, 0xa8, 0xdb, 0x1a, 0x92, 0xea, 0xad, 0x2f, 0xbc, 0x18, 0xa9, 0x05, 0x90, 0x43, 0xdc, 0xa9, + 0x25, 0x52, 0xe1, 0x52, 0xda, 0x08, 0x51, 0xb7, 0x3d, 0xdc, 0xaa, 0xf0, 0x8d, 0x70, 0x29, 0x39, + 0xc2, 0xdb, 0xf0, 0x62, 0x94, 0x5d, 0x8b, 0x60, 0xb4, 0x4c, 0x69, 0x73, 0xf5, 0x6d, 0xa7, 0xe2, + 0x97, 0x25, 0x26, 0x11, 0xde, 0x98, 0xc1, 0x2c, 0x06, 0xeb, 0x68, 0x2b, 0x6c, 0x76, 0x37, 0x23, + 0xca, 0xaa, 0x6a, 0x65, 0x13, 0x76, 0x17, 0x3f, 0x82, 0xf4, 0x83, 0xfe, 0xf0, 0x47, 0x3c, 0x7f, + 0x5e, 0x16, 0x01, 0xfa, 0x28, 0x02, 0xf4, 0x59, 0x04, 0xe8, 0xed, 0x2b, 0xf8, 0xf7, 0x70, 0x91, + 0x28, 0x9f, 0xce, 0x63, 0x26, 0xf5, 0x8c, 0x67, 0xce, 0x48, 0xd9, 0x9b, 0x40, 0xce, 0x33, 0xd0, + 0x53, 0xd7, 0x13, 0x46, 0xf5, 0x12, 0xcd, 0xff, 0x9a, 0xf4, 0xb4, 0x4e, 0xde, 0x1b, 0x7b, 0xb7, + 0xa0, 0xaf, 0x46, 0xec, 0xec, 0x7e, 0x50, 0x1e, 0xaf, 0x8f, 0x15, 0xff, 0x5f, 0x8d, 0x78, 0xf2, + 0x1d, 0x00, 0x00, 0xff, 0xff, 0xcd, 0x95, 0x67, 0x64, 0x9a, 0x01, 0x00, 0x00, } func (m *StorageGroup) Marshal() (dAtA []byte, err error) { @@ -368,7 +368,7 @@ func (m *StorageGroup) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - m.Members = append(m.Members, &refs.ObjectID{}) + m.Members = append(m.Members, &grpc.ObjectID{}) if err := m.Members[len(m.Members)-1].Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err }