From 2fd3cd2ea06463b47f25da458feb73f6a4760777 Mon Sep 17 00:00:00 2001 From: John Brooks Date: Thu, 27 Oct 2016 13:50:34 -0600 Subject: [PATCH] rpc: Add 'go generate' commands and update ContactRequest It's now possible to regenerate the protobuf files by calling 'go generate' in rpc/. You will need protoc and protoc-gen-go in PATH. This is only necessary after changing the protobuf definitions. --- rpc/contact.pb.go | 143 +++++++++++++++++++++++++++-------------- rpc/contact.proto | 1 + rpc/conversation.pb.go | 79 ++++++++++++----------- rpc/core.pb.go | 72 ++++++++++----------- rpc/identity.pb.go | 8 +-- rpc/network.pb.go | 84 ++++++++++++------------ rpc/rpc.go | 3 + 7 files changed, 220 insertions(+), 170 deletions(-) create mode 100644 rpc/rpc.go diff --git a/rpc/contact.pb.go b/rpc/contact.pb.go index 8b6e317..763ec43 100644 --- a/rpc/contact.pb.go +++ b/rpc/contact.pb.go @@ -2,6 +2,43 @@ // source: contact.proto // DO NOT EDIT! +/* +Package ricochet is a generated protocol buffer package. + +It is generated from these files: + contact.proto + conversation.proto + core.proto + identity.proto + network.proto + +It has these top-level messages: + Contact + ContactRequest + MonitorContactsRequest + ContactEvent + AddContactReply + DeleteContactRequest + DeleteContactReply + RejectInboundRequestReply + ConversationEvent + MonitorConversationsRequest + Entity + Message + MarkConversationReadRequest + Reply + ServerStatusRequest + ServerStatusReply + Identity + IdentityRequest + MonitorNetworkRequest + TorProcessStatus + TorControlStatus + TorConnectionStatus + NetworkStatus + StartNetworkRequest + StopNetworkRequest +*/ package ricochet import proto "github.com/golang/protobuf/proto" @@ -13,6 +50,12 @@ var _ = proto.Marshal var _ = fmt.Errorf var _ = math.Inf +// This is a compile-time assertion to ensure that this generated file +// is compatible with the proto package it is being compiled against. +// A compilation error at this line likely means your copy of the +// proto package needs to be updated. +const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package + type Contact_Status int32 const ( @@ -41,7 +84,7 @@ var Contact_Status_value = map[string]int32{ func (x Contact_Status) String() string { return proto.EnumName(Contact_Status_name, int32(x)) } -func (Contact_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} } +func (Contact_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{0, 0} } type ContactRequest_Direction int32 @@ -62,7 +105,7 @@ var ContactRequest_Direction_value = map[string]int32{ func (x ContactRequest_Direction) String() string { return proto.EnumName(ContactRequest_Direction_name, int32(x)) } -func (ContactRequest_Direction) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{1, 0} } +func (ContactRequest_Direction) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{1, 0} } type ContactEvent_Type int32 @@ -92,7 +135,7 @@ var ContactEvent_Type_value = map[string]int32{ func (x ContactEvent_Type) String() string { return proto.EnumName(ContactEvent_Type_name, int32(x)) } -func (ContactEvent_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{3, 0} } +func (ContactEvent_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor0, []int{3, 0} } type Contact struct { Id int32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` @@ -107,7 +150,7 @@ type Contact struct { func (m *Contact) Reset() { *m = Contact{} } func (m *Contact) String() string { return proto.CompactTextString(m) } func (*Contact) ProtoMessage() {} -func (*Contact) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } +func (*Contact) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{0} } func (m *Contact) GetRequest() *ContactRequest { if m != nil { @@ -117,16 +160,17 @@ func (m *Contact) GetRequest() *ContactRequest { } type ContactRequest struct { - Direction ContactRequest_Direction `protobuf:"varint,1,opt,name=direction,enum=ricochet.ContactRequest_Direction" json:"direction,omitempty"` - Address string `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"` - Nickname string `protobuf:"bytes,3,opt,name=nickname" json:"nickname,omitempty"` - Text string `protobuf:"bytes,4,opt,name=text" json:"text,omitempty"` + Direction ContactRequest_Direction `protobuf:"varint,1,opt,name=direction,enum=ricochet.ContactRequest_Direction" json:"direction,omitempty"` + Address string `protobuf:"bytes,2,opt,name=address" json:"address,omitempty"` + Nickname string `protobuf:"bytes,3,opt,name=nickname" json:"nickname,omitempty"` + Text string `protobuf:"bytes,4,opt,name=text" json:"text,omitempty"` + FromNickname string `protobuf:"bytes,5,opt,name=fromNickname" json:"fromNickname,omitempty"` } func (m *ContactRequest) Reset() { *m = ContactRequest{} } func (m *ContactRequest) String() string { return proto.CompactTextString(m) } func (*ContactRequest) ProtoMessage() {} -func (*ContactRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } +func (*ContactRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{1} } type MonitorContactsRequest struct { } @@ -134,7 +178,7 @@ type MonitorContactsRequest struct { func (m *MonitorContactsRequest) Reset() { *m = MonitorContactsRequest{} } func (m *MonitorContactsRequest) String() string { return proto.CompactTextString(m) } func (*MonitorContactsRequest) ProtoMessage() {} -func (*MonitorContactsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } +func (*MonitorContactsRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{2} } type ContactEvent struct { Type ContactEvent_Type `protobuf:"varint,1,opt,name=type,enum=ricochet.ContactEvent_Type" json:"type,omitempty"` @@ -147,7 +191,7 @@ type ContactEvent struct { func (m *ContactEvent) Reset() { *m = ContactEvent{} } func (m *ContactEvent) String() string { return proto.CompactTextString(m) } func (*ContactEvent) ProtoMessage() {} -func (*ContactEvent) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } +func (*ContactEvent) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{3} } type isContactEvent_Subject interface { isContactEvent_Subject() @@ -264,7 +308,7 @@ type AddContactReply struct { func (m *AddContactReply) Reset() { *m = AddContactReply{} } func (m *AddContactReply) String() string { return proto.CompactTextString(m) } func (*AddContactReply) ProtoMessage() {} -func (*AddContactReply) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } +func (*AddContactReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{4} } type DeleteContactRequest struct { Id int32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` @@ -274,7 +318,7 @@ type DeleteContactRequest struct { func (m *DeleteContactRequest) Reset() { *m = DeleteContactRequest{} } func (m *DeleteContactRequest) String() string { return proto.CompactTextString(m) } func (*DeleteContactRequest) ProtoMessage() {} -func (*DeleteContactRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{5} } +func (*DeleteContactRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{5} } type DeleteContactReply struct { } @@ -282,7 +326,7 @@ type DeleteContactReply struct { func (m *DeleteContactReply) Reset() { *m = DeleteContactReply{} } func (m *DeleteContactReply) String() string { return proto.CompactTextString(m) } func (*DeleteContactReply) ProtoMessage() {} -func (*DeleteContactReply) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{6} } +func (*DeleteContactReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{6} } type RejectInboundRequestReply struct { } @@ -290,7 +334,7 @@ type RejectInboundRequestReply struct { func (m *RejectInboundRequestReply) Reset() { *m = RejectInboundRequestReply{} } func (m *RejectInboundRequestReply) String() string { return proto.CompactTextString(m) } func (*RejectInboundRequestReply) ProtoMessage() {} -func (*RejectInboundRequestReply) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{7} } +func (*RejectInboundRequestReply) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } func init() { proto.RegisterType((*Contact)(nil), "ricochet.Contact") @@ -306,40 +350,41 @@ func init() { proto.RegisterEnum("ricochet.ContactEvent_Type", ContactEvent_Type_name, ContactEvent_Type_value) } -func init() { proto.RegisterFile("contact.proto", fileDescriptor1) } +func init() { proto.RegisterFile("contact.proto", fileDescriptor0) } -var fileDescriptor1 = []byte{ - // 503 bytes of a gzipped FileDescriptorProto +var fileDescriptor0 = []byte{ + // 520 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x53, 0x51, 0x6f, 0xd3, 0x30, - 0x10, 0x5e, 0x9a, 0x2c, 0x69, 0xaf, 0x5b, 0xe9, 0xac, 0x09, 0x05, 0xf6, 0x32, 0x59, 0x08, 0xf1, - 0x42, 0x40, 0x85, 0x77, 0xd6, 0x35, 0x99, 0x28, 0x84, 0xa4, 0x78, 0x89, 0x78, 0x4e, 0x13, 0x4b, - 0x0b, 0x14, 0xa7, 0x24, 0x2e, 0xb0, 0xff, 0xc7, 0x03, 0x3f, 0x87, 0x9f, 0x80, 0xed, 0x38, 0x1d, - 0xdb, 0x00, 0x21, 0xde, 0xee, 0xee, 0xfb, 0xce, 0x77, 0xdf, 0xdd, 0x19, 0xf6, 0xf3, 0x8a, 0xf1, - 0x2c, 0xe7, 0xde, 0xba, 0xae, 0x78, 0x85, 0xfa, 0x75, 0x99, 0x57, 0xf9, 0x05, 0xe5, 0xf8, 0x7b, - 0x0f, 0x9c, 0x59, 0x8b, 0xa1, 0x11, 0xf4, 0xca, 0xc2, 0x35, 0x8e, 0x8d, 0x47, 0xbb, 0x44, 0x58, - 0xc8, 0x05, 0x27, 0x2b, 0x8a, 0x9a, 0x36, 0x8d, 0xdb, 0x13, 0xc1, 0x01, 0xe9, 0x5c, 0x74, 0x1f, - 0xfa, 0xac, 0xcc, 0x3f, 0xb0, 0xec, 0x23, 0x75, 0x4d, 0x05, 0x6d, 0x7d, 0x74, 0x0c, 0xc3, 0x2f, - 0x17, 0x94, 0xcd, 0x6a, 0x9a, 0x71, 0x5a, 0xb8, 0x96, 0x82, 0x7f, 0x0d, 0xa1, 0x07, 0xb0, 0xbf, - 0xca, 0x1a, 0x2e, 0xca, 0x32, 0x9a, 0x4b, 0xce, 0xae, 0xe2, 0x5c, 0x0f, 0xa2, 0x09, 0x38, 0x35, - 0xfd, 0xb4, 0xa1, 0x0d, 0x77, 0x6d, 0x81, 0x0f, 0x27, 0xae, 0xd7, 0x75, 0xed, 0xe9, 0x8e, 0x49, - 0x8b, 0x93, 0x8e, 0x88, 0x9e, 0x82, 0xdd, 0xf0, 0x8c, 0x6f, 0x1a, 0x17, 0x44, 0xca, 0xe8, 0x37, - 0x29, 0xde, 0xb9, 0xc2, 0x89, 0xe6, 0xe1, 0x39, 0xd8, 0x6d, 0x04, 0x0d, 0xc1, 0x49, 0xa3, 0xd7, - 0x51, 0xfc, 0x2e, 0x1a, 0xef, 0x48, 0x27, 0x3e, 0x3b, 0x0b, 0xe7, 0x51, 0x30, 0x36, 0x10, 0x80, - 0x1d, 0x47, 0xca, 0xee, 0x49, 0x80, 0x04, 0x6f, 0xd3, 0xe0, 0x3c, 0x19, 0x9b, 0x68, 0x0f, 0xfa, - 0x24, 0x78, 0x15, 0xcc, 0x92, 0xc0, 0x1f, 0x5b, 0xf8, 0x9b, 0x01, 0xa3, 0xeb, 0x8d, 0xa1, 0x13, - 0x18, 0x14, 0x65, 0x2d, 0xf4, 0x94, 0x15, 0x53, 0x83, 0x1d, 0x4d, 0xf0, 0x9f, 0x54, 0x78, 0x7e, - 0xc7, 0x24, 0x57, 0x49, 0xff, 0xb9, 0x03, 0x04, 0x16, 0xa7, 0x5f, 0xb9, 0x1e, 0xbe, 0xb2, 0xf1, - 0x43, 0x18, 0x6c, 0x2b, 0x48, 0x19, 0xf3, 0xe8, 0x34, 0x4e, 0x23, 0x5f, 0x88, 0x15, 0x32, 0xe2, - 0x34, 0x69, 0x3d, 0x03, 0xbb, 0x70, 0xf7, 0x4d, 0xc5, 0x4a, 0x5e, 0xd5, 0xba, 0xbf, 0x46, 0x37, - 0x88, 0x7f, 0x18, 0xb0, 0xa7, 0x63, 0xc1, 0x67, 0xca, 0x38, 0x7a, 0x22, 0xca, 0x5c, 0xae, 0xa9, - 0x56, 0x76, 0x74, 0x4b, 0x99, 0x62, 0x79, 0x89, 0xa0, 0x10, 0x45, 0x44, 0x8f, 0xc1, 0xd1, 0x87, - 0xa8, 0xd4, 0x0c, 0x27, 0x07, 0xb7, 0x72, 0x5e, 0xee, 0x90, 0x8e, 0x83, 0x9e, 0x5f, 0x9d, 0x80, - 0xf9, 0xf7, 0x13, 0x90, 0x59, 0x9a, 0x8a, 0x5f, 0x80, 0x25, 0x4b, 0xa2, 0x3e, 0x58, 0x51, 0x1a, - 0x86, 0xad, 0xc0, 0x45, 0xbc, 0x48, 0xc3, 0x69, 0x22, 0xd7, 0xe9, 0x80, 0x39, 0xf5, 0x7d, 0xb1, - 0x4b, 0xb1, 0xd7, 0x74, 0xe1, 0xcb, 0xa0, 0x29, 0x6d, 0x3f, 0x08, 0x03, 0x61, 0x5b, 0xa7, 0x03, - 0x70, 0x9a, 0xcd, 0xf2, 0xbd, 0x18, 0x15, 0x3e, 0x80, 0x3b, 0xd3, 0xa2, 0xd8, 0xd6, 0x5a, 0xaf, - 0x2e, 0xf1, 0x09, 0x1c, 0xfa, 0x74, 0x45, 0x39, 0xbd, 0xb1, 0xeb, 0x7f, 0xfe, 0x3d, 0xf8, 0x10, - 0xd0, 0x8d, 0x17, 0xe4, 0xbb, 0x47, 0x70, 0x8f, 0x50, 0x59, 0x74, 0xce, 0x96, 0xd5, 0x86, 0x15, - 0xdd, 0x71, 0x4b, 0x70, 0x69, 0xab, 0x7f, 0xfb, 0xec, 0x67, 0x00, 0x00, 0x00, 0xff, 0xff, 0x53, - 0x03, 0x9d, 0x60, 0xc8, 0x03, 0x00, 0x00, + 0x10, 0x6e, 0xd2, 0xac, 0x69, 0xaf, 0x5d, 0xc9, 0xac, 0x09, 0x05, 0xf6, 0x52, 0x59, 0x08, 0xf5, + 0x85, 0x80, 0x0a, 0xef, 0xac, 0x6b, 0x32, 0x51, 0x08, 0x49, 0xf1, 0x12, 0xf1, 0x9c, 0x26, 0x46, + 0x0b, 0x74, 0x76, 0x49, 0x5c, 0xa0, 0xff, 0x90, 0x9f, 0xc2, 0x23, 0x3f, 0x01, 0xd9, 0x49, 0x3a, + 0xba, 0x01, 0x42, 0x7b, 0xf3, 0x7d, 0xdf, 0x77, 0xf6, 0x7d, 0xbe, 0x3b, 0x38, 0x4c, 0x39, 0x13, + 0x49, 0x2a, 0x9c, 0x75, 0xc1, 0x05, 0x47, 0xdd, 0x22, 0x4f, 0x79, 0x7a, 0x49, 0x05, 0xfe, 0xae, + 0x83, 0x39, 0xab, 0x38, 0x34, 0x04, 0x3d, 0xcf, 0x6c, 0x6d, 0xa4, 0x8d, 0x0f, 0x88, 0x9e, 0x67, + 0xc8, 0x06, 0x33, 0xc9, 0xb2, 0x82, 0x96, 0xa5, 0xad, 0x8f, 0xb4, 0x71, 0x8f, 0x34, 0x21, 0x7a, + 0x08, 0x5d, 0x96, 0xa7, 0x9f, 0x58, 0x72, 0x45, 0xed, 0xb6, 0xa2, 0x76, 0x31, 0x1a, 0x41, 0xff, + 0xeb, 0x25, 0x65, 0xb3, 0x82, 0x26, 0x82, 0x66, 0xb6, 0xa1, 0xe8, 0xdf, 0x21, 0xf4, 0x08, 0x0e, + 0x57, 0x49, 0x29, 0x66, 0x9c, 0x31, 0x9a, 0x4a, 0xcd, 0x81, 0xd2, 0xec, 0x83, 0x68, 0x02, 0x66, + 0x41, 0x3f, 0x6f, 0x68, 0x29, 0xec, 0xce, 0x48, 0x1b, 0xf7, 0x27, 0xb6, 0xd3, 0x54, 0xed, 0xd4, + 0x15, 0x93, 0x8a, 0x27, 0x8d, 0x10, 0x3d, 0x83, 0x4e, 0x29, 0x12, 0xb1, 0x29, 0x6d, 0x18, 0x69, + 0xe3, 0xe1, 0x1f, 0x52, 0x9c, 0x0b, 0xc5, 0x93, 0x5a, 0x87, 0xe7, 0xd0, 0xa9, 0x10, 0xd4, 0x07, + 0x33, 0x0e, 0xde, 0x04, 0xe1, 0xfb, 0xc0, 0x6a, 0xc9, 0x20, 0x3c, 0x3f, 0xf7, 0xe7, 0x81, 0x67, + 0x69, 0x08, 0xa0, 0x13, 0x06, 0xea, 0xac, 0x4b, 0x82, 0x78, 0xef, 0x62, 0xef, 0x22, 0xb2, 0xda, + 0x68, 0x00, 0x5d, 0xe2, 0xbd, 0xf6, 0x66, 0x91, 0xe7, 0x5a, 0x06, 0xfe, 0xa1, 0xc1, 0x70, 0xbf, + 0x30, 0x74, 0x0a, 0xbd, 0x2c, 0x2f, 0x68, 0x2a, 0x72, 0xce, 0xd4, 0xc7, 0x0e, 0x27, 0xf8, 0x6f, + 0x2e, 0x1c, 0xb7, 0x51, 0x92, 0xeb, 0xa4, 0x3b, 0xf6, 0x00, 0x81, 0x21, 0xe8, 0x37, 0x51, 0x7f, + 0xbe, 0x3a, 0x23, 0x0c, 0x83, 0x0f, 0x05, 0xbf, 0x0a, 0x9a, 0x9c, 0xea, 0xd3, 0xf7, 0x30, 0xfc, + 0x18, 0x7a, 0xbb, 0x2a, 0xa4, 0xd5, 0x79, 0x70, 0x16, 0xc6, 0x81, 0x6b, 0xb5, 0xa4, 0xd5, 0x30, + 0x8e, 0xaa, 0x48, 0xc3, 0x36, 0xdc, 0x7f, 0xcb, 0x59, 0x2e, 0x78, 0x51, 0x7b, 0x28, 0x6b, 0x13, + 0xf8, 0xa7, 0x06, 0x83, 0x1a, 0xf3, 0xbe, 0x50, 0x26, 0xd0, 0x53, 0x30, 0xc4, 0x76, 0x4d, 0x6b, + 0xf7, 0x27, 0xb7, 0xdc, 0x2b, 0x95, 0x13, 0x6d, 0xd7, 0x94, 0x28, 0x21, 0x7a, 0x02, 0x66, 0x3d, + 0xac, 0xca, 0x71, 0x7f, 0x72, 0x74, 0x2b, 0xe7, 0x55, 0x8b, 0x34, 0x1a, 0xf4, 0xe2, 0x7a, 0x4c, + 0xda, 0xff, 0x1e, 0x13, 0x99, 0x55, 0x4b, 0xf1, 0x4b, 0x30, 0xe4, 0x93, 0xa8, 0x0b, 0x46, 0x10, + 0xfb, 0x7e, 0x65, 0x70, 0x11, 0x2e, 0x62, 0x7f, 0x1a, 0xc9, 0x96, 0x9b, 0xd0, 0x9e, 0xba, 0xae, + 0xa5, 0xcb, 0xde, 0xc7, 0x0b, 0x57, 0x82, 0x6d, 0x79, 0x76, 0x3d, 0xdf, 0x8b, 0x3c, 0xcb, 0x38, + 0xeb, 0x81, 0x59, 0x6e, 0x96, 0x1f, 0x69, 0x2a, 0xf0, 0x11, 0xdc, 0x9b, 0x66, 0xd9, 0xee, 0xad, + 0xf5, 0x6a, 0x8b, 0x4f, 0xe1, 0xd8, 0xa5, 0x2b, 0x2a, 0xe8, 0x8d, 0x79, 0xf8, 0xef, 0x0d, 0xc3, + 0xc7, 0x80, 0x6e, 0xdc, 0x20, 0xef, 0x3d, 0x81, 0x07, 0x84, 0xca, 0x47, 0xe7, 0x6c, 0xc9, 0x37, + 0x2c, 0x6b, 0x16, 0x40, 0x92, 0xcb, 0x8e, 0xda, 0xed, 0xe7, 0xbf, 0x02, 0x00, 0x00, 0xff, 0xff, + 0x94, 0xcf, 0x1c, 0xce, 0xec, 0x03, 0x00, 0x00, } diff --git a/rpc/contact.proto b/rpc/contact.proto index 7311bba..07fc6a7 100644 --- a/rpc/contact.proto +++ b/rpc/contact.proto @@ -31,6 +31,7 @@ message ContactRequest { string address = 2; string nickname = 3; string text = 4; + string fromNickname = 5; } message MonitorContactsRequest { diff --git a/rpc/conversation.pb.go b/rpc/conversation.pb.go index 9f10d76..7a7b8aa 100644 --- a/rpc/conversation.pb.go +++ b/rpc/conversation.pb.go @@ -41,7 +41,7 @@ var ConversationEvent_Type_value = map[string]int32{ func (x ConversationEvent_Type) String() string { return proto.EnumName(ConversationEvent_Type_name, int32(x)) } -func (ConversationEvent_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{0, 0} } +func (ConversationEvent_Type) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{0, 0} } type Message_Status int32 @@ -79,7 +79,7 @@ var Message_Status_value = map[string]int32{ func (x Message_Status) String() string { return proto.EnumName(Message_Status_name, int32(x)) } -func (Message_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor2, []int{3, 0} } +func (Message_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor1, []int{3, 0} } type ConversationEvent struct { Type ConversationEvent_Type `protobuf:"varint,1,opt,name=type,enum=ricochet.ConversationEvent_Type" json:"type,omitempty"` @@ -89,7 +89,7 @@ type ConversationEvent struct { func (m *ConversationEvent) Reset() { *m = ConversationEvent{} } func (m *ConversationEvent) String() string { return proto.CompactTextString(m) } func (*ConversationEvent) ProtoMessage() {} -func (*ConversationEvent) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } +func (*ConversationEvent) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{0} } func (m *ConversationEvent) GetMsg() *Message { if m != nil { @@ -104,7 +104,7 @@ type MonitorConversationsRequest struct { func (m *MonitorConversationsRequest) Reset() { *m = MonitorConversationsRequest{} } func (m *MonitorConversationsRequest) String() string { return proto.CompactTextString(m) } func (*MonitorConversationsRequest) ProtoMessage() {} -func (*MonitorConversationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } +func (*MonitorConversationsRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{1} } type Entity struct { // contactId and address MAY be unspecified for self @@ -116,7 +116,7 @@ type Entity struct { func (m *Entity) Reset() { *m = Entity{} } func (m *Entity) String() string { return proto.CompactTextString(m) } func (*Entity) ProtoMessage() {} -func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} } +func (*Entity) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{2} } type Message struct { Sender *Entity `protobuf:"bytes,1,opt,name=sender" json:"sender,omitempty"` @@ -133,7 +133,7 @@ type Message struct { func (m *Message) Reset() { *m = Message{} } func (m *Message) String() string { return proto.CompactTextString(m) } func (*Message) ProtoMessage() {} -func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{3} } +func (*Message) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{3} } func (m *Message) GetSender() *Entity { if m != nil { @@ -157,7 +157,7 @@ type MarkConversationReadRequest struct { func (m *MarkConversationReadRequest) Reset() { *m = MarkConversationReadRequest{} } func (m *MarkConversationReadRequest) String() string { return proto.CompactTextString(m) } func (*MarkConversationReadRequest) ProtoMessage() {} -func (*MarkConversationReadRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{4} } +func (*MarkConversationReadRequest) Descriptor() ([]byte, []int) { return fileDescriptor1, []int{4} } func (m *MarkConversationReadRequest) GetEntity() *Entity { if m != nil { @@ -176,37 +176,38 @@ func init() { proto.RegisterEnum("ricochet.Message_Status", Message_Status_name, Message_Status_value) } -func init() { proto.RegisterFile("conversation.proto", fileDescriptor2) } +func init() { proto.RegisterFile("conversation.proto", fileDescriptor1) } -var fileDescriptor2 = []byte{ - // 462 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x92, 0xdf, 0x6e, 0xd3, 0x30, - 0x14, 0xc6, 0x69, 0x9b, 0xa6, 0xed, 0x29, 0xa0, 0xec, 0x5c, 0xa0, 0x48, 0xfc, 0xd1, 0x14, 0x6e, - 0x76, 0x15, 0xa1, 0xc2, 0x0b, 0x54, 0x8b, 0x85, 0x2a, 0x75, 0x5d, 0x39, 0x5d, 0x10, 0x12, 0x57, - 0x26, 0xf1, 0x86, 0xc5, 0x9a, 0x94, 0xd8, 0x2b, 0xec, 0xb1, 0x78, 0x07, 0x1e, 0x8c, 0x13, 0x37, - 0x53, 0x22, 0x95, 0xdd, 0xc5, 0xfe, 0x3e, 0xdb, 0xdf, 0xf9, 0x7e, 0x01, 0xcc, 0xca, 0x62, 0xaf, - 0x2a, 0x23, 0xad, 0x2e, 0x8b, 0x78, 0x57, 0x95, 0xb6, 0xc4, 0x71, 0xa5, 0xb3, 0x32, 0xfb, 0xae, - 0x6c, 0xf4, 0xa7, 0x07, 0x27, 0xe7, 0x1d, 0x83, 0xd8, 0xab, 0xc2, 0xe2, 0x07, 0xf0, 0xec, 0xfd, - 0x4e, 0x85, 0xbd, 0xd3, 0xde, 0xd9, 0xf3, 0xd9, 0x69, 0xfc, 0x60, 0x8f, 0x8f, 0xac, 0xf1, 0x15, - 0xfb, 0xc8, 0xb9, 0xf1, 0x2d, 0x0c, 0xb6, 0xe6, 0x26, 0xec, 0xf3, 0xa1, 0xe9, 0xec, 0xa4, 0x3d, - 0x74, 0xa1, 0x8c, 0x91, 0x37, 0x8a, 0x6a, 0x35, 0x9a, 0x83, 0x57, 0x1f, 0xc1, 0x31, 0x78, 0xab, - 0x74, 0xb9, 0x0c, 0x9e, 0xe0, 0x53, 0x18, 0xaf, 0x2f, 0xd7, 0xe9, 0x72, 0x7e, 0x25, 0x82, 0x1e, - 0x4e, 0x61, 0x44, 0xe2, 0x5c, 0x2c, 0x3e, 0x8b, 0xa0, 0x5f, 0x9b, 0x36, 0x62, 0x95, 0x04, 0x03, - 0x04, 0xf0, 0xd3, 0x75, 0x52, 0x5b, 0xbc, 0xe8, 0x35, 0xbc, 0xbc, 0x28, 0x0b, 0x6d, 0xcb, 0xaa, - 0x1b, 0xc7, 0x90, 0xfa, 0x79, 0xa7, 0x8c, 0x8d, 0xbe, 0x80, 0x2f, 0x0a, 0xab, 0xed, 0x3d, 0xbe, - 0x82, 0x09, 0x0f, 0x6f, 0x65, 0x66, 0x17, 0xb9, 0x9b, 0x65, 0x48, 0xed, 0x06, 0x86, 0x30, 0x92, - 0x79, 0x5e, 0x71, 0x38, 0x17, 0x79, 0x42, 0x0f, 0x4b, 0x7c, 0x01, 0xbe, 0x36, 0x1b, 0x75, 0x7b, - 0x1d, 0x0e, 0x58, 0x18, 0x53, 0xb3, 0x8a, 0xfe, 0xf6, 0x61, 0xd4, 0x0c, 0x83, 0x67, 0xe0, 0x1b, - 0x55, 0xe4, 0xaa, 0x72, 0x17, 0x4f, 0x67, 0x41, 0x3b, 0xef, 0xe1, 0x75, 0x6a, 0x74, 0x8c, 0x61, - 0x52, 0xa9, 0x4c, 0xef, 0x34, 0xd7, 0xd5, 0x94, 0x73, 0x6c, 0x6e, 0x2d, 0x75, 0x6a, 0xab, 0xb7, - 0x3c, 0x89, 0xdc, 0xee, 0x5c, 0x80, 0x01, 0xb5, 0x1b, 0xf8, 0x06, 0x40, 0xe7, 0x6c, 0xd3, 0xd7, - 0x9a, 0xdf, 0xf6, 0x58, 0xf6, 0xa8, 0xb3, 0x83, 0xef, 0x38, 0x97, 0x95, 0xf6, 0xce, 0x84, 0x43, - 0x07, 0x2f, 0x3c, 0xe2, 0x10, 0x6f, 0x9c, 0x4e, 0x8d, 0x0f, 0x91, 0x61, 0xab, 0xdf, 0x36, 0xf4, - 0x5d, 0x09, 0xee, 0x3b, 0xfa, 0x0a, 0xfe, 0xc1, 0xd5, 0xe1, 0x34, 0x81, 0xa1, 0x20, 0xba, 0x24, - 0x86, 0xc4, 0x34, 0x3e, 0xa5, 0x22, 0x15, 0x09, 0x33, 0x62, 0x60, 0x35, 0xa3, 0xc5, 0xea, 0x23, - 0x63, 0x7a, 0x06, 0x93, 0x44, 0x2c, 0x19, 0x1e, 0xb1, 0xe6, 0x39, 0x6a, 0x2b, 0x12, 0xf3, 0x24, - 0x18, 0xd6, 0x17, 0xb9, 0x2f, 0x3f, 0xfa, 0xc5, 0xfc, 0x64, 0xf5, 0xa3, 0x0b, 0x8f, 0x94, 0xcc, - 0x1b, 0x7e, 0x75, 0xb3, 0xca, 0x95, 0xf2, 0x78, 0xb3, 0x07, 0x9d, 0x9b, 0xc5, 0x5b, 0x69, 0x2c, - 0xa9, 0x6c, 0xbf, 0x68, 0x3b, 0xe9, 0xbb, 0x4e, 0xfe, 0xa3, 0x7c, 0xf3, 0xdd, 0xdf, 0xff, 0xfe, - 0x5f, 0x00, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x5b, 0x0f, 0xe6, 0x13, 0x03, 0x00, 0x00, +var fileDescriptor1 = []byte{ + // 467 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x74, 0x92, 0xd1, 0x6e, 0xd3, 0x4c, + 0x10, 0x85, 0x7f, 0x27, 0x8e, 0x93, 0x4c, 0x7e, 0xd0, 0x76, 0x2e, 0x90, 0xa5, 0x02, 0x8a, 0xcc, + 0x4d, 0xae, 0x2c, 0x14, 0x78, 0x81, 0xa8, 0x5e, 0xa1, 0x48, 0x49, 0x1a, 0x36, 0x4d, 0x85, 0xc4, + 0x95, 0xb1, 0xa7, 0x65, 0x45, 0x63, 0x07, 0xef, 0x34, 0x90, 0xc7, 0xe2, 0x1d, 0x78, 0x30, 0xb4, + 0x1b, 0x57, 0xb6, 0x14, 0xb8, 0xdb, 0x9d, 0xf3, 0xed, 0x78, 0xe6, 0x1c, 0x03, 0x66, 0x65, 0x71, + 0xa0, 0xca, 0xa4, 0xac, 0xcb, 0x22, 0xde, 0x57, 0x25, 0x97, 0x38, 0xa8, 0x74, 0x56, 0x66, 0x5f, + 0x89, 0xa3, 0x5f, 0x1e, 0x5c, 0x5c, 0xb5, 0x00, 0x79, 0xa0, 0x82, 0xf1, 0x3d, 0xf8, 0x7c, 0xdc, + 0x53, 0xe8, 0x8d, 0xbd, 0xc9, 0xf3, 0xe9, 0x38, 0x7e, 0xc2, 0xe3, 0x33, 0x34, 0xbe, 0x39, 0xee, + 0x49, 0x39, 0x1a, 0xdf, 0x40, 0x77, 0x67, 0xee, 0xc3, 0xce, 0xd8, 0x9b, 0x8c, 0xa6, 0x17, 0xcd, + 0xa3, 0x25, 0x19, 0x93, 0xde, 0x93, 0xb2, 0x6a, 0x34, 0x03, 0xdf, 0x3e, 0xc1, 0x01, 0xf8, 0xab, + 0xed, 0x62, 0x21, 0xfe, 0xc3, 0xff, 0x61, 0xb0, 0xbe, 0x5e, 0x6f, 0x17, 0xb3, 0x1b, 0x29, 0x3c, + 0x1c, 0x41, 0x5f, 0xc9, 0x2b, 0x39, 0xbf, 0x95, 0xa2, 0x63, 0xa1, 0x8d, 0x5c, 0x25, 0xa2, 0x8b, + 0x00, 0xc1, 0x76, 0x9d, 0x58, 0xc4, 0x8f, 0x5e, 0xc1, 0xe5, 0xb2, 0x2c, 0x34, 0x97, 0x55, 0x7b, + 0x1c, 0xa3, 0xe8, 0xfb, 0x23, 0x19, 0x8e, 0x3e, 0x41, 0x20, 0x0b, 0xd6, 0x7c, 0xc4, 0x97, 0x30, + 0xcc, 0xca, 0x82, 0xd3, 0x8c, 0xe7, 0xb9, 0xdb, 0xa5, 0xa7, 0x9a, 0x02, 0x86, 0xd0, 0x4f, 0xf3, + 0xbc, 0x22, 0x63, 0xdc, 0xc8, 0x43, 0xf5, 0x74, 0xc5, 0x17, 0x10, 0x68, 0xb3, 0xa1, 0x87, 0xbb, + 0xb0, 0x3b, 0xf6, 0x26, 0x03, 0x55, 0xdf, 0xa2, 0xdf, 0x1d, 0xe8, 0xd7, 0xcb, 0xe0, 0x04, 0x02, + 0x43, 0x45, 0x4e, 0x95, 0x6b, 0x3c, 0x9a, 0x8a, 0x66, 0xdf, 0xd3, 0xd7, 0x55, 0xad, 0x63, 0x0c, + 0xc3, 0x8a, 0x32, 0xbd, 0xd7, 0x54, 0x70, 0x6d, 0xce, 0x39, 0xdc, 0x20, 0x76, 0x6a, 0xd6, 0x3b, + 0x32, 0x9c, 0xee, 0xf6, 0x6e, 0x80, 0xae, 0x6a, 0x0a, 0xf8, 0x1a, 0x40, 0xe7, 0x54, 0xb0, 0xbe, + 0xd3, 0x54, 0x85, 0xfe, 0xd8, 0x9b, 0xf8, 0xaa, 0x55, 0xc1, 0xb7, 0x10, 0x18, 0x4e, 0xf9, 0xd1, + 0x84, 0x3d, 0x17, 0x5e, 0x78, 0x96, 0x43, 0xbc, 0x71, 0xba, 0xaa, 0x39, 0x44, 0xf0, 0x99, 0x7e, + 0x72, 0x18, 0x38, 0x13, 0xdc, 0x39, 0xfa, 0x0c, 0xc1, 0x89, 0x6a, 0xe5, 0x34, 0x84, 0x9e, 0x54, + 0xea, 0x5a, 0x09, 0xcf, 0xa6, 0xf1, 0x71, 0x2b, 0xb7, 0x32, 0x11, 0x1d, 0x1b, 0x98, 0xcd, 0x68, + 0xbe, 0xfa, 0x20, 0xba, 0xf8, 0x0c, 0x86, 0x89, 0x5c, 0xcc, 0x6f, 0xa5, 0x92, 0x89, 0xf0, 0x5d, + 0x6a, 0x2b, 0x25, 0x67, 0x89, 0xe8, 0xd9, 0x46, 0xee, 0x14, 0x44, 0x3f, 0xe0, 0x72, 0x99, 0x56, + 0xdf, 0xda, 0xe1, 0x29, 0x4a, 0xf3, 0x3a, 0x3f, 0xeb, 0x2c, 0x39, 0x53, 0xfe, 0xed, 0xec, 0x49, + 0xc7, 0x18, 0xf0, 0x21, 0x35, 0xac, 0x28, 0x3b, 0xcc, 0x1b, 0x4f, 0x3a, 0xce, 0x93, 0xbf, 0x28, + 0x5f, 0x02, 0xf7, 0xf7, 0xbf, 0xfb, 0x13, 0x00, 0x00, 0xff, 0xff, 0xa0, 0x5b, 0x0f, 0xe6, 0x13, + 0x03, 0x00, 0x00, } diff --git a/rpc/core.pb.go b/rpc/core.pb.go index ec70f53..30b6b7b 100644 --- a/rpc/core.pb.go +++ b/rpc/core.pb.go @@ -24,7 +24,7 @@ type Reply struct { func (m *Reply) Reset() { *m = Reply{} } func (m *Reply) String() string { return proto.CompactTextString(m) } func (*Reply) ProtoMessage() {} -func (*Reply) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} } +func (*Reply) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{0} } type ServerStatusRequest struct { RpcVersion int32 `protobuf:"varint,1,opt,name=rpcVersion" json:"rpcVersion,omitempty"` @@ -33,7 +33,7 @@ type ServerStatusRequest struct { func (m *ServerStatusRequest) Reset() { *m = ServerStatusRequest{} } func (m *ServerStatusRequest) String() string { return proto.CompactTextString(m) } func (*ServerStatusRequest) ProtoMessage() {} -func (*ServerStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} } +func (*ServerStatusRequest) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{1} } type ServerStatusReply struct { RpcVersion int32 `protobuf:"varint,1,opt,name=rpcVersion" json:"rpcVersion,omitempty"` @@ -43,7 +43,7 @@ type ServerStatusReply struct { func (m *ServerStatusReply) Reset() { *m = ServerStatusReply{} } func (m *ServerStatusReply) String() string { return proto.CompactTextString(m) } func (*ServerStatusReply) ProtoMessage() {} -func (*ServerStatusReply) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{2} } +func (*ServerStatusReply) Descriptor() ([]byte, []int) { return fileDescriptor2, []int{2} } func init() { proto.RegisterType((*Reply)(nil), "ricochet.Reply") @@ -669,40 +669,40 @@ var _RicochetCore_serviceDesc = grpc.ServiceDesc{ ServerStreams: true, }, }, - Metadata: fileDescriptor3, + Metadata: fileDescriptor2, } -func init() { proto.RegisterFile("core.proto", fileDescriptor3) } +func init() { proto.RegisterFile("core.proto", fileDescriptor2) } -var fileDescriptor3 = []byte{ - // 457 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0x5f, 0x6f, 0xd3, 0x30, - 0x10, 0x57, 0x91, 0x06, 0xe3, 0xb6, 0x6c, 0xaa, 0xa9, 0x60, 0x84, 0x31, 0xa6, 0x02, 0x12, 0x4f, - 0x15, 0x62, 0xda, 0x1b, 0x0f, 0x4c, 0x1d, 0xa0, 0x49, 0x64, 0x0f, 0xa9, 0x8a, 0x84, 0xc4, 0x4b, - 0xea, 0x9c, 0x20, 0xb4, 0xb2, 0x83, 0x7d, 0x2d, 0xea, 0x87, 0xe0, 0x3b, 0xe3, 0x36, 0x76, 0xed, - 0x28, 0xa9, 0x8a, 0xf6, 0x56, 0xff, 0xfe, 0xe5, 0xee, 0x7c, 0x2e, 0x00, 0x97, 0x0a, 0x07, 0xa5, - 0x92, 0x24, 0xd9, 0xbe, 0x2a, 0xb8, 0xe4, 0x3f, 0x91, 0xe2, 0x48, 0x20, 0xfd, 0x91, 0x6a, 0x5a, - 0x11, 0xf1, 0x51, 0x91, 0xa3, 0xa0, 0x82, 0x96, 0xf6, 0x1c, 0x71, 0x29, 0x28, 0xe3, 0x64, 0x8f, - 0xcc, 0x1c, 0x17, 0xa8, 0x74, 0x46, 0x85, 0x14, 0x15, 0xd6, 0x7f, 0x00, 0x7b, 0x29, 0x96, 0xb3, - 0x65, 0xff, 0x12, 0x1e, 0x8d, 0x50, 0x19, 0x7a, 0x44, 0x19, 0xcd, 0x75, 0x8a, 0xbf, 0xe7, 0xa8, - 0x89, 0x9d, 0x01, 0xa8, 0x92, 0x7f, 0x35, 0x2e, 0xe3, 0x39, 0xe9, 0x9c, 0x77, 0xde, 0xec, 0xa5, - 0x01, 0xd2, 0xff, 0x06, 0xdd, 0xba, 0xcd, 0x64, 0xed, 0x32, 0xb1, 0x57, 0x10, 0xe9, 0xb5, 0xc9, - 0x49, 0xee, 0x19, 0xc9, 0xc3, 0xb4, 0x0e, 0xbe, 0xfb, 0xbb, 0x0f, 0x87, 0xa9, 0xed, 0x74, 0x68, - 0xba, 0x67, 0x09, 0x1c, 0x7f, 0x46, 0x0a, 0x3f, 0xc7, 0x9e, 0x0f, 0xdc, 0x2c, 0x06, 0x2d, 0xd5, - 0xc7, 0xcf, 0xb6, 0xd1, 0xab, 0x2a, 0xbf, 0xc0, 0x51, 0x22, 0x45, 0x41, 0x52, 0xdd, 0x56, 0x53, - 0x64, 0x2f, 0xbc, 0xbc, 0xce, 0xb8, 0xbc, 0x27, 0x5e, 0x60, 0x99, 0x2a, 0xf0, 0x6d, 0x87, 0x7d, - 0x82, 0x43, 0xf3, 0x5b, 0x91, 0xcb, 0x0a, 0x2b, 0x0b, 0xf0, 0x5d, 0x49, 0xec, 0x1a, 0x0e, 0x46, - 0x24, 0x4b, 0x17, 0x73, 0x1a, 0xc6, 0x6c, 0xe0, 0x9d, 0x29, 0xef, 0xe1, 0xc0, 0x8c, 0xea, 0xc6, - 0xae, 0x03, 0x7b, 0xea, 0x75, 0x0e, 0x73, 0x11, 0xac, 0x49, 0xad, 0x06, 0x6d, 0xfb, 0x1f, 0x56, - 0x0b, 0xa4, 0xd9, 0x79, 0x63, 0x34, 0x8e, 0x72, 0x41, 0x8f, 0xbd, 0xc2, 0x52, 0x1f, 0x17, 0x26, - 0xcf, 0x8c, 0xe6, 0x03, 0x74, 0xaf, 0xf2, 0xdc, 0x82, 0x6e, 0xb1, 0x4e, 0x1a, 0x72, 0x17, 0xd4, - 0x6d, 0x30, 0xec, 0x12, 0xa2, 0x71, 0x99, 0x67, 0x84, 0x0e, 0x68, 0x6a, 0xda, 0x6c, 0x09, 0x44, - 0xd7, 0x38, 0x43, 0x6f, 0x3b, 0xf3, 0x9a, 0x1a, 0xe1, 0x3e, 0x7d, 0xba, 0x95, 0x5f, 0x2d, 0xcc, - 0x10, 0x7a, 0x57, 0x9c, 0x63, 0x49, 0x37, 0x62, 0x22, 0xe7, 0x22, 0xbf, 0x53, 0x2b, 0x63, 0xe8, - 0xa5, 0xf8, 0x0b, 0xf9, 0xff, 0x87, 0xbc, 0xf4, 0x4c, 0x9b, 0xb3, 0xaa, 0xed, 0x3b, 0xf4, 0xfc, - 0xbd, 0x6c, 0x1e, 0xb9, 0x66, 0xaf, 0xdb, 0xee, 0xcd, 0xf3, 0x2d, 0x0f, 0x25, 0xe4, 0xdd, 0x0d, - 0x5e, 0x98, 0xa5, 0x44, 0x91, 0x27, 0xa8, 0x75, 0xf6, 0x03, 0xc3, 0xe9, 0x5b, 0x28, 0x6e, 0x42, - 0xec, 0xd6, 0x94, 0x94, 0xa9, 0x69, 0x98, 0x97, 0x62, 0x96, 0xd7, 0x4a, 0x6a, 0xe1, 0x5d, 0x49, - 0xc7, 0x61, 0xdb, 0xa6, 0xc5, 0xc9, 0xfd, 0xf5, 0x3f, 0xd6, 0xc5, 0xbf, 0x00, 0x00, 0x00, 0xff, - 0xff, 0xa5, 0xe8, 0x3e, 0x1e, 0x0b, 0x05, 0x00, 0x00, +var fileDescriptor2 = []byte{ + // 462 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x94, 0xd1, 0x6b, 0xd4, 0x40, + 0x10, 0xc6, 0x89, 0x50, 0xad, 0x73, 0x4d, 0xcb, 0x8d, 0x87, 0xd6, 0xb3, 0xd6, 0xe3, 0x54, 0xe8, + 0xd3, 0x51, 0x2c, 0x7d, 0xf3, 0xc1, 0x72, 0xd5, 0x52, 0x30, 0x7d, 0x48, 0xa8, 0x20, 0xf8, 0x92, + 0x6e, 0x06, 0x8d, 0x3d, 0x76, 0xe3, 0xee, 0xdc, 0xc9, 0xfd, 0x11, 0xfe, 0xcf, 0x72, 0xcd, 0x6e, + 0x77, 0x43, 0x72, 0x9c, 0xf8, 0x98, 0xef, 0xf7, 0xcd, 0x97, 0xd9, 0xd9, 0x49, 0x00, 0x84, 0xd2, + 0x34, 0xa9, 0xb4, 0x62, 0x85, 0xdb, 0xba, 0x14, 0x4a, 0xfc, 0x20, 0x1e, 0xc6, 0x92, 0xf8, 0xb7, + 0xd2, 0xb7, 0x35, 0x18, 0xee, 0x96, 0x05, 0x49, 0x2e, 0x79, 0x69, 0x9f, 0x63, 0xa1, 0x24, 0xe7, + 0x82, 0xed, 0x23, 0x0a, 0x25, 0x17, 0xa4, 0x4d, 0xce, 0xa5, 0x92, 0xb5, 0x36, 0x7e, 0x04, 0x5b, + 0x29, 0x55, 0xb3, 0xe5, 0xf8, 0x14, 0x9e, 0x64, 0xa4, 0x17, 0xa4, 0x33, 0xce, 0x79, 0x6e, 0x52, + 0xfa, 0x35, 0x27, 0xc3, 0x78, 0x08, 0xa0, 0x2b, 0xf1, 0x85, 0xb4, 0x29, 0x95, 0xdc, 0x8f, 0x46, + 0xd1, 0xd1, 0x56, 0x1a, 0x28, 0xe3, 0xaf, 0xd0, 0x6f, 0x96, 0x55, 0xb3, 0xe5, 0xa6, 0x22, 0x7c, + 0x03, 0xb1, 0xb9, 0x2b, 0x72, 0x96, 0x07, 0xa3, 0xe8, 0xe8, 0x71, 0xda, 0x14, 0xdf, 0xfd, 0xd9, + 0x86, 0x9d, 0xd4, 0x9e, 0x74, 0xaa, 0x34, 0x61, 0x02, 0x7b, 0x17, 0xc4, 0xe1, 0xeb, 0xf0, 0xe5, + 0xc4, 0xcd, 0x62, 0xd2, 0xd1, 0xfd, 0xf0, 0xc5, 0x3a, 0xbc, 0xea, 0xf2, 0x33, 0xec, 0x26, 0x4a, + 0x96, 0xac, 0xf4, 0x55, 0x3d, 0x45, 0x7c, 0xe5, 0xed, 0x4d, 0xe2, 0xf2, 0x9e, 0x79, 0x83, 0x25, + 0x75, 0xe0, 0x71, 0x84, 0x9f, 0x60, 0x27, 0xe3, 0x5c, 0xb3, 0xcb, 0x0a, 0x3b, 0x0b, 0xf4, 0x4d, + 0x49, 0x78, 0x0e, 0xbd, 0x8c, 0x55, 0xe5, 0x62, 0x0e, 0xc2, 0x98, 0x7b, 0x79, 0x63, 0xca, 0x7b, + 0xe8, 0x5d, 0x10, 0x5f, 0xda, 0x75, 0xc0, 0xe7, 0xde, 0xe7, 0x34, 0x17, 0x81, 0x6d, 0xb4, 0x1a, + 0xb4, 0x3d, 0xff, 0xb4, 0x5e, 0x20, 0x83, 0xa3, 0xd6, 0x68, 0x1c, 0x72, 0x41, 0x4f, 0xbd, 0xc3, + 0xa2, 0x8f, 0x0b, 0x92, 0x7c, 0x1c, 0xe1, 0x07, 0xe8, 0x9f, 0x15, 0x85, 0x15, 0xdd, 0x62, 0xed, + 0xb7, 0xec, 0x2e, 0xa8, 0xdf, 0x22, 0x78, 0x0a, 0xf1, 0x75, 0x55, 0xe4, 0x4c, 0x4e, 0x68, 0x7b, + 0xba, 0xca, 0x12, 0x88, 0xcf, 0x69, 0x46, 0xbe, 0xec, 0xd0, 0x7b, 0x1a, 0xc0, 0xbd, 0xfa, 0x60, + 0x2d, 0x5f, 0x2d, 0xcc, 0x14, 0x06, 0x67, 0x42, 0x50, 0xc5, 0x97, 0xf2, 0x46, 0xcd, 0x65, 0xf1, + 0x5f, 0x47, 0xb9, 0x86, 0x41, 0x4a, 0x3f, 0x49, 0xfc, 0x7b, 0xc8, 0x6b, 0x4f, 0xba, 0x2a, 0xeb, + 0xde, 0xbe, 0xc1, 0xc0, 0xdf, 0xcb, 0xfd, 0x47, 0x6e, 0xf0, 0x6d, 0xd7, 0xbd, 0x79, 0xde, 0xf1, + 0xa1, 0x84, 0xdc, 0xdd, 0xe0, 0x09, 0xf4, 0x32, 0x92, 0x45, 0x42, 0xc6, 0xe4, 0xdf, 0x29, 0x9c, + 0xbe, 0x95, 0x86, 0x6d, 0x09, 0xaf, 0x60, 0x90, 0xe4, 0xfa, 0x36, 0xcc, 0x4b, 0x29, 0x2f, 0x1a, + 0x2d, 0x75, 0x70, 0xd7, 0xd2, 0x5e, 0x78, 0xec, 0x6a, 0xb6, 0xbc, 0x79, 0x78, 0xf7, 0xc7, 0x3a, + 0xf9, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xa5, 0xe8, 0x3e, 0x1e, 0x0b, 0x05, 0x00, 0x00, } diff --git a/rpc/identity.pb.go b/rpc/identity.pb.go index 28dc8dd..6a99cd5 100644 --- a/rpc/identity.pb.go +++ b/rpc/identity.pb.go @@ -20,7 +20,7 @@ type Identity struct { func (m *Identity) Reset() { *m = Identity{} } func (m *Identity) String() string { return proto.CompactTextString(m) } func (*Identity) ProtoMessage() {} -func (*Identity) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} } +func (*Identity) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{0} } type IdentityRequest struct { } @@ -28,16 +28,16 @@ type IdentityRequest struct { func (m *IdentityRequest) Reset() { *m = IdentityRequest{} } func (m *IdentityRequest) String() string { return proto.CompactTextString(m) } func (*IdentityRequest) ProtoMessage() {} -func (*IdentityRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} } +func (*IdentityRequest) Descriptor() ([]byte, []int) { return fileDescriptor3, []int{1} } func init() { proto.RegisterType((*Identity)(nil), "ricochet.Identity") proto.RegisterType((*IdentityRequest)(nil), "ricochet.IdentityRequest") } -func init() { proto.RegisterFile("identity.proto", fileDescriptor4) } +func init() { proto.RegisterFile("identity.proto", fileDescriptor3) } -var fileDescriptor4 = []byte{ +var fileDescriptor3 = []byte{ // 95 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xe2, 0xe2, 0xcb, 0x4c, 0x49, 0xcd, 0x2b, 0xc9, 0x2c, 0xa9, 0xd4, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x28, 0xca, 0x4c, 0xce, diff --git a/rpc/network.pb.go b/rpc/network.pb.go index d0d0cea..07c1e63 100644 --- a/rpc/network.pb.go +++ b/rpc/network.pb.go @@ -38,7 +38,7 @@ var TorProcessStatus_Status_value = map[string]int32{ func (x TorProcessStatus_Status) String() string { return proto.EnumName(TorProcessStatus_Status_name, int32(x)) } -func (TorProcessStatus_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{1, 0} } +func (TorProcessStatus_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{1, 0} } type TorControlStatus_Status int32 @@ -65,7 +65,7 @@ var TorControlStatus_Status_value = map[string]int32{ func (x TorControlStatus_Status) String() string { return proto.EnumName(TorControlStatus_Status_name, int32(x)) } -func (TorControlStatus_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor5, []int{2, 0} } +func (TorControlStatus_Status) EnumDescriptor() ([]byte, []int) { return fileDescriptor4, []int{2, 0} } type TorConnectionStatus_Status int32 @@ -93,7 +93,7 @@ func (x TorConnectionStatus_Status) String() string { return proto.EnumName(TorConnectionStatus_Status_name, int32(x)) } func (TorConnectionStatus_Status) EnumDescriptor() ([]byte, []int) { - return fileDescriptor5, []int{3, 0} + return fileDescriptor4, []int{3, 0} } type MonitorNetworkRequest struct { @@ -102,7 +102,7 @@ type MonitorNetworkRequest struct { func (m *MonitorNetworkRequest) Reset() { *m = MonitorNetworkRequest{} } func (m *MonitorNetworkRequest) String() string { return proto.CompactTextString(m) } func (*MonitorNetworkRequest) ProtoMessage() {} -func (*MonitorNetworkRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{0} } +func (*MonitorNetworkRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{0} } type TorProcessStatus struct { Status TorProcessStatus_Status `protobuf:"varint,1,opt,name=status,enum=ricochet.TorProcessStatus_Status" json:"status,omitempty"` @@ -112,7 +112,7 @@ type TorProcessStatus struct { func (m *TorProcessStatus) Reset() { *m = TorProcessStatus{} } func (m *TorProcessStatus) String() string { return proto.CompactTextString(m) } func (*TorProcessStatus) ProtoMessage() {} -func (*TorProcessStatus) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{1} } +func (*TorProcessStatus) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{1} } type TorControlStatus struct { Status TorControlStatus_Status `protobuf:"varint,1,opt,name=status,enum=ricochet.TorControlStatus_Status" json:"status,omitempty"` @@ -123,7 +123,7 @@ type TorControlStatus struct { func (m *TorControlStatus) Reset() { *m = TorControlStatus{} } func (m *TorControlStatus) String() string { return proto.CompactTextString(m) } func (*TorControlStatus) ProtoMessage() {} -func (*TorControlStatus) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{2} } +func (*TorControlStatus) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{2} } type TorConnectionStatus struct { Status TorConnectionStatus_Status `protobuf:"varint,1,opt,name=status,enum=ricochet.TorConnectionStatus_Status" json:"status,omitempty"` @@ -134,7 +134,7 @@ type TorConnectionStatus struct { func (m *TorConnectionStatus) Reset() { *m = TorConnectionStatus{} } func (m *TorConnectionStatus) String() string { return proto.CompactTextString(m) } func (*TorConnectionStatus) ProtoMessage() {} -func (*TorConnectionStatus) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{3} } +func (*TorConnectionStatus) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{3} } type NetworkStatus struct { Process *TorProcessStatus `protobuf:"bytes,1,opt,name=process" json:"process,omitempty"` @@ -145,7 +145,7 @@ type NetworkStatus struct { func (m *NetworkStatus) Reset() { *m = NetworkStatus{} } func (m *NetworkStatus) String() string { return proto.CompactTextString(m) } func (*NetworkStatus) ProtoMessage() {} -func (*NetworkStatus) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{4} } +func (*NetworkStatus) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{4} } func (m *NetworkStatus) GetProcess() *TorProcessStatus { if m != nil { @@ -174,7 +174,7 @@ type StartNetworkRequest struct { func (m *StartNetworkRequest) Reset() { *m = StartNetworkRequest{} } func (m *StartNetworkRequest) String() string { return proto.CompactTextString(m) } func (*StartNetworkRequest) ProtoMessage() {} -func (*StartNetworkRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{5} } +func (*StartNetworkRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{5} } type StopNetworkRequest struct { } @@ -182,7 +182,7 @@ type StopNetworkRequest struct { func (m *StopNetworkRequest) Reset() { *m = StopNetworkRequest{} } func (m *StopNetworkRequest) String() string { return proto.CompactTextString(m) } func (*StopNetworkRequest) ProtoMessage() {} -func (*StopNetworkRequest) Descriptor() ([]byte, []int) { return fileDescriptor5, []int{6} } +func (*StopNetworkRequest) Descriptor() ([]byte, []int) { return fileDescriptor4, []int{6} } func init() { proto.RegisterType((*MonitorNetworkRequest)(nil), "ricochet.MonitorNetworkRequest") @@ -197,37 +197,37 @@ func init() { proto.RegisterEnum("ricochet.TorConnectionStatus_Status", TorConnectionStatus_Status_name, TorConnectionStatus_Status_value) } -func init() { proto.RegisterFile("network.proto", fileDescriptor5) } +func init() { proto.RegisterFile("network.proto", fileDescriptor4) } -var fileDescriptor5 = []byte{ - // 451 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x93, 0xcf, 0x6e, 0xd3, 0x40, - 0x10, 0xc6, 0xeb, 0x46, 0xa4, 0xcd, 0xa4, 0xae, 0xd2, 0x2d, 0x15, 0x16, 0x12, 0xa8, 0xac, 0x38, - 0x70, 0x40, 0x3e, 0x14, 0x2e, 0x48, 0xfc, 0x73, 0x13, 0x17, 0x45, 0xb4, 0x6b, 0x6b, 0xed, 0x82, - 0x38, 0xa6, 0xee, 0xaa, 0x44, 0x45, 0x1e, 0xb3, 0xbb, 0x15, 0xcf, 0xc5, 0x95, 0xc7, 0xe0, 0x25, - 0x78, 0x0d, 0xd6, 0xde, 0x4d, 0x64, 0x1b, 0x81, 0x50, 0x4f, 0xc9, 0xce, 0x7e, 0x33, 0x9e, 0xdf, - 0x37, 0xb3, 0xe0, 0x97, 0x42, 0x7f, 0x43, 0x79, 0x1d, 0x56, 0x12, 0x35, 0x92, 0x6d, 0xb9, 0x2c, - 0xb0, 0xf8, 0x2c, 0x34, 0xbd, 0x07, 0x07, 0x67, 0x58, 0x2e, 0x35, 0x4a, 0x66, 0x15, 0x5c, 0x7c, - 0xbd, 0x11, 0x4a, 0xd3, 0xef, 0x1e, 0x4c, 0x72, 0x94, 0xa9, 0xc4, 0x42, 0x28, 0x95, 0xe9, 0x85, - 0xbe, 0x51, 0xe4, 0x05, 0x0c, 0x55, 0xf3, 0x2f, 0xf0, 0x0e, 0xbd, 0x27, 0xbb, 0x47, 0x8f, 0xc2, - 0x55, 0xa1, 0xb0, 0xaf, 0x0d, 0xed, 0x0f, 0x77, 0x09, 0x84, 0xc2, 0x8e, 0x90, 0x12, 0xe5, 0x99, - 0x51, 0x2c, 0xae, 0x44, 0xb0, 0x69, 0x0a, 0x8c, 0x78, 0x27, 0x46, 0x5f, 0xc3, 0xd0, 0x7d, 0x68, - 0x07, 0xb6, 0x67, 0xf3, 0x2c, 0x3a, 0x3e, 0x8d, 0x67, 0x93, 0x0d, 0x32, 0x86, 0xad, 0x2c, 0x4f, - 0xd2, 0xd4, 0x1c, 0xbc, 0xfa, 0x2a, 0xcb, 0x23, 0x9e, 0xcf, 0xd9, 0xbb, 0xc9, 0x66, 0x7d, 0xc5, - 0xcf, 0x19, 0xab, 0x0f, 0x03, 0xfa, 0xd3, 0xf6, 0x3c, 0xc5, 0x52, 0x4b, 0xfc, 0xf2, 0x5f, 0x3d, - 0x77, 0xb4, 0xb7, 0xe8, 0x99, 0x3c, 0x04, 0x30, 0xe6, 0x7d, 0x10, 0x52, 0x2d, 0xb1, 0x0c, 0xa0, - 0x51, 0xb4, 0x22, 0xf4, 0xcd, 0x9a, 0xa9, 0x45, 0xb1, 0x41, 0x46, 0x70, 0x27, 0xe6, 0x3c, 0xe1, - 0x06, 0x68, 0x17, 0x60, 0x9a, 0x30, 0x16, 0x4f, 0x1d, 0x92, 0x0f, 0x23, 0x77, 0x36, 0xca, 0x01, - 0xfd, 0xe5, 0xc1, 0xbe, 0x6d, 0xb4, 0x14, 0x85, 0x36, 0x25, 0x5d, 0xb9, 0x97, 0x3d, 0xae, 0xc7, - 0x7d, 0xae, 0x8e, 0xbc, 0x8f, 0xf6, 0x14, 0xf6, 0x2e, 0x10, 0xb5, 0xd2, 0x72, 0x51, 0x99, 0xb9, - 0x5d, 0x49, 0x83, 0xe3, 0xba, 0xff, 0xf3, 0xa2, 0x36, 0x42, 0x61, 0x71, 0xad, 0xa2, 0xcb, 0xcb, - 0x46, 0x38, 0x3e, 0x1c, 0xd4, 0x46, 0xb4, 0x63, 0xf4, 0x6d, 0x1b, 0xf4, 0x9c, 0xbd, 0x67, 0xc9, - 0x47, 0x66, 0x67, 0x97, 0x9c, 0x9c, 0x9c, 0xce, 0x59, 0x6c, 0x50, 0xf7, 0xc0, 0x3f, 0x4e, 0x92, - 0x3c, 0xcb, 0x79, 0x94, 0xa6, 0x96, 0xd6, 0x18, 0xc1, 0xe3, 0x68, 0xf6, 0xc9, 0x90, 0xfe, 0xf0, - 0xc0, 0x77, 0x5b, 0xe8, 0x2a, 0x3d, 0x87, 0xad, 0xca, 0x2e, 0x55, 0x03, 0x39, 0x3e, 0xba, 0xff, - 0xf7, 0x85, 0xe3, 0x2b, 0x69, 0x9d, 0x55, 0xd8, 0xb1, 0x36, 0x13, 0xeb, 0x67, 0x75, 0x46, 0xce, - 0x57, 0x52, 0xf2, 0x0a, 0xa0, 0x58, 0x9b, 0x16, 0x0c, 0x9a, 0xc4, 0x07, 0xff, 0xf4, 0x94, 0xb7, - 0x12, 0xe8, 0x01, 0xec, 0x9b, 0xa8, 0xd4, 0xbd, 0x67, 0x74, 0x17, 0x48, 0xa6, 0xb1, 0xea, 0x46, - 0x2f, 0x86, 0xcd, 0x33, 0x7c, 0xf6, 0x3b, 0x00, 0x00, 0xff, 0xff, 0x78, 0x89, 0xf8, 0x34, 0x97, - 0x03, 0x00, 0x00, +var fileDescriptor4 = []byte{ + // 455 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x53, 0xcd, 0x6e, 0xd3, 0x40, + 0x10, 0xee, 0xd6, 0x6a, 0xda, 0x4c, 0x9a, 0xca, 0xdd, 0x52, 0x11, 0x21, 0x81, 0xc2, 0x8a, 0x43, + 0x0f, 0x28, 0x87, 0xc2, 0x05, 0x89, 0x3f, 0x37, 0x76, 0x51, 0x44, 0xbb, 0xb6, 0xd6, 0x2e, 0x88, + 0x63, 0xea, 0xae, 0x4a, 0x54, 0xe4, 0x09, 0xb3, 0x5b, 0xf1, 0x5c, 0x5c, 0x79, 0x0c, 0x5e, 0x82, + 0xd7, 0x40, 0xb6, 0x37, 0x91, 0x6d, 0x04, 0x42, 0x3d, 0xd9, 0x3b, 0xf3, 0x7d, 0xb3, 0xdf, 0x37, + 0x33, 0x0b, 0xc3, 0x42, 0xdb, 0x6f, 0x48, 0x37, 0x93, 0x25, 0xa1, 0x45, 0xbe, 0x43, 0x8b, 0x1c, + 0xf3, 0xcf, 0xda, 0x8a, 0xfb, 0x70, 0x78, 0x8e, 0xc5, 0xc2, 0x22, 0xc9, 0x1a, 0xa1, 0xf4, 0xd7, + 0x5b, 0x6d, 0xac, 0xf8, 0xce, 0xc0, 0xcf, 0x90, 0x12, 0xc2, 0x5c, 0x1b, 0x93, 0xda, 0xb9, 0xbd, + 0x35, 0xfc, 0x05, 0xf4, 0x4c, 0xf5, 0x37, 0x62, 0x63, 0x76, 0xb4, 0x77, 0xfc, 0x78, 0xb2, 0x2a, + 0x34, 0xe9, 0x62, 0x27, 0xf5, 0x47, 0x39, 0x02, 0x17, 0xb0, 0xab, 0x89, 0x90, 0xce, 0xb5, 0x31, + 0xf3, 0x6b, 0x3d, 0xda, 0x1c, 0xb3, 0xa3, 0xbe, 0x6a, 0xc5, 0xc4, 0x6b, 0xe8, 0xb9, 0x8b, 0x76, + 0x61, 0x27, 0x9c, 0xa5, 0xc1, 0xc9, 0x59, 0x14, 0xfa, 0x1b, 0x7c, 0x00, 0xdb, 0x69, 0x16, 0x27, + 0x49, 0x14, 0xfa, 0xac, 0x4c, 0xa5, 0x59, 0xa0, 0xb2, 0x99, 0x7c, 0xe7, 0x6f, 0x96, 0x29, 0x75, + 0x21, 0x65, 0x79, 0xf0, 0xc4, 0xcf, 0x5a, 0xf3, 0x14, 0x0b, 0x4b, 0xf8, 0xe5, 0xbf, 0x34, 0xb7, + 0xb0, 0x77, 0xd0, 0xcc, 0x1f, 0x01, 0x58, 0xa4, 0x0f, 0x9a, 0xcc, 0x02, 0x8b, 0x11, 0x54, 0x88, + 0x46, 0x44, 0xbc, 0x59, 0x7b, 0x6a, 0xb8, 0xd8, 0xe0, 0x7d, 0xd8, 0x8a, 0x94, 0x8a, 0x95, 0xcf, + 0xf8, 0x1e, 0xc0, 0x34, 0x96, 0x32, 0x9a, 0x3a, 0x4b, 0x43, 0xe8, 0xbb, 0x73, 0x14, 0xfa, 0x9e, + 0xf8, 0xc5, 0xe0, 0xa0, 0x16, 0x5a, 0xe8, 0xdc, 0x2e, 0xb0, 0x70, 0xe5, 0x5e, 0x76, 0x7c, 0x3d, + 0xe9, 0xfa, 0x6a, 0xc1, 0xbb, 0xd6, 0x9e, 0xc2, 0xfe, 0x25, 0xa2, 0x35, 0x96, 0xe6, 0xcb, 0x84, + 0xf0, 0x9a, 0xb4, 0x31, 0x4e, 0xfd, 0x9f, 0x89, 0xb2, 0x11, 0x06, 0xf3, 0x1b, 0x13, 0x5c, 0x5d, + 0x55, 0xc0, 0xc1, 0xd8, 0x2b, 0x1b, 0xd1, 0x8c, 0x89, 0xb7, 0x4d, 0xa3, 0x17, 0xf2, 0xbd, 0x8c, + 0x3f, 0xca, 0x7a, 0x76, 0xf1, 0xe9, 0xe9, 0xd9, 0x4c, 0x46, 0x3e, 0xe3, 0xfb, 0x30, 0x3c, 0x89, + 0xe3, 0x2c, 0xcd, 0x54, 0x90, 0x24, 0xb5, 0xdb, 0x3e, 0x6c, 0xa9, 0x28, 0x08, 0x3f, 0xf9, 0x9e, + 0xf8, 0xc1, 0x60, 0xe8, 0xb6, 0xd0, 0x55, 0x7a, 0x0e, 0xdb, 0xcb, 0x7a, 0xa9, 0x2a, 0x93, 0x83, + 0xe3, 0x07, 0x7f, 0x5f, 0x38, 0xb5, 0x82, 0x96, 0xac, 0xbc, 0x1e, 0x6b, 0x35, 0xb1, 0x2e, 0xab, + 0x35, 0x72, 0xb5, 0x82, 0xf2, 0x57, 0x00, 0xf9, 0xba, 0x69, 0x23, 0xaf, 0x22, 0x3e, 0xfc, 0x67, + 0x4f, 0x55, 0x83, 0x20, 0x0e, 0xe1, 0x20, 0xb5, 0x73, 0xb2, 0x9d, 0x67, 0x74, 0x0f, 0x78, 0x6a, + 0x71, 0xd9, 0x8e, 0x5e, 0xf6, 0xaa, 0x67, 0xf8, 0xec, 0x77, 0x00, 0x00, 0x00, 0xff, 0xff, 0x78, + 0x89, 0xf8, 0x34, 0x97, 0x03, 0x00, 0x00, } diff --git a/rpc/rpc.go b/rpc/rpc.go new file mode 100644 index 0000000..66f0181 --- /dev/null +++ b/rpc/rpc.go @@ -0,0 +1,3 @@ +package ricochet + +//go:generate protoc --go_out=plugins=grpc:. contact.proto conversation.proto core.proto identity.proto network.proto