update fileproto: unary method instead stream for blocksGet

This commit is contained in:
Sergey Cherepanov 2023-01-31 14:24:39 +03:00
parent 22ee12e28c
commit 1e9960752f
No known key found for this signature in database
GPG Key ID: 87F8EDE8FBDF637C
3 changed files with 59 additions and 169 deletions

View File

@ -78,34 +78,6 @@ func (AvailabilityStatus) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_fd665a7e11c833d5, []int{1} return fileDescriptor_fd665a7e11c833d5, []int{1}
} }
type CIDError int32
const (
CIDError_CIDErrorOk CIDError = 0
CIDError_CIDErrorNotFound CIDError = 1
CIDError_CIDErrorUnexpected CIDError = 2
)
var CIDError_name = map[int32]string{
0: "CIDErrorOk",
1: "CIDErrorNotFound",
2: "CIDErrorUnexpected",
}
var CIDError_value = map[string]int32{
"CIDErrorOk": 0,
"CIDErrorNotFound": 1,
"CIDErrorUnexpected": 2,
}
func (x CIDError) String() string {
return proto.EnumName(CIDError_name, int32(x))
}
func (CIDError) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_fd665a7e11c833d5, []int{2}
}
type BlockGetRequest struct { type BlockGetRequest struct {
SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"` SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"`
Cid []byte `protobuf:"bytes,2,opt,name=cid,proto3" json:"cid,omitempty"` Cid []byte `protobuf:"bytes,2,opt,name=cid,proto3" json:"cid,omitempty"`
@ -159,9 +131,8 @@ func (m *BlockGetRequest) GetCid() []byte {
} }
type BlockGetResponse struct { type BlockGetResponse struct {
Cid []byte `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"` Cid []byte `protobuf:"bytes,1,opt,name=cid,proto3" json:"cid,omitempty"`
Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"` Data []byte `protobuf:"bytes,2,opt,name=data,proto3" json:"data,omitempty"`
Code CIDError `protobuf:"varint,3,opt,name=code,proto3,enum=filesync.CIDError" json:"code,omitempty"`
} }
func (m *BlockGetResponse) Reset() { *m = BlockGetResponse{} } func (m *BlockGetResponse) Reset() { *m = BlockGetResponse{} }
@ -211,13 +182,6 @@ func (m *BlockGetResponse) GetData() []byte {
return nil return nil
} }
func (m *BlockGetResponse) GetCode() CIDError {
if m != nil {
return m.Code
}
return CIDError_CIDErrorOk
}
type BlockPushRequest struct { type BlockPushRequest struct {
SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"` SpaceId string `protobuf:"bytes,1,opt,name=spaceId,proto3" json:"spaceId,omitempty"`
Cid []byte `protobuf:"bytes,2,opt,name=cid,proto3" json:"cid,omitempty"` Cid []byte `protobuf:"bytes,2,opt,name=cid,proto3" json:"cid,omitempty"`
@ -721,7 +685,6 @@ func (m *CheckResponse) GetSpaceIds() []string {
func init() { func init() {
proto.RegisterEnum("filesync.ErrCodes", ErrCodes_name, ErrCodes_value) proto.RegisterEnum("filesync.ErrCodes", ErrCodes_name, ErrCodes_value)
proto.RegisterEnum("filesync.AvailabilityStatus", AvailabilityStatus_name, AvailabilityStatus_value) proto.RegisterEnum("filesync.AvailabilityStatus", AvailabilityStatus_name, AvailabilityStatus_value)
proto.RegisterEnum("filesync.CIDError", CIDError_name, CIDError_value)
proto.RegisterType((*BlockGetRequest)(nil), "filesync.BlockGetRequest") proto.RegisterType((*BlockGetRequest)(nil), "filesync.BlockGetRequest")
proto.RegisterType((*BlockGetResponse)(nil), "filesync.BlockGetResponse") proto.RegisterType((*BlockGetResponse)(nil), "filesync.BlockGetResponse")
proto.RegisterType((*BlockPushRequest)(nil), "filesync.BlockPushRequest") proto.RegisterType((*BlockPushRequest)(nil), "filesync.BlockPushRequest")
@ -742,46 +705,43 @@ func init() {
} }
var fileDescriptor_fd665a7e11c833d5 = []byte{ var fileDescriptor_fd665a7e11c833d5 = []byte{
// 623 bytes of a gzipped FileDescriptorProto // 567 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x54, 0xcf, 0x4e, 0xdb, 0x4e, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x9c, 0x94, 0xcd, 0x6e, 0xda, 0x40,
0x10, 0xce, 0x26, 0xf9, 0xf1, 0x4b, 0x26, 0x10, 0xcc, 0x10, 0xd1, 0xd4, 0x50, 0x2b, 0xf2, 0x01, 0x10, 0xc7, 0x59, 0xa0, 0x14, 0x86, 0x8f, 0x38, 0x1b, 0x94, 0x52, 0x87, 0x5a, 0xc8, 0x87, 0x0a,
0x45, 0x54, 0x0a, 0x55, 0xda, 0x43, 0x2f, 0x1c, 0x48, 0x02, 0x34, 0xad, 0x0a, 0x95, 0x51, 0x2f, 0xa5, 0x12, 0x91, 0x68, 0x0f, 0xb9, 0xe4, 0x10, 0x03, 0x41, 0xb4, 0x6a, 0x5a, 0x39, 0xea, 0xa5,
0xed, 0xa5, 0x89, 0xbd, 0x08, 0x0b, 0xe3, 0x4d, 0xbd, 0x9b, 0x0a, 0xde, 0xa2, 0xcf, 0xd2, 0xa7, 0x3d, 0x19, 0x7b, 0x51, 0xac, 0x38, 0x5e, 0xea, 0x5d, 0xaa, 0xe4, 0x2d, 0xfa, 0x24, 0x7d, 0x8e,
0xe0, 0xc8, 0xb1, 0xc7, 0x0a, 0x5e, 0xa4, 0xf2, 0x7a, 0x8d, 0x37, 0xc1, 0xa8, 0x52, 0x2e, 0xce, 0x1c, 0x73, 0xec, 0xb1, 0x82, 0x17, 0xa9, 0xbc, 0x5e, 0xc0, 0x06, 0x47, 0x91, 0xb8, 0x98, 0xd9,
0xec, 0xfc, 0xf9, 0xe6, 0xdb, 0x2f, 0x33, 0x0b, 0xdb, 0x2e, 0xbb, 0xbc, 0x64, 0xe1, 0x99, 0x1f, 0xf9, 0xf8, 0xcd, 0xce, 0x7f, 0x77, 0x81, 0xb7, 0x36, 0xbd, 0xbd, 0xa5, 0xfe, 0xc4, 0xf5, 0xc8,
0xd0, 0xdd, 0xf8, 0x33, 0x89, 0x98, 0x60, 0xbb, 0xf2, 0xcb, 0xa5, 0xa3, 0x23, 0x6d, 0xac, 0xc4, 0x49, 0xf8, 0x99, 0x06, 0x94, 0xd3, 0x13, 0xf1, 0x65, 0xc2, 0xd1, 0x11, 0x36, 0x2e, 0x86, 0x36,
0x36, 0xbf, 0x0e, 0x5d, 0x7b, 0x0f, 0x56, 0x7b, 0x01, 0x73, 0x2f, 0x8e, 0xa8, 0x70, 0xe8, 0xf7, 0xbb, 0xf7, 0x6d, 0xfd, 0x0c, 0xf6, 0x0c, 0x8f, 0xda, 0x37, 0x43, 0xc2, 0x4d, 0xf2, 0x73, 0x46,
0x29, 0xe5, 0x02, 0x9b, 0xf0, 0x3f, 0x9f, 0x8c, 0x5c, 0x3a, 0xf4, 0x9a, 0xa4, 0x45, 0xda, 0x55, 0x18, 0xc7, 0x0d, 0x78, 0xc9, 0xa6, 0x96, 0x4d, 0x46, 0x4e, 0x03, 0xb5, 0x50, 0xbb, 0x64, 0x2e,
0x27, 0x3d, 0xa2, 0x01, 0x25, 0xd7, 0xf7, 0x9a, 0xc5, 0x16, 0x69, 0x2f, 0x3b, 0xb1, 0x69, 0x7f, 0x97, 0x58, 0x81, 0x9c, 0xed, 0x3a, 0x8d, 0x6c, 0x0b, 0xb5, 0x2b, 0x66, 0x68, 0xea, 0xa7, 0xa0,
0x03, 0x23, 0x2b, 0xe7, 0x13, 0x16, 0x72, 0x9a, 0x66, 0x91, 0x87, 0x2c, 0x44, 0x28, 0x7b, 0x23, 0xac, 0xcb, 0xd9, 0x94, 0xfa, 0x8c, 0x2c, 0xb3, 0xd0, 0x2a, 0x0b, 0x63, 0xc8, 0x3b, 0x16, 0xb7,
0x31, 0x52, 0x85, 0xd2, 0xc6, 0x6d, 0x28, 0xbb, 0xcc, 0xa3, 0xcd, 0x52, 0x8b, 0xb4, 0xeb, 0x5d, 0x64, 0xa1, 0xb0, 0x75, 0x53, 0x56, 0x7e, 0x9d, 0xb1, 0xeb, 0x1d, 0x3a, 0xaf, 0x98, 0xb9, 0x18,
0xec, 0xa4, 0x8c, 0x3a, 0xfd, 0xe1, 0xe0, 0x20, 0x8a, 0x58, 0xe4, 0xc8, 0xb8, 0xed, 0xa8, 0x0e, 0xf3, 0x00, 0xf6, 0x63, 0xcc, 0x68, 0x3b, 0x7a, 0x0f, 0x0e, 0x84, 0x93, 0xf5, 0x89, 0x47, 0x38,
0x9f, 0xa6, 0xfc, 0x7c, 0x01, 0x86, 0x0f, 0xbd, 0x4b, 0x59, 0x6f, 0x7b, 0x1d, 0xd6, 0x34, 0xcc, 0x79, 0xbe, 0x17, 0x86, 0xbc, 0xed, 0x3a, 0xac, 0x91, 0x6d, 0xe5, 0x42, 0x72, 0x68, 0xeb, 0x87,
0x84, 0xb6, 0xdd, 0x87, 0x75, 0xe9, 0xe4, 0x03, 0x1a, 0x50, 0x41, 0xff, 0xdd, 0x0b, 0xa1, 0xec, 0x50, 0x4f, 0x42, 0x24, 0xdc, 0x00, 0x1c, 0xf9, 0x7b, 0xd7, 0xc4, 0xbe, 0xd9, 0x8d, 0x3d, 0x5e,
0xfa, 0x1e, 0x6f, 0x16, 0x5b, 0xa5, 0x18, 0x39, 0xb6, 0xed, 0x0d, 0x68, 0xcc, 0x82, 0x28, 0xf0, 0x6e, 0x50, 0x32, 0xa4, 0x8c, 0x9f, 0x00, 0x8f, 0x85, 0xfb, 0xfc, 0x97, 0xe5, 0x7a, 0xd6, 0xd8,
0x1e, 0x60, 0xe2, 0xef, 0x9f, 0x53, 0xf7, 0x62, 0x31, 0xec, 0x71, 0x4a, 0x50, 0x61, 0x28, 0xb9, 0xf5, 0x5c, 0x7e, 0xdf, 0x40, 0xad, 0x5c, 0xbb, 0xdc, 0x3d, 0xea, 0x2c, 0x0f, 0xb0, 0x23, 0x4a,
0x3f, 0x00, 0x8e, 0xa5, 0x7b, 0xff, 0xc7, 0xc8, 0x0f, 0x46, 0x63, 0x3f, 0xf0, 0xc5, 0x75, 0x93, 0xe3, 0x29, 0x66, 0x4a, 0x99, 0xfe, 0x43, 0x2a, 0x13, 0x77, 0xa6, 0x1c, 0xd4, 0x07, 0x28, 0x30,
0xb4, 0x4a, 0xed, 0x5a, 0x77, 0x33, 0x93, 0x55, 0x96, 0xea, 0x29, 0x4e, 0x4e, 0x99, 0xfd, 0x55, 0x6e, 0xf1, 0x19, 0x13, 0x4a, 0xd7, 0xba, 0xcd, 0x75, 0x9f, 0x78, 0xe5, 0x95, 0xc8, 0x31, 0x65,
0x29, 0xa3, 0x3b, 0x73, 0xfe, 0xd0, 0x37, 0xb0, 0xc4, 0xc5, 0x48, 0x4c, 0xb9, 0x54, 0xba, 0xde, 0xae, 0x7e, 0x2e, 0xe1, 0xcc, 0x70, 0x7d, 0x67, 0x37, 0x0d, 0xea, 0x4b, 0x1d, 0x23, 0x84, 0x54,
0xdd, 0xca, 0xfa, 0xe8, 0x95, 0xa7, 0x32, 0xc7, 0x51, 0xb9, 0xf6, 0xbe, 0x02, 0xe7, 0x3d, 0x3f, 0xb7, 0x06, 0x95, 0xb8, 0xae, 0xfa, 0x3b, 0xa8, 0x26, 0x35, 0x52, 0xa1, 0x28, 0xa9, 0x4c, 0x28,
0xf4, 0x16, 0xd3, 0xa0, 0x91, 0xea, 0x98, 0x40, 0x28, 0x75, 0xeb, 0xb0, 0xac, 0xeb, 0x6a, 0xbf, 0x53, 0x32, 0x57, 0xeb, 0xe3, 0x33, 0x28, 0x0e, 0x82, 0xa0, 0x47, 0x1d, 0xc2, 0x70, 0x0d, 0xe0,
0x84, 0x95, 0x59, 0x8d, 0x4c, 0xa8, 0x28, 0x54, 0x2e, 0x95, 0xa9, 0x3a, 0x0f, 0xe7, 0x9d, 0x3d, 0x9b, 0x4f, 0xee, 0xa6, 0xc4, 0xe6, 0xc4, 0x51, 0x32, 0x78, 0x0f, 0xca, 0xbd, 0x51, 0xff, 0x92,
0xa8, 0x1c, 0x44, 0x51, 0x9f, 0x79, 0x94, 0x63, 0x1d, 0xe0, 0x73, 0x48, 0xaf, 0x26, 0xd4, 0x15, 0xf2, 0x0b, 0x3a, 0xf3, 0x1d, 0x05, 0x61, 0x05, 0xca, 0x83, 0x20, 0xa0, 0xc1, 0x97, 0xc9, 0x84,
0xd4, 0x33, 0x0a, 0xb8, 0x0a, 0xb5, 0xfe, 0x70, 0x70, 0xcc, 0xc4, 0x21, 0x9b, 0x86, 0x9e, 0x41, 0x11, 0xae, 0x3c, 0xa0, 0x63, 0x03, 0xf0, 0xf6, 0xc8, 0xb8, 0x0a, 0xa5, 0x4b, 0xca, 0x07, 0x77,
0xd0, 0x80, 0x9a, 0x1c, 0xce, 0x93, 0xb3, 0x33, 0x4e, 0x85, 0x71, 0x43, 0x76, 0x7a, 0x80, 0x8f, 0x2e, 0xe3, 0x4c, 0xc9, 0x60, 0x80, 0x82, 0xb4, 0x11, 0xde, 0x87, 0x6a, 0x64, 0x8f, 0xfc, 0xab,
0xaf, 0x8c, 0x2b, 0x50, 0x3d, 0x66, 0xe2, 0xe0, 0xca, 0xe7, 0x82, 0x1b, 0x05, 0x04, 0x58, 0x52, 0x70, 0x0f, 0x4a, 0xb6, 0xfb, 0x27, 0x07, 0xf9, 0x0b, 0xd7, 0x23, 0xd8, 0x80, 0x52, 0x34, 0xde,
0x36, 0xc1, 0x35, 0x58, 0x49, 0xec, 0x61, 0x78, 0x1a, 0x73, 0x30, 0x8a, 0x3b, 0xef, 0xa0, 0x92, 0x90, 0x70, 0xfc, 0x7a, 0xe3, 0xf0, 0xd6, 0x4f, 0x4f, 0x55, 0xd3, 0x42, 0x72, 0xd6, 0xbe, 0x64,
0x4e, 0x7d, 0x4c, 0x21, 0xb5, 0x4f, 0x2e, 0x8c, 0x02, 0x36, 0xc0, 0x48, 0xcf, 0x1a, 0x8f, 0x0d, 0x84, 0x97, 0x1b, 0x6f, 0x26, 0xc6, 0x5e, 0x91, 0x7a, 0x94, 0x1a, 0x93, 0x94, 0x8f, 0x50, 0x8e,
0xc0, 0xd4, 0xab, 0x11, 0x2e, 0x76, 0x7f, 0x95, 0xa0, 0x7c, 0xe8, 0x07, 0x14, 0x0f, 0xa1, 0x9a, 0x5d, 0x36, 0xdc, 0xdc, 0xc8, 0x4d, 0xdc, 0x63, 0xf5, 0xcd, 0x13, 0x51, 0xc9, 0x1a, 0x02, 0xac,
0x08, 0x75, 0x44, 0x05, 0x3e, 0x9f, 0x1b, 0x83, 0x6c, 0xd9, 0x4d, 0x33, 0x2f, 0x94, 0xa8, 0xd6, 0x0f, 0x0d, 0x6f, 0xb6, 0x8d, 0xdf, 0x06, 0xb5, 0x99, 0x1e, 0x94, 0xa0, 0xcf, 0x50, 0x89, 0xbf,
0x26, 0xaf, 0x08, 0x0e, 0x14, 0x4e, 0xbc, 0x2a, 0x38, 0x9f, 0xac, 0xed, 0xa4, 0xb9, 0x99, 0x1b, 0x2e, 0xbc, 0xd5, 0x37, 0xf1, 0x74, 0x55, 0xed, 0xa9, 0xb0, 0xc4, 0x9d, 0xc2, 0x8b, 0x68, 0xba,
0x53, 0xfa, 0xbf, 0x87, 0x9a, 0x36, 0xba, 0xb8, 0x35, 0x97, 0x3b, 0xb3, 0x15, 0xe6, 0x8b, 0x27, 0xc3, 0x75, 0x62, 0x62, 0xae, 0x57, 0x5b, 0xfe, 0xa8, 0xd2, 0xe8, 0x3c, 0xcc, 0x35, 0xf4, 0x38,
0xa2, 0x0a, 0xeb, 0x08, 0x20, 0x1b, 0x01, 0x9c, 0x6f, 0xab, 0xcf, 0x96, 0xb9, 0x95, 0x1f, 0x54, 0xd7, 0xd0, 0xbf, 0xb9, 0x86, 0x7e, 0x2f, 0xb4, 0xcc, 0xe3, 0x42, 0xcb, 0xfc, 0x5d, 0x68, 0x99,
0x40, 0x1f, 0x61, 0x59, 0xdf, 0x55, 0x7c, 0xd4, 0x77, 0xe6, 0x21, 0x30, 0xad, 0xa7, 0xc2, 0x0a, 0xef, 0xf5, 0xb4, 0x7f, 0xd6, 0x71, 0x41, 0xfc, 0xbc, 0xff, 0x1f, 0x00, 0x00, 0xff, 0xff, 0xbc,
0xee, 0x2d, 0xfc, 0x97, 0xdc, 0x6e, 0x43, 0x7b, 0xcb, 0xf4, 0x7b, 0x3d, 0x7b, 0xe4, 0x4f, 0x2a, 0x48, 0x8b, 0xe1, 0x78, 0x05, 0x00, 0x00,
0x7b, 0x9d, 0x9b, 0x3b, 0x8b, 0xdc, 0xde, 0x59, 0xe4, 0xcf, 0x9d, 0x45, 0x7e, 0xde, 0x5b, 0x85,
0xdb, 0x7b, 0xab, 0xf0, 0xfb, 0xde, 0x2a, 0x7c, 0x69, 0xe4, 0xbd, 0xe7, 0xe3, 0x25, 0xf9, 0xf3,
0xfa, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x15, 0xd1, 0x3a, 0x81, 0xee, 0x05, 0x00, 0x00,
} }
func (m *BlockGetRequest) Marshal() (dAtA []byte, err error) { func (m *BlockGetRequest) Marshal() (dAtA []byte, err error) {
@ -841,11 +801,6 @@ func (m *BlockGetResponse) MarshalToSizedBuffer(dAtA []byte) (int, error) {
_ = i _ = i
var l int var l int
_ = l _ = l
if m.Code != 0 {
i = encodeVarintFile(dAtA, i, uint64(m.Code))
i--
dAtA[i] = 0x18
}
if len(m.Data) > 0 { if len(m.Data) > 0 {
i -= len(m.Data) i -= len(m.Data)
copy(dAtA[i:], m.Data) copy(dAtA[i:], m.Data)
@ -1262,9 +1217,6 @@ func (m *BlockGetResponse) Size() (n int) {
if l > 0 { if l > 0 {
n += 1 + l + sovFile(uint64(l)) n += 1 + l + sovFile(uint64(l))
} }
if m.Code != 0 {
n += 1 + sovFile(uint64(m.Code))
}
return n return n
} }
@ -1647,25 +1599,6 @@ func (m *BlockGetResponse) Unmarshal(dAtA []byte) error {
m.Data = []byte{} m.Data = []byte{}
} }
iNdEx = postIndex iNdEx = postIndex
case 3:
if wireType != 0 {
return fmt.Errorf("proto: wrong wireType = %d for field Code", wireType)
}
m.Code = 0
for shift := uint(0); ; shift += 7 {
if shift >= 64 {
return ErrIntOverflowFile
}
if iNdEx >= l {
return io.ErrUnexpectedEOF
}
b := dAtA[iNdEx]
iNdEx++
m.Code |= CIDError(b&0x7F) << shift
if b < 0x80 {
break
}
}
default: default:
iNdEx = preIndex iNdEx = preIndex
skippy, err := skipFile(dAtA[iNdEx:]) skippy, err := skipFile(dAtA[iNdEx:])

View File

@ -40,7 +40,7 @@ func (drpcEncoding_File_commonfile_fileproto_protos_file_proto) JSONUnmarshal(bu
type DRPCFileClient interface { type DRPCFileClient interface {
DRPCConn() drpc.Conn DRPCConn() drpc.Conn
BlocksGet(ctx context.Context) (DRPCFile_BlocksGetClient, error) BlocksGet(ctx context.Context, in *BlockGetRequest) (*BlockGetResponse, error)
BlockPush(ctx context.Context, in *BlockPushRequest) (*BlockPushResponse, error) BlockPush(ctx context.Context, in *BlockPushRequest) (*BlockPushResponse, error)
BlocksCheck(ctx context.Context, in *BlocksCheckRequest) (*BlocksCheckResponse, error) BlocksCheck(ctx context.Context, in *BlocksCheckRequest) (*BlocksCheckResponse, error)
BlocksBind(ctx context.Context, in *BlocksBindRequest) (*BlocksBindResponse, error) BlocksBind(ctx context.Context, in *BlocksBindRequest) (*BlocksBindResponse, error)
@ -58,39 +58,13 @@ func NewDRPCFileClient(cc drpc.Conn) DRPCFileClient {
func (c *drpcFileClient) DRPCConn() drpc.Conn { return c.cc } func (c *drpcFileClient) DRPCConn() drpc.Conn { return c.cc }
func (c *drpcFileClient) BlocksGet(ctx context.Context) (DRPCFile_BlocksGetClient, error) { func (c *drpcFileClient) BlocksGet(ctx context.Context, in *BlockGetRequest) (*BlockGetResponse, error) {
stream, err := c.cc.NewStream(ctx, "/filesync.File/BlocksGet", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}) out := new(BlockGetResponse)
err := c.cc.Invoke(ctx, "/filesync.File/BlocksGet", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, in, out)
if err != nil { if err != nil {
return nil, err return nil, err
} }
x := &drpcFile_BlocksGetClient{stream} return out, nil
return x, nil
}
type DRPCFile_BlocksGetClient interface {
drpc.Stream
Send(*BlockGetRequest) error
Recv() (*BlockGetResponse, error)
}
type drpcFile_BlocksGetClient struct {
drpc.Stream
}
func (x *drpcFile_BlocksGetClient) Send(m *BlockGetRequest) error {
return x.MsgSend(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{})
}
func (x *drpcFile_BlocksGetClient) Recv() (*BlockGetResponse, error) {
m := new(BlockGetResponse)
if err := x.MsgRecv(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{}); err != nil {
return nil, err
}
return m, nil
}
func (x *drpcFile_BlocksGetClient) RecvMsg(m *BlockGetResponse) error {
return x.MsgRecv(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{})
} }
func (c *drpcFileClient) BlockPush(ctx context.Context, in *BlockPushRequest) (*BlockPushResponse, error) { func (c *drpcFileClient) BlockPush(ctx context.Context, in *BlockPushRequest) (*BlockPushResponse, error) {
@ -139,7 +113,7 @@ func (c *drpcFileClient) Check(ctx context.Context, in *CheckRequest) (*CheckRes
} }
type DRPCFileServer interface { type DRPCFileServer interface {
BlocksGet(DRPCFile_BlocksGetStream) error BlocksGet(context.Context, *BlockGetRequest) (*BlockGetResponse, error)
BlockPush(context.Context, *BlockPushRequest) (*BlockPushResponse, error) BlockPush(context.Context, *BlockPushRequest) (*BlockPushResponse, error)
BlocksCheck(context.Context, *BlocksCheckRequest) (*BlocksCheckResponse, error) BlocksCheck(context.Context, *BlocksCheckRequest) (*BlocksCheckResponse, error)
BlocksBind(context.Context, *BlocksBindRequest) (*BlocksBindResponse, error) BlocksBind(context.Context, *BlocksBindRequest) (*BlocksBindResponse, error)
@ -149,8 +123,8 @@ type DRPCFileServer interface {
type DRPCFileUnimplementedServer struct{} type DRPCFileUnimplementedServer struct{}
func (s *DRPCFileUnimplementedServer) BlocksGet(DRPCFile_BlocksGetStream) error { func (s *DRPCFileUnimplementedServer) BlocksGet(context.Context, *BlockGetRequest) (*BlockGetResponse, error) {
return drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented) return nil, drpcerr.WithCode(errors.New("Unimplemented"), drpcerr.Unimplemented)
} }
func (s *DRPCFileUnimplementedServer) BlockPush(context.Context, *BlockPushRequest) (*BlockPushResponse, error) { func (s *DRPCFileUnimplementedServer) BlockPush(context.Context, *BlockPushRequest) (*BlockPushResponse, error) {
@ -182,9 +156,10 @@ func (DRPCFileDescription) Method(n int) (string, drpc.Encoding, drpc.Receiver,
case 0: case 0:
return "/filesync.File/BlocksGet", drpcEncoding_File_commonfile_fileproto_protos_file_proto{}, return "/filesync.File/BlocksGet", drpcEncoding_File_commonfile_fileproto_protos_file_proto{},
func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) { func(srv interface{}, ctx context.Context, in1, in2 interface{}) (drpc.Message, error) {
return nil, srv.(DRPCFileServer). return srv.(DRPCFileServer).
BlocksGet( BlocksGet(
&drpcFile_BlocksGetStream{in1.(drpc.Stream)}, ctx,
in1.(*BlockGetRequest),
) )
}, DRPCFileServer.BlocksGet, true }, DRPCFileServer.BlocksGet, true
case 1: case 1:
@ -243,28 +218,18 @@ func DRPCRegisterFile(mux drpc.Mux, impl DRPCFileServer) error {
type DRPCFile_BlocksGetStream interface { type DRPCFile_BlocksGetStream interface {
drpc.Stream drpc.Stream
Send(*BlockGetResponse) error SendAndClose(*BlockGetResponse) error
Recv() (*BlockGetRequest, error)
} }
type drpcFile_BlocksGetStream struct { type drpcFile_BlocksGetStream struct {
drpc.Stream drpc.Stream
} }
func (x *drpcFile_BlocksGetStream) Send(m *BlockGetResponse) error { func (x *drpcFile_BlocksGetStream) SendAndClose(m *BlockGetResponse) error {
return x.MsgSend(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{}) if err := x.MsgSend(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{}); err != nil {
} return err
func (x *drpcFile_BlocksGetStream) Recv() (*BlockGetRequest, error) {
m := new(BlockGetRequest)
if err := x.MsgRecv(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{}); err != nil {
return nil, err
} }
return m, nil return x.CloseSend()
}
func (x *drpcFile_BlocksGetStream) RecvMsg(m *BlockGetRequest) error {
return x.MsgRecv(m, drpcEncoding_File_commonfile_fileproto_protos_file_proto{})
} }
type DRPCFile_BlockPushStream interface { type DRPCFile_BlockPushStream interface {

View File

@ -11,16 +11,16 @@ enum ErrCodes {
service File { service File {
// GetBlocks streams ipfs blocks from server to client // GetBlocks streams ipfs blocks from server to client
rpc BlocksGet(stream BlockGetRequest) returns (stream BlockGetResponse); rpc BlocksGet(BlockGetRequest) returns (BlockGetResponse);
// PushBlock pushes one block to server // BlockPush pushes one block to server
rpc BlockPush(BlockPushRequest) returns (BlockPushResponse); rpc BlockPush(BlockPushRequest) returns (BlockPushResponse);
// BlocksCheck checks is CIDs exists // BlocksCheck checks is CIDs exists
rpc BlocksCheck(BlocksCheckRequest) returns (BlocksCheckResponse); rpc BlocksCheck(BlocksCheckRequest) returns (BlocksCheckResponse);
// BlocksBind binds CIDs to space // BlocksBind binds CIDs to space
rpc BlocksBind(BlocksBindRequest) returns (BlocksBindResponse); rpc BlocksBind(BlocksBindRequest) returns (BlocksBindResponse);
// DeleteBlock deletes block from space // BlocksDelete deletes block from space
rpc BlocksDelete(BlocksDeleteRequest) returns (BlocksDeleteResponse); rpc BlocksDelete(BlocksDeleteRequest) returns (BlocksDeleteResponse);
// Ping checks the connection // Check checks the connection and credentials
rpc Check(CheckRequest) returns (CheckResponse); rpc Check(CheckRequest) returns (CheckResponse);
} }
@ -32,7 +32,6 @@ message BlockGetRequest {
message BlockGetResponse { message BlockGetResponse {
bytes cid = 1; bytes cid = 1;
bytes data = 2; bytes data = 2;
CIDError code = 3;
} }
message BlockPushRequest { message BlockPushRequest {
@ -83,10 +82,3 @@ message CheckRequest {}
message CheckResponse { message CheckResponse {
repeated string spaceIds = 1; repeated string spaceIds = 1;
} }
enum CIDError {
CIDErrorOk = 0;
CIDErrorNotFound = 1;
CIDErrorUnexpected = 2;
}