logos-messaging/chat_proto
1
0
Fork 0
mirror of https://github.com/logos-messaging/chat_proto.git synced 2026-01-07 15:33:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

update rust types

Browse Source
This commit is contained in:
Jazz Turner-Baggs 2025-07-03 14:04:34 -07:00
parent 247323fd6c
commit 2b6d4910d2
No known key found for this signature in database
2 changed files with 17 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rust/umbra-types/build.rs
View File

@ -28,11 +28,13 @@ fn main() {
config config
.compile_protos( .compile_protos(
&[ &[
"base.proto", "envelope.proto",
"common_frames.proto", "common_frames.proto",
"conversations/private_v1.proto", "conversations/private_v1.proto",
"encryption.proto", "encryption.proto",
"inbox.proto",
"invite.proto", "invite.proto",
"reliability.proto"
], ],
// set proto_path // set proto_path
&[get_proto_dir().to_str().unwrap()], &[get_proto_dir().to_str().unwrap()],

22
rust/umbra-types/src/payload.rs
View File

@ -6,8 +6,10 @@ use prost::Message;
pub use types::umbra::*; pub use types::umbra::*;
use crate::{ use crate::{
base::{EncryptedBytes, InboxV1Frame, UmbraEnvelopeV1, inbox_v1_frame},
convos::private_v1::{PrivateV1Frame, private_v1_frame}, convos::private_v1::{PrivateV1Frame, private_v1_frame},
encryption::EncryptedPayload,
envelope::UmbraEnvelopeV1,
inbox::{InboxV1Frame, inbox_v1_frame},
}; };
impl PrivateV1Frame { impl PrivateV1Frame {
@ -33,7 +35,7 @@ pub trait ToEnvelope {
fn to_envelope(self, conversation_id: String, salt: u64) -> UmbraEnvelopeV1; fn to_envelope(self, conversation_id: String, salt: u64) -> UmbraEnvelopeV1;
} }
impl ToEnvelope for EncryptedBytes { impl ToEnvelope for EncryptedPayload {
fn to_envelope(self, conversation_id: String, salt: u64) -> UmbraEnvelopeV1 { fn to_envelope(self, conversation_id: String, salt: u64) -> UmbraEnvelopeV1 {
UmbraEnvelopeV1 { UmbraEnvelopeV1 {
conversation_hint: conversation_id, // TODO conversation_hint: conversation_id, // TODO
@ -48,14 +50,18 @@ mod tests {
use super::*; use super::*;
use prost::Message; use prost::Message;
use crate::reliability::ReliablePayload;
use crate::common_frames::ContentFrame;
#[test] #[test]
fn test_private_v1_roundtrip() { fn test_private_v1_roundtrip() {
let text = "Hello, World!".to_string(); let text = "Hello, World!".to_string();
let msg = PrivateV1Frame { let msg = PrivateV1Frame {
conversation_id: "conversationId".to_string(), conversation_id: "conversationId".to_string(),
frame_type: Some(convos::private_v1::private_v1_frame::FrameType::Content( frame_type: Some(private_v1_frame::FrameType::Content(
common_frames::ContentFrame { ContentFrame {
domain: 0, domain: 0,
tag: 0, tag: 0,
bytes: text.encode_to_vec(), bytes: text.encode_to_vec(),
@ -63,21 +69,21 @@ mod tests {
)), )),
}; };
let reliable = base::ReliableBytes { let reliable = ReliablePayload {
message_id: "msg_id".into(), message_id: "msg_id".into(),
channel_id: msg.conversation_id.clone(), channel_id: msg.conversation_id.clone(),
lamport_timestamp: 0, lamport_timestamp: 0,
causal_history: vec![], causal_history: vec![],
bloom_filter: vec![1, 2, 3, 4], bloom_filter: vec![1, 2, 3, 4],
content: Some(msg.encode_to_vec()), content: msg.encode_to_vec(),
}; };
let buf = reliable.encode_to_vec(); let buf = reliable.encode_to_vec();
let reliable_msg = base::ReliableBytes::decode(&*buf).unwrap(); let reliable_msg = ReliablePayload::decode(&*buf).unwrap();
let msg_from_bytes = let msg_from_bytes =
convos::private_v1::PrivateV1Frame::decode(&*reliable_msg.content.unwrap()) PrivateV1Frame::decode(&*reliable_msg.content)
.expect("Failed to decode message"); .expect("Failed to decode message");
assert_eq!( assert_eq!(