status-im
/
go-waku
mirror of https://github.com/status-im/go-waku.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: order of fields of History Response protobuf (#35)

This commit is contained in:
RichΛrd 2021-07-29 08:43:29 -04:00 committed by GitHub
parent c3ac5ef9c5
commit 654f3f8cd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 81 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

102
waku/v2/protocol/pb/waku_store.pb.go
View File

@ -45,6 +45,31 @@ func (PagingInfo_Direction) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_ca6891f77a46e680, []int{1, 0} return fileDescriptor_ca6891f77a46e680, []int{1, 0}
} }
type HistoryResponse_Error int32
const (
HistoryResponse_NONE HistoryResponse_Error = 0
HistoryResponse_INVALID_CURSOR HistoryResponse_Error = 1
)
var HistoryResponse_Error_name = map[int32]string{
0: "NONE",
1: "INVALID_CURSOR",
}
var HistoryResponse_Error_value = map[string]int32{
"NONE": 0,
"INVALID_CURSOR": 1,
}
func (x HistoryResponse_Error) String() string {
return proto.EnumName(HistoryResponse_Error_name, int32(x))
}
func (HistoryResponse_Error) EnumDescriptor() ([]byte, []int) {
return fileDescriptor_ca6891f77a46e680, []int{4, 0}
}
type Index struct { type Index struct {
Digest []byte `protobuf:"bytes,1,opt,name=digest,proto3" json:"digest,omitempty"` Digest []byte `protobuf:"bytes,1,opt,name=digest,proto3" json:"digest,omitempty"`
ReceiverTime float64 `protobuf:"fixed64,2,opt,name=receiverTime,proto3" json:"receiverTime,omitempty"` ReceiverTime float64 `protobuf:"fixed64,2,opt,name=receiverTime,proto3" json:"receiverTime,omitempty"`
@ -266,8 +291,10 @@ func (m *HistoryQuery) GetEndTime() float64 {
} }
type HistoryResponse struct { type HistoryResponse struct {
Messages []*WakuMessage `protobuf:"bytes,1,rep,name=messages,proto3" json:"messages,omitempty"` // the first field is reserved for future use
PagingInfo *PagingInfo `protobuf:"bytes,2,opt,name=pagingInfo,proto3" json:"pagingInfo,omitempty"` Messages []*WakuMessage `protobuf:"bytes,2,rep,name=messages,proto3" json:"messages,omitempty"`
PagingInfo *PagingInfo `protobuf:"bytes,3,opt,name=pagingInfo,proto3" json:"pagingInfo,omitempty"`
Error HistoryResponse_Error `protobuf:"varint,4,opt,name=error,proto3,enum=pb.HistoryResponse_Error" json:"error,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"` XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"` XXX_sizecache int32 `json:"-"`
@ -312,6 +339,13 @@ func (m *HistoryResponse) GetPagingInfo() *PagingInfo {
return nil return nil
} }
func (m *HistoryResponse) GetError() HistoryResponse_Error {
if m != nil {
return m.Error
}
return HistoryResponse_NONE
}
type HistoryRPC struct { type HistoryRPC struct {
RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"` RequestId string `protobuf:"bytes,1,opt,name=request_id,json=requestId,proto3" json:"request_id,omitempty"`
Query *HistoryQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"` Query *HistoryQuery `protobuf:"bytes,2,opt,name=query,proto3" json:"query,omitempty"`
@ -369,6 +403,7 @@ func (m *HistoryRPC) GetResponse() *HistoryResponse {
func init() { func init() {
proto.RegisterEnum("pb.PagingInfo_Direction", PagingInfo_Direction_name, PagingInfo_Direction_value) proto.RegisterEnum("pb.PagingInfo_Direction", PagingInfo_Direction_name, PagingInfo_Direction_value)
proto.RegisterEnum("pb.HistoryResponse_Error", HistoryResponse_Error_name, HistoryResponse_Error_value)
proto.RegisterType((*Index)(nil), "pb.Index") proto.RegisterType((*Index)(nil), "pb.Index")
proto.RegisterType((*PagingInfo)(nil), "pb.PagingInfo") proto.RegisterType((*PagingInfo)(nil), "pb.PagingInfo")
proto.RegisterType((*ContentFilter)(nil), "pb.ContentFilter") proto.RegisterType((*ContentFilter)(nil), "pb.ContentFilter")
@ -382,34 +417,37 @@ func init() {
} }
var fileDescriptor_ca6891f77a46e680 = []byte{ var fileDescriptor_ca6891f77a46e680 = []byte{
// 457 bytes of a gzipped FileDescriptorProto // 509 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x53, 0x5d, 0x6b, 0x13, 0x41, 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x84, 0x93, 0x6f, 0x6b, 0x13, 0x41,
0x14, 0x75, 0x92, 0x26, 0xcd, 0xde, 0x8d, 0x69, 0xbc, 0x82, 0x2c, 0x45, 0x25, 0xee, 0x43, 0x09, 0x10, 0xc6, 0xbb, 0xf9, 0xd7, 0xdc, 0x24, 0xa6, 0x71, 0x04, 0x39, 0x8b, 0x4a, 0x3c, 0xb0, 0x04,
0x08, 0x2b, 0xa4, 0x20, 0xf8, 0x58, 0x53, 0x8a, 0x41, 0xc4, 0x3a, 0x16, 0xfa, 0x58, 0xf6, 0xe3, 0x84, 0x2b, 0xa4, 0x20, 0xf8, 0x32, 0x26, 0x2d, 0x06, 0x35, 0xa9, 0xdb, 0x6a, 0x5f, 0x86, 0xcb,
0xba, 0x0c, 0xb5, 0x33, 0xdb, 0x99, 0x59, 0xb5, 0x3e, 0xfb, 0x6f, 0xfc, 0x39, 0xfe, 0x21, 0xd9, 0xdd, 0x18, 0x96, 0xda, 0xdb, 0xeb, 0xee, 0x9e, 0x5a, 0x5f, 0xfb, 0x6d, 0xfc, 0x1e, 0x7e, 0x01,
0xc9, 0x64, 0xb3, 0xe9, 0x4b, 0x1f, 0xef, 0xb9, 0x67, 0xe6, 0x9c, 0x7b, 0xee, 0x0c, 0x4c, 0x7f, 0xbf, 0x90, 0xdc, 0x66, 0xf3, 0x17, 0xc1, 0x97, 0xf3, 0xcc, 0xef, 0xf2, 0x3c, 0x33, 0xb3, 0x81,
0xa6, 0xd7, 0xf5, 0x95, 0xb1, 0x4a, 0x53, 0x52, 0x69, 0x65, 0x15, 0xf6, 0xaa, 0xec, 0x10, 0x1d, 0xf6, 0xb7, 0xe8, 0x3a, 0x9f, 0x6a, 0x23, 0x15, 0x85, 0x99, 0x92, 0x46, 0x62, 0x29, 0x9b, 0x1d,
0x7a, 0x43, 0xc6, 0xa4, 0xa5, 0xc7, 0xe3, 0x1c, 0x06, 0x2b, 0x59, 0xd0, 0x2f, 0x7c, 0x06, 0xc3, 0xa2, 0x55, 0x6f, 0x48, 0xeb, 0x68, 0xee, 0xf4, 0x20, 0x86, 0xea, 0x28, 0x4d, 0xe8, 0x3b, 0x3e,
0x42, 0x94, 0x64, 0x6c, 0xc4, 0x66, 0x6c, 0x3e, 0xe6, 0xbe, 0xc2, 0x18, 0xc6, 0x9a, 0x72, 0x12, 0x84, 0x5a, 0x22, 0xe6, 0xa4, 0x8d, 0xcf, 0x3a, 0xac, 0xdb, 0xe4, 0xae, 0xc2, 0x00, 0x9a, 0x8a,
0x3f, 0x48, 0x5f, 0x88, 0x1b, 0x8a, 0x7a, 0x33, 0x36, 0x67, 0x7c, 0x07, 0xc3, 0x97, 0x00, 0x86, 0x62, 0x12, 0x5f, 0x49, 0x5d, 0x8a, 0x1b, 0xf2, 0x4b, 0x1d, 0xd6, 0x65, 0x7c, 0x4b, 0xc3, 0xa7,
0x64, 0xe1, 0x19, 0x7d, 0xc7, 0xe8, 0x20, 0xf1, 0x5f, 0x06, 0x70, 0x9e, 0x96, 0x42, 0x96, 0x2b, 0x00, 0x9a, 0xd2, 0xc4, 0x11, 0x65, 0x4b, 0x6c, 0x28, 0xc1, 0x2f, 0x06, 0x70, 0x1e, 0xcd, 0x45,
0xf9, 0x4d, 0xe1, 0x21, 0x8c, 0xaa, 0xb4, 0xa4, 0xaf, 0xe2, 0x37, 0x39, 0xb1, 0x3d, 0xde, 0xd6, 0x3a, 0x1f, 0xa5, 0x9f, 0x25, 0x1e, 0x42, 0x3d, 0x8b, 0xe6, 0x74, 0x21, 0x7e, 0x90, 0x35, 0xab,
0xf8, 0x0a, 0x86, 0x79, 0xad, 0x8d, 0xd2, 0x4e, 0x28, 0x5c, 0x04, 0x49, 0x95, 0x25, 0xce, 0x21, 0xf0, 0x55, 0x8d, 0xcf, 0xa0, 0x16, 0xe7, 0x4a, 0x4b, 0x65, 0x8d, 0x1a, 0x3d, 0x2f, 0xcc, 0x66,
0xf7, 0x0d, 0x7c, 0x0b, 0x41, 0x21, 0x34, 0xe5, 0x56, 0x28, 0xe9, 0xc4, 0x26, 0x8b, 0xa8, 0x61, 0xa1, 0x4d, 0xc8, 0x5d, 0x03, 0x5f, 0x82, 0x97, 0x08, 0x45, 0xb1, 0x11, 0x32, 0xb5, 0x66, 0xad,
0x6d, 0x15, 0x92, 0xd3, 0x4d, 0x9f, 0x6f, 0xa9, 0xf1, 0x11, 0x04, 0x2d, 0x8e, 0x63, 0x18, 0xbd, 0x9e, 0x5f, 0x50, 0x6b, 0x87, 0x70, 0xb8, 0xec, 0xf3, 0x35, 0x1a, 0x1c, 0x81, 0xb7, 0xd2, 0xb1,
0x3f, 0x59, 0x7e, 0xbc, 0x3c, 0xe1, 0xa7, 0xd3, 0x47, 0x18, 0xc2, 0xfe, 0xd9, 0x67, 0xee, 0x0a, 0x09, 0xf5, 0xd7, 0xfd, 0xc1, 0xdb, 0xab, 0x3e, 0x1f, 0xb6, 0xf7, 0xb0, 0x01, 0xfb, 0x67, 0x13,
0x16, 0x1f, 0xc3, 0xe3, 0xa5, 0x92, 0x96, 0xa4, 0x3d, 0x13, 0xdf, 0x2d, 0xe9, 0x26, 0x82, 0x7c, 0x6e, 0x0b, 0x16, 0x9c, 0xc0, 0xbd, 0x81, 0x4c, 0x0d, 0xa5, 0xe6, 0x4c, 0x7c, 0x31, 0xa4, 0x8a,
0x0d, 0x5c, 0xa8, 0x4a, 0xe4, 0xce, 0x73, 0xc0, 0x77, 0xb0, 0xf8, 0x1f, 0x83, 0xf1, 0x07, 0xd1, 0x15, 0xc4, 0x0b, 0xe1, 0x52, 0x66, 0x22, 0xb6, 0x99, 0x3d, 0xbe, 0xa5, 0x05, 0x7f, 0x18, 0x34,
0x24, 0x7e, 0xf7, 0xa5, 0x26, 0x7d, 0x87, 0x33, 0x08, 0xab, 0x3a, 0x33, 0x75, 0xb6, 0x3e, 0xd3, 0xdf, 0x88, 0x62, 0xe3, 0x77, 0x1f, 0x72, 0x52, 0x77, 0xd8, 0x81, 0x46, 0x96, 0xcf, 0x74, 0x3e,
0x73, 0x67, 0xba, 0x10, 0xbe, 0x83, 0x49, 0xde, 0xd5, 0x31, 0x51, 0x7f, 0xd6, 0x9f, 0x87, 0x8b, 0x5b, 0x7c, 0x53, 0xb2, 0xdf, 0x6c, 0x4a, 0xf8, 0x0a, 0x5a, 0xf1, 0xa6, 0x8f, 0xf6, 0xcb, 0x9d,
0x27, 0xcd, 0x30, 0x3b, 0x0e, 0xf8, 0x3d, 0x22, 0x26, 0x00, 0x55, 0x3b, 0x6d, 0xb4, 0xe7, 0x92, 0x72, 0xb7, 0xd1, 0xbb, 0x5f, 0x0c, 0xb3, 0x95, 0x80, 0xef, 0x80, 0x18, 0x02, 0x64, 0xab, 0x69,
0x9a, 0xec, 0x66, 0xc0, 0x3b, 0x0c, 0x7c, 0x0e, 0x81, 0xb1, 0xa9, 0xb6, 0x6e, 0x3f, 0x03, 0xb7, 0xfd, 0x8a, 0xdd, 0x54, 0x6b, 0x7b, 0x07, 0x7c, 0x83, 0xc0, 0xc7, 0xe0, 0x69, 0x13, 0x29, 0x63,
0x9f, 0x2d, 0x80, 0x11, 0xec, 0x93, 0x2c, 0x5c, 0x6f, 0xe8, 0x7a, 0x9b, 0x32, 0x96, 0x70, 0xe0, 0xef, 0x53, 0xb5, 0xf7, 0x59, 0x0b, 0xe8, 0xc3, 0x3e, 0xa5, 0x89, 0xed, 0xd5, 0x6c, 0x6f, 0x59,
0x87, 0xe2, 0x64, 0x2a, 0x25, 0x0d, 0xe1, 0x6b, 0x18, 0xf9, 0x17, 0x64, 0x22, 0xe6, 0xfc, 0x1e, 0x06, 0xbf, 0x19, 0x1c, 0xb8, 0xa9, 0x38, 0xe9, 0x4c, 0xa6, 0x9a, 0xf0, 0x05, 0xd4, 0xdd, 0x13,
0x34, 0xc2, 0x97, 0xe9, 0x75, 0xfd, 0x69, 0x8d, 0xf3, 0x96, 0x70, 0xcf, 0x67, 0xef, 0x21, 0x9f, 0xd2, 0x7e, 0xc9, 0x06, 0x3e, 0x28, 0x9c, 0xaf, 0xa2, 0xeb, 0xfc, 0xfd, 0x42, 0xe7, 0x2b, 0x60,
0xf1, 0x1f, 0x06, 0xb0, 0x11, 0x3c, 0x5f, 0xe2, 0x0b, 0x00, 0x4d, 0xb7, 0x35, 0x19, 0x7b, 0x25, 0x27, 0x68, 0xf9, 0xbf, 0x41, 0x8f, 0xa1, 0x4a, 0x4a, 0x49, 0x65, 0x67, 0x6a, 0xf5, 0x1e, 0x15,
0x0a, 0x1f, 0x7b, 0xe0, 0x91, 0x55, 0x81, 0x47, 0x30, 0xb8, 0x6d, 0xb2, 0xf6, 0x17, 0x4f, 0x9b, 0xe8, 0x4e, 0x80, 0xf0, 0xb4, 0x00, 0xf8, 0x82, 0x0b, 0x9e, 0x43, 0xd5, 0xd6, 0x58, 0x87, 0xca,
0x8b, 0xbb, 0x3b, 0xe0, 0xeb, 0x36, 0xbe, 0x81, 0x91, 0xf6, 0xf6, 0xdd, 0x7b, 0x09, 0x17, 0x4f, 0x78, 0x32, 0x3e, 0x6d, 0xef, 0x21, 0x42, 0x6b, 0x34, 0xfe, 0xd4, 0x7f, 0x37, 0x1a, 0x4e, 0x07,
0x3b, 0xd4, 0xcd, 0x64, 0xbc, 0x25, 0x65, 0x43, 0xf7, 0x37, 0x8e, 0xff, 0x07, 0x00, 0x00, 0xff, 0x1f, 0xf9, 0xc5, 0x84, 0xb7, 0x59, 0xf0, 0x93, 0x01, 0x2c, 0x7f, 0xe7, 0x7c, 0x80, 0x4f, 0x00,
0xff, 0x03, 0x43, 0x7e, 0x9e, 0x47, 0x03, 0x00, 0x00, 0x14, 0xdd, 0xe6, 0xa4, 0xcd, 0x54, 0x24, 0xee, 0x9e, 0x9e, 0x53, 0x46, 0x09, 0x1e, 0x41, 0xf5,
0xb6, 0x38, 0xa2, 0x7b, 0x83, 0xed, 0x8d, 0x14, 0xf6, 0xb8, 0x7c, 0xd1, 0xc6, 0x63, 0xa8, 0x2b,
0x97, 0xca, 0xcd, 0xf6, 0xe0, 0x1f, 0x81, 0xf9, 0x0a, 0x9a, 0xd5, 0xec, 0x9f, 0xee, 0xe4, 0x6f,
0x00, 0x00, 0x00, 0xff, 0xff, 0xea, 0xcf, 0xa2, 0x96, 0xa0, 0x03, 0x00, 0x00,
} }

10
waku/v2/protocol/pb/waku_store.proto
View File

@ -33,8 +33,14 @@ message HistoryQuery {
} }
message HistoryResponse { message HistoryResponse {
repeated WakuMessage messages = 1; // the first field is reserved for future use
PagingInfo pagingInfo = 2; // used for pagination repeated WakuMessage messages = 2;
PagingInfo pagingInfo = 3;
enum Error {
NONE = 0;
INVALID_CURSOR = 1;
}
Error error = 4;
} }
message HistoryRPC { message HistoryRPC {