Skip to content
Snippets Groups Projects
Commit 0be9de3b authored by Benjamin Wenger's avatar Benjamin Wenger
Browse files

fixed user discovery generated messages

parent e3f3c188
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
ud/udMessages.pb.go
+ 26
− 26
View file @ 0be9de3b
...@@ -8,8 +8,8 @@ ...@@ -8,8 +8,8 @@
// Code generated by protoc-gen-go. DO NOT EDIT. // Code generated by protoc-gen-go. DO NOT EDIT.
// versions: // versions:
// protoc-gen-go v1.23.0 // protoc-gen-go v1.25.0
// protoc v3.13.0 // protoc (unknown)
// source: udMessages.proto // source: udMessages.proto
package ud package ud
...@@ -96,8 +96,8 @@ type Contact struct { ...@@ -96,8 +96,8 @@ type Contact struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
UserID [][]byte `protobuf:"bytes,1,rep,name=userID,proto3" json:"userID,omitempty"` UserID []byte `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID,omitempty"`
PubKey [][]byte `protobuf:"bytes,2,rep,name=pubKey,proto3" json:"pubKey,omitempty"` PubKey []byte `protobuf:"bytes,2,opt,name=pubKey,proto3" json:"pubKey,omitempty"`
TrigFacts []*HashFact `protobuf:"bytes,3,rep,name=trigFacts,proto3" json:"trigFacts,omitempty"` TrigFacts []*HashFact `protobuf:"bytes,3,rep,name=trigFacts,proto3" json:"trigFacts,omitempty"`
} }
...@@ -133,14 +133,14 @@ func (*Contact) Descriptor() ([]byte, []int) { ...@@ -133,14 +133,14 @@ func (*Contact) Descriptor() ([]byte, []int) {
return file_udMessages_proto_rawDescGZIP(), []int{1} return file_udMessages_proto_rawDescGZIP(), []int{1}
} }
func (x *Contact) GetUserID() [][]byte { func (x *Contact) GetUserID() []byte {
if x != nil { if x != nil {
return x.UserID return x.UserID
} }
return nil return nil
} }
func (x *Contact) GetPubKey() [][]byte { func (x *Contact) GetPubKey() []byte {
if x != nil { if x != nil {
return x.PubKey return x.PubKey
} }
...@@ -163,7 +163,7 @@ type SearchSend struct { ...@@ -163,7 +163,7 @@ type SearchSend struct {
// PublicKey used in the registration // PublicKey used in the registration
Fact []*HashFact `protobuf:"bytes,1,rep,name=fact,proto3" json:"fact,omitempty"` Fact []*HashFact `protobuf:"bytes,1,rep,name=fact,proto3" json:"fact,omitempty"`
// ID of the session used to create this session // ID of the session used to create this session
CommID int32 `protobuf:"varint,2,opt,name=commID,proto3" json:"commID,omitempty"` CommID int64 `protobuf:"varint,2,opt,name=commID,proto3" json:"commID,omitempty"`
} }
func (x *SearchSend) Reset() { func (x *SearchSend) Reset() {
...@@ -205,7 +205,7 @@ func (x *SearchSend) GetFact() []*HashFact { ...@@ -205,7 +205,7 @@ func (x *SearchSend) GetFact() []*HashFact {
return nil return nil
} }
func (x *SearchSend) GetCommID() int32 { func (x *SearchSend) GetCommID() int64 {
if x != nil { if x != nil {
return x.CommID return x.CommID
} }
...@@ -220,7 +220,7 @@ type SearchResponse struct { ...@@ -220,7 +220,7 @@ type SearchResponse struct {
// ID of the session created // ID of the session created
Contacts []*Contact `protobuf:"bytes,1,rep,name=contacts,proto3" json:"contacts,omitempty"` Contacts []*Contact `protobuf:"bytes,1,rep,name=contacts,proto3" json:"contacts,omitempty"`
CommID int32 `protobuf:"varint,2,opt,name=commID,proto3" json:"commID,omitempty"` CommID int64 `protobuf:"varint,2,opt,name=commID,proto3" json:"commID,omitempty"`
} }
func (x *SearchResponse) Reset() { func (x *SearchResponse) Reset() {
...@@ -262,7 +262,7 @@ func (x *SearchResponse) GetContacts() []*Contact { ...@@ -262,7 +262,7 @@ func (x *SearchResponse) GetContacts() []*Contact {
return nil return nil
} }
func (x *SearchResponse) GetCommID() int32 { func (x *SearchResponse) GetCommID() int64 {
if x != nil { if x != nil {
return x.CommID return x.CommID
} }
...@@ -275,8 +275,8 @@ type LookupSend struct { ...@@ -275,8 +275,8 @@ type LookupSend struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
UserID [][]byte `protobuf:"bytes,1,rep,name=userID,proto3" json:"userID,omitempty"` UserID []byte `protobuf:"bytes,1,opt,name=userID,proto3" json:"userID,omitempty"`
CommID int32 `protobuf:"varint,2,opt,name=commID,proto3" json:"commID,omitempty"` CommID int64 `protobuf:"varint,2,opt,name=commID,proto3" json:"commID,omitempty"`
} }
func (x *LookupSend) Reset() { func (x *LookupSend) Reset() {
...@@ -311,14 +311,14 @@ func (*LookupSend) Descriptor() ([]byte, []int) { ...@@ -311,14 +311,14 @@ func (*LookupSend) Descriptor() ([]byte, []int) {
return file_udMessages_proto_rawDescGZIP(), []int{4} return file_udMessages_proto_rawDescGZIP(), []int{4}
} }
func (x *LookupSend) GetUserID() [][]byte { func (x *LookupSend) GetUserID() []byte {
if x != nil { if x != nil {
return x.UserID return x.UserID
} }
return nil return nil
} }
func (x *LookupSend) GetCommID() int32 { func (x *LookupSend) GetCommID() int64 {
if x != nil { if x != nil {
return x.CommID return x.CommID
} }
...@@ -331,8 +331,8 @@ type LookupResponse struct { ...@@ -331,8 +331,8 @@ type LookupResponse struct {
sizeCache protoimpl.SizeCache sizeCache protoimpl.SizeCache
unknownFields protoimpl.UnknownFields unknownFields protoimpl.UnknownFields
PubKey [][]byte `protobuf:"bytes,1,rep,name=pubKey,proto3" json:"pubKey,omitempty"` PubKey []byte `protobuf:"bytes,1,opt,name=pubKey,proto3" json:"pubKey,omitempty"`
CommID int32 `protobuf:"varint,2,opt,name=commID,proto3" json:"commID,omitempty"` CommID int64 `protobuf:"varint,2,opt,name=commID,proto3" json:"commID,omitempty"`
} }
func (x *LookupResponse) Reset() { func (x *LookupResponse) Reset() {
...@@ -367,14 +367,14 @@ func (*LookupResponse) Descriptor() ([]byte, []int) { ...@@ -367,14 +367,14 @@ func (*LookupResponse) Descriptor() ([]byte, []int) {
return file_udMessages_proto_rawDescGZIP(), []int{5} return file_udMessages_proto_rawDescGZIP(), []int{5}
} }
func (x *LookupResponse) GetPubKey() [][]byte { func (x *LookupResponse) GetPubKey() []byte {
if x != nil { if x != nil {
return x.PubKey return x.PubKey
} }
return nil return nil
} }
func (x *LookupResponse) GetCommID() int32 { func (x *LookupResponse) GetCommID() int64 {
if x != nil { if x != nil {
return x.CommID return x.CommID
} }
...@@ -390,8 +390,8 @@ var file_udMessages_proto_rawDesc = []byte{ ...@@ -390,8 +390,8 @@ var file_udMessages_proto_rawDesc = []byte{
0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70, 0x01, 0x28, 0x0c, 0x52, 0x04, 0x68, 0x61, 0x73, 0x68, 0x12, 0x12, 0x0a, 0x04, 0x74, 0x79, 0x70,
0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x68, 0x0a, 0x65, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x04, 0x74, 0x79, 0x70, 0x65, 0x22, 0x68, 0x0a,
0x07, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x07, 0x43, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72,
0x49, 0x44, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x49, 0x44, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44,
0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x03, 0x28, 0x0c, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x18, 0x02, 0x20, 0x01, 0x28, 0x0c,
0x52, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x12, 0x2d, 0x0a, 0x09, 0x74, 0x72, 0x69, 0x67, 0x52, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x12, 0x2d, 0x0a, 0x09, 0x74, 0x72, 0x69, 0x67,
0x46, 0x61, 0x63, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x61, 0x46, 0x61, 0x63, 0x74, 0x73, 0x18, 0x03, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x61,
0x72, 0x73, 0x65, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x46, 0x61, 0x63, 0x74, 0x52, 0x09, 0x74, 0x72, 0x72, 0x73, 0x65, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x46, 0x61, 0x63, 0x74, 0x52, 0x09, 0x74, 0x72,
...@@ -399,20 +399,20 @@ var file_udMessages_proto_rawDesc = []byte{ ...@@ -399,20 +399,20 @@ var file_udMessages_proto_rawDesc = []byte{
0x68, 0x53, 0x65, 0x6e, 0x64, 0x12, 0x23, 0x0a, 0x04, 0x66, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20, 0x68, 0x53, 0x65, 0x6e, 0x64, 0x12, 0x23, 0x0a, 0x04, 0x66, 0x61, 0x63, 0x74, 0x18, 0x01, 0x20,
0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x2e, 0x48, 0x61, 0x73, 0x68, 0x03, 0x28, 0x0b, 0x32, 0x0f, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x2e, 0x48, 0x61, 0x73, 0x68,
0x46, 0x61, 0x63, 0x74, 0x52, 0x04, 0x66, 0x61, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x46, 0x61, 0x63, 0x74, 0x52, 0x04, 0x66, 0x61, 0x63, 0x74, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f,
0x6d, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x6d, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d,
0x49, 0x44, 0x22, 0x54, 0x0a, 0x0e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70, 0x49, 0x44, 0x22, 0x54, 0x0a, 0x0e, 0x53, 0x65, 0x61, 0x72, 0x63, 0x68, 0x52, 0x65, 0x73, 0x70,
0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x73, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x2a, 0x0a, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x73,
0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x2e, 0x43, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0b, 0x32, 0x0e, 0x2e, 0x70, 0x61, 0x72, 0x73, 0x65, 0x2e, 0x43,
0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x73, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x52, 0x08, 0x63, 0x6f, 0x6e, 0x74, 0x61, 0x63, 0x74, 0x73,
0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x22, 0x3c, 0x0a, 0x0a, 0x4c, 0x6f, 0x6f, 0x6b, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x22, 0x3c, 0x0a, 0x0a, 0x4c, 0x6f, 0x6f, 0x6b,
0x75, 0x70, 0x53, 0x65, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x75, 0x70, 0x53, 0x65, 0x6e, 0x64, 0x12, 0x16, 0x0a, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44,
0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x16, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x75, 0x73, 0x65, 0x72, 0x49, 0x44, 0x12, 0x16,
0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x52, 0x06, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03, 0x52, 0x06,
0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x22, 0x40, 0x0a, 0x0e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x22, 0x40, 0x0a, 0x0e, 0x4c, 0x6f, 0x6f, 0x6b, 0x75, 0x70,
0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x52, 0x65, 0x73, 0x70, 0x6f, 0x6e, 0x73, 0x65, 0x12, 0x16, 0x0a, 0x06, 0x70, 0x75, 0x62, 0x4b,
0x65, 0x79, 0x18, 0x01, 0x20, 0x03, 0x28, 0x0c, 0x52, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79, 0x65, 0x79, 0x18, 0x01, 0x20, 0x01, 0x28, 0x0c, 0x52, 0x06, 0x70, 0x75, 0x62, 0x4b, 0x65, 0x79,
0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x05, 0x12, 0x16, 0x0a, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x18, 0x02, 0x20, 0x01, 0x28, 0x03,
0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x42, 0x04, 0x5a, 0x02, 0x75, 0x64, 0x62, 0x06, 0x52, 0x06, 0x63, 0x6f, 0x6d, 0x6d, 0x49, 0x44, 0x42, 0x04, 0x5a, 0x02, 0x75, 0x64, 0x62, 0x06,
0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33, 0x70, 0x72, 0x6f, 0x74, 0x6f, 0x33,
} }
......
ud/udMessages.proto
+ 4
− 4
View file @ 0be9de3b
...@@ -20,8 +20,8 @@ message HashFact { ...@@ -20,8 +20,8 @@ message HashFact {
// Describes a user lookup result. The ID, public key, and the // Describes a user lookup result. The ID, public key, and the
// facts inputted that brought up this user. // facts inputted that brought up this user.
message Contact { message Contact {
repeated bytes userID = 1; bytes userID = 1;
repeated bytes pubKey = 2; bytes pubKey = 2;
repeated HashFact trigFacts = 3; repeated HashFact trigFacts = 3;
} }
...@@ -42,12 +42,12 @@ message SearchResponse { ...@@ -42,12 +42,12 @@ message SearchResponse {
// Message sent to UDB for looking up a user // Message sent to UDB for looking up a user
message LookupSend { message LookupSend {
repeated bytes userID = 1; bytes userID = 1;
int64 commID = 2; int64 commID = 2;
} }
// Message sent from UDB for looking up a user // Message sent from UDB for looking up a user
message LookupResponse { message LookupResponse {
repeated bytes pubKey = 1; bytes pubKey = 1;
int64 commID = 2; int64 commID = 2;
} }
\ No newline at end of file
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment